Skip to content

Commit cb6786b

Browse files
authored
Fix robot limb burn repair (and some other postround stuff) (#889)
1 parent 81e8724 commit cb6786b

3 files changed

Lines changed: 5 additions & 12 deletions

File tree

code/modules/power/cable.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri
589589
use_delay = 5 SECONDS
590590

591591
use_delay *= user.get_skill_modifier(/datum/skill/cybernetics, SKILL_SPEED_MODIFIER)
592-
if(!use_tool(user, use_delay, attacked_humanoid, amount = 1))
592+
if(!use_tool(attacked_humanoid, user, use_delay, amount = 1))
593593
return ITEM_INTERACT_BLOCKING
594594

595595
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))

code/modules/projectiles/guns/energy.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,11 @@
210210
if(chambered && !chambered.loaded_projectile) //if loaded_projectile is null, i.e the shot has been fired...
211211
var/obj/item/ammo_casing/energy/shot = chambered
212212
cell.use(shot.e_cost)//... drain the cell cell
213+
if(chambered.projectile_type::damage > 0 || chambered.projectile_type::stamina > 0 || chambered.projectile_type::pain > 0)
214+
new /obj/effect/abstract/smell/ozone(get_turf(src))
215+
213216
chambered = null //either way, released the prepared shot
214217
recharge_newshot() //try to charge a new shot
215-
new /obj/effect/abstract/smell/ozone(get_turf(src))
216218

217219
/obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
218220
if(!chambered && can_shoot())

maplestation_modules/code/controllers/subsystem/autotransfer.dm

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,7 @@ SUBSYSTEM_DEF(crewtransfer)
9393
/// initiates the shuttle call and logs it.
9494
/datum/controller/subsystem/crewtransfer/proc/initiate_crew_transfer()
9595
if(EMERGENCY_IDLE_OR_RECALLED)
96-
/// The multiplier on the shuttle's timer
97-
var/shuttle_time_mult = 1
98-
/// Security level (for timer multiplier)
99-
switch(SSsecurity_level.get_current_level_as_number())
100-
if(SEC_LEVEL_GREEN)
101-
shuttle_time_mult = 2 // = ~20 minutes
102-
if(SEC_LEVEL_BLUE, SEC_LEVEL_RED)
103-
shuttle_time_mult = 1.5 // = ~15 minutes, =~7.5 minutes
104-
105-
SSshuttle.emergency.request(reason = "\nReason:\n\n[shuttle_call_reason]", set_coefficient = shuttle_time_mult)
96+
SSshuttle.emergency.request(reason = "\nReason:\n\n[shuttle_call_reason]", set_coefficient = 1.5)
10697

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

0 commit comments

Comments
 (0)