From 4cfefad2f892231e3d385b06f8533dde383256a7 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Tue, 24 May 2022 06:50:26 +0300
Subject: [PATCH] [NO GBP]Fixes stopping, dropping and rolling not
 extinguishing your clothing (#67096)

* Resisting out of fire now makes your clothes stop being on fire, too.
---
 code/datums/status_effects/debuffs/fire_stacks.dm | 6 ++++++
 code/modules/mob/living/carbon/carbon.dm          | 8 --------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/code/datums/status_effects/debuffs/fire_stacks.dm b/code/datums/status_effects/debuffs/fire_stacks.dm
index 98d88182218..598f38d3adf 100644
--- a/code/datums/status_effects/debuffs/fire_stacks.dm
+++ b/code/datums/status_effects/debuffs/fire_stacks.dm
@@ -234,6 +234,12 @@
 	SEND_SIGNAL(owner, COMSIG_LIVING_EXTINGUISHED, owner)
 	cache_stacks()
 	update_overlay()
+	if(!iscarbon(owner))
+		return
+
+	for(var/obj/item/equipped in owner.get_equipped_items())
+		equipped.wash(CLEAN_TYPE_ACID)
+		equipped.extinguish()
 
 /datum/status_effect/fire_handler/fire_stacks/on_remove()
 	if(on_fire)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 497bc5e4feb..5da11ab51b4 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -945,14 +945,6 @@
 		to_chat(user, span_notice("You retrieve some of [src]\'s internal organs!"))
 	remove_all_embedded_objects()
 
-/mob/living/carbon/extinguish_mob()
-	for(var/X in get_equipped_items())
-		var/obj/item/I = X
-		I.wash(CLEAN_TYPE_ACID) //washes off the acid on our clothes
-		I.extinguish() //extinguishes our clothes
-	..()
-
-
 /mob/living/carbon/proc/create_bodyparts()
 	var/l_arm_index_next = -1
 	var/r_arm_index_next = 0