diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm
index faffea0e6e..4cd74d5ce9 100644
--- a/code/__DEFINES/is_helpers.dm
+++ b/code/__DEFINES/is_helpers.dm
@@ -225,6 +225,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define isfood(A) (istype(A, /obj/item/reagent_containers/food/snacks))
+#define iscontainer(A) (istype(A, /obj/structure/reagent_dispensers))
+
//Assemblies
#define isassembly(O) (istype(O, /obj/item/assembly))
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
index 22a01dacab..1aa97f1321 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm
@@ -67,7 +67,7 @@
return FALSE
/datum/action/innate/heretic_shatter/Activate()
- if(do_after(holder,20, target = holder))
+ if(do_after(holder,10, target = holder))
var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
do_teleport(holder,safe_turf,forceMove = TRUE)
to_chat(holder,"You feel a gust of energy flow through your body... the Rusted Hills heard your call...")
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
index fc1e365c14..a237bcc806 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
@@ -906,7 +906,7 @@
new /obj/effect/temp_visual/voidswap(user.drop_location())
new /obj/effect/temp_visual/voidswap(targeted_turf)
- if(isliving(target))
+ if(isliving(target) || iscontainer(target))
do_teleport(user,targeted_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
do_teleport(target,user_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
@@ -915,7 +915,7 @@
. = ..()
if(!.)
return FALSE
- if(!istype(target,/mob/living))
+ if(!isliving(target) && !iscontainer(target))
if(!silent)
to_chat(user, "You are unable to swap with the [target]!")
return FALSE
@@ -949,12 +949,11 @@
action_icon_state = "time"
action_background_icon_state = "bg_ecult"
var/timestop_range = 7
- var/timestop_duration = 200
+ var/timestop_duration = 300
var/static/mutable_appearance/halo
var/sound/Snd // shamelessly ripped from lightning.
/obj/effect/proc_holder/spell/aoe_turf/domain_expansion/cast(list/targets, mob/user = usr)
- user.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/domain)
Snd = new/sound('sound/magic/clockwork/ratvar_attack.ogg',channel = 7)
halo = halo || mutable_appearance('icons/effects/effects.dmi', "at_shield2", EFFECTS_LAYER)
user.add_overlay(halo)
@@ -962,7 +961,6 @@
if(do_mob(user,user,50,1))
user.cut_overlay(halo)
user.emote("clap1")
- user.say("DOM'ENO ISPLET'IMAS")
+ user.say("DOM'ENO ISPLETIMAS")
playsound(user, 'sound/magic/domain.ogg', 125, TRUE)
- user.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/domain)
new /obj/effect/domain_expansion(get_turf(user), timestop_range, timestop_duration, list(user))
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_structures.dm b/code/modules/antagonists/eldritch_cult/eldritch_structures.dm
index 5982d8c1b2..01fd945cba 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_structures.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_structures.dm
@@ -153,7 +153,8 @@
if(!iscarbon(L))
return
var/mob/living/carbon/carbon_victim = L
- carbon_victim.Paralyze(5 SECONDS)
+ carbon_victim.DefaultCombatKnockdown(50)
+ carbon_victim.drop_all_held_items()
carbon_victim.apply_damage(20,BRUTE,BODY_ZONE_R_LEG)
carbon_victim.apply_damage(20,BRUTE,BODY_ZONE_L_LEG)
playsound(src, 'sound/magic/demon_attack1.ogg', 75, TRUE)
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
index 5450caf10c..6046bfbdf5 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm
@@ -12,7 +12,7 @@
/datum/eldritch_knowledge/base_void/recipe_snowflake_check(list/atoms, loc)
. = ..()
var/turf/open/turfie = loc
- if(turfie.GetTemperature() > T20C)
+ if(turfie.GetTemperature() > T0C)
return FALSE
/datum/eldritch_knowledge/void_grasp
@@ -31,7 +31,7 @@
var/turf/open/turfie = get_turf(carbon_target)
turfie.TakeTemperature(-20)
carbon_target.adjust_bodytemperature(-40)
- carbon_target.silent += 4
+ carbon_target.silent = clamp(carbon_target.silent + 4, 0, 20)
return TRUE
/datum/eldritch_knowledge/void_grasp/on_eldritch_blade(atom/target, mob/user, proximity_flag, click_parameters)
@@ -43,7 +43,7 @@
if(!E)
return
E.on_effect()
- H.silent += 3
+ H.silent = clamp(H.silent + 3, 0, 20)
/datum/eldritch_knowledge/cold_snap
name = "Aristocrat's Way"
@@ -202,7 +202,7 @@
for(var/mob/living/carbon/livies in spiral_range(7,user)-user)
if(IS_HERETIC_MONSTER(livies) || IS_HERETIC(livies))
return
- livies.silent += 1
+ livies.silent = clamp(livies.silent + 1, 0, 5)
livies.adjust_bodytemperature(-20)
var/turf/turfie = get_turf(user)
diff --git a/code/modules/movespeed/modifiers/status_effects.dm b/code/modules/movespeed/modifiers/status_effects.dm
index e0afce13ed..1a017c25b0 100644
--- a/code/modules/movespeed/modifiers/status_effects.dm
+++ b/code/modules/movespeed/modifiers/status_effects.dm
@@ -22,7 +22,7 @@
priority = 50
/datum/movespeed_modifier/status_effect/domain
- multiplicative_slowdown = 1.5
+ multiplicative_slowdown = 3
/datum/movespeed_modifier/status_effect/tased/no_combat_mode
multiplicative_slowdown = 8