From 73d50f9f8d1f1eb826f0bc6311db20ba48c7f38a Mon Sep 17 00:00:00 2001 From: Pierre-Louis <44984704+PIerreLouisH@users.noreply.github.com> Date: Sat, 6 Jan 2024 22:45:54 +0100 Subject: [PATCH] Add immunity to ash storm for possessed objects and swords (#23596) * Add immunity to ash storm for possessed objects Fixes oversight #23110 by adding immunity to ash storm for possessed objects, addressing the bug where possessed objects, including possessed swords, were not immune to ash storm. * Make possessed sword immune but not objects * Code improvment. Both possessed sword and objects now immune * Ash immunity on children inherited "sword" subtype only Oopsie * Fix --------- Co-authored-by: Pierre-Louis --- code/modules/mob/living/simple_animal/posessed_object.dm | 1 + code/modules/mob/living/simple_animal/shade.dm | 1 + 2 files changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm index 55c2dbffda5..475a4f84da6 100644 --- a/code/modules/mob/living/simple_animal/posessed_object.dm +++ b/code/modules/mob/living/simple_animal/posessed_object.dm @@ -16,6 +16,7 @@ no_spin_thrown = TRUE del_on_death = TRUE + weather_immunities = list("ash") /// The probability % of us escaping if stuffed into a bag/toolbox/etc var/escape_chance = 10 diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index a00609a43dd..2878a7d4595 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -62,6 +62,7 @@ can_change_intents = FALSE // same here health = 100 maxHealth = 100 + weather_immunities = list("ash") /mob/living/simple_animal/shade/sword/Initialize(mapload) .=..()