Skip to content

Commit

Permalink
Ash ritual fixes (#4698)
Browse files Browse the repository at this point in the history
  • Loading branch information
FlufflesTheDog authored and StealsThePRs committed Dec 21, 2024
1 parent 69fce04 commit fb227d2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
6 changes: 5 additions & 1 deletion modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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...")
Expand Down
7 changes: 4 additions & 3 deletions modular_nova/modules/ashwalkers/code/effects/ash_rune.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@ GLOBAL_LIST_EMPTY(ash_rituals)
. += span_notice("<br>The current ritual is: [current_ritual.name]")
. += span_notice(current_ritual.desc)
. += span_warning("<br>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)
. = ..()
Expand Down

0 comments on commit fb227d2

Please sign in to comment.