From 265c94bc286ae10428a5fbc1a5107e2033e02e4d Mon Sep 17 00:00:00 2001 From: Leland Kemble <70413276+lelandkemble@users.noreply.github.com> Date: Wed, 13 May 2026 18:56:30 -0400 Subject: [PATCH] Users of a Gaseous Holoparasite no longer appear to catch on fire repeatedly (#96046) ## About The Pull Request Switches from the holoparasite extinguishing their owner repeatedly whenever they caught on fire, causing a message about them catching fire to repeatedly appear, to giving them the `TRAIT_NOFIRE` trait, which does the same thing. --- .../living/basic/guardian/guardian_types/gaseous.dm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm index a70bd01f43b..7db7107e109 100644 --- a/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm +++ b/code/modules/mob/living/basic/guardian/guardian_types/gaseous.dm @@ -33,20 +33,15 @@ . = ..() if (QDELETED(src)) return - RegisterSignal(summoner, COMSIG_LIVING_IGNITED, PROC_REF(on_summoner_ignited)) + ADD_TRAIT(summoner, TRAIT_NOFIRE, REF(src)) RegisterSignal(summoner, COMSIG_LIVING_LIFE, PROC_REF(on_summoner_life)) /mob/living/basic/guardian/gaseous/cut_summoner(different_person) if (!isnull(summoner)) - UnregisterSignal(summoner, list(COMSIG_LIVING_IGNITED, COMSIG_LIVING_LIFE)) + REMOVE_TRAIT(summoner, TRAIT_NOFIRE, REF(src)) + UnregisterSignal(summoner, COMSIG_LIVING_LIFE) return ..() -/// Prevent our summoner from being on fire -/mob/living/basic/guardian/gaseous/proc/on_summoner_ignited(mob/living/source) - SIGNAL_HANDLER - source.extinguish_mob() - source.set_fire_stacks(0, remove_wet_stacks = FALSE) - /// Maintain our summoner at a stable body temperature /mob/living/basic/guardian/gaseous/proc/on_summoner_life(mob/living/source, seconds_per_tick) SIGNAL_HANDLER