cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increases time to self-extinguish (#33443)

Browse Source 
* Increases time to self-extinguish

* consistency

* extinguish

* enhance

* review updates

* linter

* reee
This commit is contained in:
west3436
2022-10-11 12:26:06 -04:00
committed by GitHub
parent a3a7e43487
commit f315a61d1b
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/modules/mob/living/living.dm
View File

@@ -1119,20 +1119,17 @@ Thanks.
var/mob/living/carbon/CM = L var/mob/living/carbon/CM = L
//putting out a fire //putting out a fire
if(CM.on_fire && CM.canmove && ((!locate(/obj/effect/fire) in loc) || !CM.handcuffed)) //No point in putting ourselves out if we'd just get set on fire again. Unless there's nothing more pressing to resist out of, in which case go nuts. if(CM.on_fire && CM.canmove && ((!locate(/obj/effect/fire) in loc) || !CM.handcuffed)) //No point in putting ourselves out if we'd just get set on fire again. Unless there's nothing more pressing to resist out of, in which case go nuts.
CM.fire_stacks -= 5 CM.Knockdown(5)
CM.Knockdown(3) CM.Stun(5)
CM.Stun(3)
playsound(CM.loc, 'sound/effects/bodyfall.ogg', 50, 1) playsound(CM.loc, 'sound/effects/bodyfall.ogg', 50, 1)
CM.visible_message("<span class='danger'>[CM] rolls on the floor, trying to put themselves out!</span>", CM.visible_message("<span class='danger'>[CM] rolls on the floor, trying to put themselves out!</span>",
"<span class='warning'>You stop, drop, and roll!</span>") "<span class='warning'>You stop, drop, and roll!</span>")
for(var/i = 1 to rand(8,12)) for(var/i = 1 to CM.fire_stacks + 7)
CM.dir = turn(CM.dir, pick(-90, 90)) CM.dir = turn(CM.dir, pick(-90, 90))
sleep(2) sleep(1 SECONDS)
CM.fire_stacks = 0
if(fire_stacks <= 0) CM.visible_message("<span class='danger'>[CM] has successfully extinguished themselves!</span>","<span class='notice'>You extinguish yourself.</span>")
CM.visible_message("<span class='danger'>[CM] has successfully extinguished themselves!</span>",
"<span class='notice'>You extinguish yourself.</span>")
ExtinguishMob() ExtinguishMob()
return return