Skip to content

Fix robot limb burn repair (and some other postround stuff) #889

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrMelbert merged 3 commits into from
Mar 5, 2026
+5 −12
Merged

Fix robot limb burn repair (and some other postround stuff) #889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d7dd499
Fix robot limb burn repair
MrMelbert Mar 2, 2026
a34981d
Gun fix
MrMelbert Mar 2, 2026
1262db9
transfer tweak
MrMelbert Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/power/cable.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
use_delay = 5 SECONDS

use_delay *= user.get_skill_modifier(/datum/skill/cybernetics, SKILL_SPEED_MODIFIER)
if(!use_tool(user, use_delay, attacked_humanoid, amount = 1))
if(!use_tool(attacked_humanoid, user, use_delay, amount = 1))
return ITEM_INTERACT_BLOCKING

if (!attacked_humanoid.item_heal(user, brute_heal = 0, burn_heal = 15, heal_message_brute = "dents", heal_message_burn = "burnt wires", required_bodytype = BODYTYPE_ROBOTIC))
Expand Down
4 changes: 3 additions & 1 deletion code/modules/projectiles/guns/energy.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,11 @@
if(chambered && !chambered.loaded_projectile) //if loaded_projectile is null, i.e the shot has been fired...
var/obj/item/ammo_casing/energy/shot = chambered
cell.use(shot.e_cost)//... drain the cell cell
if(chambered.projectile_type::damage > 0 || chambered.projectile_type::stamina > 0 || chambered.projectile_type::pain > 0)
new /obj/effect/abstract/smell/ozone(get_turf(src))

chambered = null //either way, released the prepared shot
recharge_newshot() //try to charge a new shot
new /obj/effect/abstract/smell/ozone(get_turf(src))

/obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
if(!chambered && can_shoot())
Expand Down
11 changes: 1 addition & 10 deletions maplestation_modules/code/controllers/subsystem/autotransfer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,7 @@ SUBSYSTEM_DEF(crewtransfer)
/// initiates the shuttle call and logs it.
/datum/controller/subsystem/crewtransfer/proc/initiate_crew_transfer()
if(EMERGENCY_IDLE_OR_RECALLED)
/// The multiplier on the shuttle's timer
var/shuttle_time_mult = 1
/// Security level (for timer multiplier)
switch(SSsecurity_level.get_current_level_as_number())
if(SEC_LEVEL_GREEN)
shuttle_time_mult = 2 // = ~20 minutes
if(SEC_LEVEL_BLUE, SEC_LEVEL_RED)
shuttle_time_mult = 1.5 // = ~15 minutes, =~7.5 minutes

SSshuttle.emergency.request(reason = "\nReason:\n\n[shuttle_call_reason]", set_coefficient = shuttle_time_mult)
SSshuttle.emergency.request(reason = "\nReason:\n\n[shuttle_call_reason]", set_coefficient = 1.5)

log_shuttle("A crew transfer vote has passed. The shuttle has been called, and recalling the shuttle ingame is disabled.")
message_admins("A crew transfer vote has passed. The shuttle has been called, and recalling the shuttle ingame is disabled.")
Expand Down
Loading