Skip to content

Heretic void chill + ascension changes #5968

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.

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

Merged
merged 4 commits into from
Apr 19, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion code/modules/antagonists/heretic/heretic_knowledge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@
* Checks if the passed human is a valid sacrifice for our ritual.
*/
/datum/heretic_knowledge/ultimate/proc/is_valid_sacrifice(mob/living/carbon/human/sacrifice)
return (sacrifice.stat == DEAD) && !ismonkey(sacrifice)
return ((sacrifice.stat == DEAD) && !ismonkey(sacrifice) && sacrifice.last_mind)

/datum/heretic_knowledge/ultimate/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc)
var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user)
Expand Down
5 changes: 4 additions & 1 deletion code/modules/antagonists/heretic/knowledge/void_lore.dm
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,10 @@
close_carbon.adjust_silence_up_to(2 SECONDS, 20 SECONDS)
close_carbon.apply_status_effect(/datum/status_effect/void_chill, 1)
close_carbon.adjust_eye_blur(rand(0 SECONDS, 2 SECONDS))
close_carbon.adjust_bodytemperature(-30 * TEMPERATURE_DAMAGE_COEFFICIENT)
if(close_carbon.has_reagent(/datum/reagent/water/holywater))
close_carbon.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT)
else
close_carbon.adjust_bodytemperature(-30 * TEMPERATURE_DAMAGE_COEFFICIENT)

else if(istype(thing_in_range, /obj/machinery/door) || istype(thing_in_range, /obj/structure/door_assembly))
var/obj/affected_door = thing_in_range
Expand Down
16 changes: 14 additions & 2 deletions code/modules/antagonists/heretic/status_effects/void_chill.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
var/stack_limit = 5
///icon for the overlay
var/mutable_appearance/stacks_overlay
COOLDOWN_DECLARE(chill_purge)

/datum/status_effect/void_chill/on_creation(mob/living/new_owner, new_stacks, ...)
. = ..()
Expand All @@ -41,7 +42,18 @@
owner.update_icon(UPDATE_OVERLAYS)

/datum/status_effect/void_chill/tick(seconds_per_ticks)
owner.adjust_bodytemperature(-12 KELVIN * stacks * seconds_per_ticks)
if (stacks == 0)
owner.remove_status_effect(/datum/status_effect/void_chill)
if(owner.has_reagent(/datum/reagent/water/holywater))
//void chill is less effective
owner.adjust_bodytemperature(-3 KELVIN * stacks * seconds_per_ticks)
if(!COOLDOWN_FINISHED(src, chill_purge))
return FALSE
COOLDOWN_START(src, chill_purge, 3 SECONDS)
to_chat(owner, span_notice("You feel holy water warming you up."))
adjust_stacks(-1)
else
owner.adjust_bodytemperature(-12 KELVIN * stacks * seconds_per_ticks)

/datum/status_effect/void_chill/refresh(mob/living/new_owner, new_stacks, forced = FALSE)
. = ..()
Expand Down Expand Up @@ -84,7 +96,7 @@
///Updates the movespeed of owner based on the amount of stacks of the debuff
/datum/status_effect/void_chill/proc/update_movespeed(stacks)
owner.add_movespeed_modifier(/datum/movespeed_modifier/void_chill, update = TRUE)
owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/void_chill, update = TRUE, multiplicative_slowdown = (0.5 * stacks))
owner.add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/void_chill, update = TRUE, multiplicative_slowdown = (0.3 * stacks))
linked_alert.maptext = MAPTEXT_TINY_UNICODE("<span style='text-align:center'>[stacks]</span>")

/datum/status_effect/void_chill/lasting
Expand Down
Loading