cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 10:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fire rolling no longer hardstuns you because its not 2016 and is current year (#21500)

Browse Source 
* changes fire code

* reworks stuff a bit, i think i did what GDN said?
This commit is contained in:
Octus
2023-07-07 07:33:29 -05:00
committed by GitHub
parent e254912c82
commit 9793ea3c33
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,17 +923,20 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
return FALSE
/mob/living/carbon/resist_fire()
if(IsKnockedDown())
return
fire_stacks -= 5
Weaken(6 SECONDS, TRUE) //We dont check for CANWEAKEN, I don't care how immune to weakening you are, if you're rolling on the ground, you're busy.
Weaken (2 SECONDS, TRUE) //Your busy dying from fire, no way you could be able to roll and reach for a snack in your bag
KnockDown(6 SECONDS, TRUE) //Ok now you can have that snack if you want
spin(32, 2)
visible_message("<span class='danger'>[src] rolls on the floor, trying to put [p_themselves()] out!</span>",
"<span class='notice'>You stop, drop, and roll!</span>")
sleep(3 SECONDS)
if(fire_stacks <= 0)
visible_message("<span class='danger'>[src] has successfully extinguished [p_themselves()]!</span>",
"<span class='notice'>You extinguish yourself.</span>")
ExtinguishMob()
addtimer(CALLBACK(src, PROC_REF(extinguish_roll), 3 SECONDS))
/mob/living/carbon/proc/extinguish_roll()
if(fire_stacks <= 0)
visible_message("<span class='danger'>[src] has successfully extinguished [p_themselves()]!</span>","<span class='notice'>You extinguish yourself.</span>")
ExtinguishMob()
/mob/living/carbon/resist_restraints()
INVOKE_ASYNC(src, PROC_REF(resist_muzzle))