Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Ash ritual fixes #5258

Merged
merged 2 commits into from
Dec 24, 2024
Merged

[MIRROR] Ash ritual fixes #5258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb227d2
Ash ritual fixes (#4698)
FlufflesTheDog Dec 21, 2024
e7e574b
[MIRROR] Ash ritual fixes
Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion modular_nova/modules/ashwalkers/code/effects/ash_rituals.dm
View file
Open in desktop
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
View file
Open in desktop
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
Loading