cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Port /datum/status_effect and convert wetness and fire stacks to it (#11666)

Browse Source 
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-09-17 05:21:49 -07:00
committed by GitHub
parent 0000fce008
commit 9f292671ae
88 changed files with 1775 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/structures/bonfire.dm
View File

@@ -166,7 +166,8 @@
return TRUE
/obj/structure/bonfire/proc/extinguish()
/obj/structure/bonfire/extinguish()
. = ..()
if(burning)
burning = FALSE
update_icon()
@@ -193,7 +194,7 @@
var/mob/living/L = A
if(!(L.is_incorporeal()))
L.adjust_fire_stacks(get_fuel_amount() / 4)
L.IgniteMob()
L.ignite_mob()
/obj/structure/bonfire/update_icon()
cut_overlays()
@@ -360,7 +361,8 @@
return FALSE
return TRUE
/obj/structure/fireplace/proc/extinguish()
/obj/structure/fireplace/extinguish()
. = ..()
if(burning)
burning = FALSE
update_icon()

4
code/game/objects/structures/watercloset.dm
View File

@@ -253,8 +253,8 @@
if(isliving(O))
var/mob/living/L = O
L.ExtinguishMob()
L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily
L.extinguish_mob()
L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
if(iscarbon(O))
//flush away reagents on the skin