From d7dd499d2494ecc2a20f40d8b1c858a5361e1304 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 1 Mar 2026 19:16:33 -0600 Subject: [PATCH 1/3] Fix robot limb burn repair --- code/modules/power/cable.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 5b8c5a18c747..31327848c5bc 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -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)) From a34981d502071027b87ef82fa30ccc4d6f848ad3 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 1 Mar 2026 22:56:38 -0600 Subject: [PATCH 2/3] Gun fix --- code/modules/projectiles/guns/energy.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index c2d6ddedbb87..8c41747f3928 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -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()) From 1262db959ba1b5fd38dc576783c676497915df60 Mon Sep 17 00:00:00 2001 From: MrMelbert Date: Sun, 1 Mar 2026 22:59:30 -0600 Subject: [PATCH 3/3] transfer tweak --- .../code/controllers/subsystem/autotransfer.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/maplestation_modules/code/controllers/subsystem/autotransfer.dm b/maplestation_modules/code/controllers/subsystem/autotransfer.dm index 48f343115bb8..d23898719a9e 100644 --- a/maplestation_modules/code/controllers/subsystem/autotransfer.dm +++ b/maplestation_modules/code/controllers/subsystem/autotransfer.dm @@ -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.")