Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
This commit is contained in:
@@ -145,10 +145,11 @@
|
||||
user.adjustFireLoss(5)
|
||||
playsound(src, 'sound/machines/fryer/deep_fryer_emerge.ogg', 50, TRUE)
|
||||
|
||||
/turf/closed/wall/clockwork/mech_melee_attack(obj/mecha/M)
|
||||
/turf/closed/wall/clockwork/mech_melee_attack(obj/vehicle/sealed/mecha/M)
|
||||
..()
|
||||
if(heated)
|
||||
to_chat(M.occupant, "<span class='userdanger'>The wall's intense heat completely reflects your [M.name]'s attack!</span>")
|
||||
for(var/mob/living/MB in M.occupants)
|
||||
to_chat(MB, "<span class='userdanger'>The wall's intense heat completely reflects your [M.name]'s attack!</span>")
|
||||
M.take_damage(20, BURN)
|
||||
|
||||
/turf/closed/wall/clockwork/proc/turn_up_the_heat()
|
||||
|
||||
Reference in New Issue
Block a user