Skip to content

Commit

Permalink
some more improve
Browse files Browse the repository at this point in the history
  • Loading branch information
Antoonij authored Sep 22, 2024
1 parent 6d1acf6 commit 511b404
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions code/datums/components/ritual_object.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
if(ritual.name)
rituals += new ritual
ritual.link_object(parent)

return

/datum/component/ritual_object/Destroy(force)
Expand Down Expand Up @@ -66,6 +67,7 @@

active_ui = TRUE
INVOKE_ASYNC(src, PROC_REF(open_ritual_ui), item, human)

return COMPONENT_CANCEL_ATTACK_CHAIN

/datum/component/ritual_object/proc/open_ritual_ui(obj/item/item, mob/living/carbon/human/human)
Expand Down
5 changes: 4 additions & 1 deletion code/datums/rituals.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
LAZYNULL(used_things)
LAZYNULL(required_things)
LAZYNULL(invokers)

return ..()

/datum/ritual/proc/pre_ritual_check(obj/item/item, mob/living/carbon/human/invoker)
Expand Down Expand Up @@ -295,6 +294,7 @@
/datum/ritual/ashwalker/summon_ashstorm/do_ritual(obj/item/item, mob/living/carbon/human/invoker)
SSweather.run_weather(/datum/weather/ash_storm)
message_admins("[key_name(invoker)] accomplished ashstorm ritual and summoned ashstorm")

return RITUAL_SUCCESSFUL

/datum/ritual/ashwalker/summon_ashstorm/disaster(obj/item/item, mob/living/carbon/human/invoker)
Expand Down Expand Up @@ -419,6 +419,7 @@
return RITUAL_FAILED_ON_PROCEED

human.forceMove(ritual_object)

return RITUAL_SUCCESSFUL

/datum/ritual/ashwalker/summon/disaster(obj/item/item, mob/living/carbon/human/invoker)
Expand All @@ -427,6 +428,7 @@

var/obj/item/organ/external/limb = invoker.get_organ(pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
limb?.droplimb()

return

/datum/ritual/ashwalker/summon/handle_ritual_object(bitflags, silent = FALSE)
Expand Down Expand Up @@ -778,6 +780,7 @@
/datum/ritual/ashwalker/population/do_ritual(obj/item/item, mob/living/carbon/human/invoker)
if(prob(10))
new /obj/effect/mob_spawn/human/ash_walker/shaman(ritual_object.loc)

new /obj/effect/mob_spawn/human/ash_walker(ritual_object.loc)

return RITUAL_SUCCESSFUL
Expand Down

0 comments on commit 511b404

Please sign in to comment.