From fb227d232d14f6317cade4f8409b7efd10a45632 Mon Sep 17 00:00:00 2001 From: FlufflesTheDog Date: Sat, 21 Dec 2024 12:39:00 -0700 Subject: [PATCH 1/2] Ash ritual fixes (#4698) --- .../modules/ashwalkers/code/effects/ash_rituals.dm | 6 +++++- modular_nova/modules/ashwalkers/code/effects/ash_rune.dm | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm index 5a71966fb0e..41186f01ef7 100644 --- a/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm @@ -56,7 +56,11 @@ if(!atom_check) ritual_fail(checked_rune) return FALSE - + if(isliving(atom_check)) + var/mob/living/human_sacrifice = atom_check + if(human_sacrifice.stat < DEAD) + ritual_fail(checked_rune) + return FALSE if(is_type_in_list(atom_check, consumed_components)) qdel(atom_check) checked_rune.balloon_alert_to_viewers("[checked_component] component has been consumed...") diff --git a/modular_nova/modules/ashwalkers/code/effects/ash_rune.dm b/modular_nova/modules/ashwalkers/code/effects/ash_rune.dm index 6efb0b8edb2..e2a30a7af91 100644 --- a/modular_nova/modules/ashwalkers/code/effects/ash_rune.dm +++ b/modular_nova/modules/ashwalkers/code/effects/ash_rune.dm @@ -23,9 +23,10 @@ GLOBAL_LIST_EMPTY(ash_rituals) . += span_notice("
The current ritual is: [current_ritual.name]") . += span_notice(current_ritual.desc) . += span_warning("
The required components are as follows:") - for(var/the_components in current_ritual.required_components) - var/atom/component_name = current_ritual.required_components[the_components] - . += span_warning("[the_components] component is [initial(component_name.name)]") + for(var/direction in current_ritual.required_components) + var/atom/component_type = current_ritual.required_components[direction] + var/component_name = ispath(component_type, /mob/living/carbon/human) ? "a humanoid corpse" : component_type::name + . += span_warning("[direction] component is [component_name]") /obj/effect/ash_rune/Initialize(mapload) . = ..() From e7e574bd1cb515027de9371f80d0726c12e4815a Mon Sep 17 00:00:00 2001 From: StealsThePRs Date: Sat, 21 Dec 2024 22:39:20 +0300 Subject: [PATCH 2/2] [MIRROR] Ash ritual fixes