Merge pull request #22416 from Militaires/kill_me

fixes my glass message tweak fuck-up
This commit is contained in:
oranges
2016-12-25 16:20:03 +13:00
committed by GitHub
@@ -360,7 +360,6 @@
return
if(!H.shoes)
H.apply_damage(5, BRUTE, picked_def_zone)
H.Weaken(3)
if(cooldown < world.time - 10) //cooldown to avoid message spam.
if(!H.incapacitated())
H.visible_message("<span class='danger'>[H] steps in the broken glass!</span>", \
@@ -369,4 +368,5 @@
H.visible_message("<span class='danger'>[H] slides on the broken glass!</span>", \
"<span class='userdanger'>You slide on the broken glass!</span>")
cooldown = world.time
cooldown = world.time
H.Weaken(3)