Merge remote-tracking branch 'origin/master' into fake_blood

code/modules/antagonists/_common/antag_datum.dm

@@ -96,6 +96,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 
 //Proc called when the datum is given to a mind.
 /datum/antagonist/proc/on_gain()
+	set waitfor = FALSE
 	if(!(owner?.current))
 		return
 	if(!silent)
@@ -111,6 +112,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 			var/datum/skill_modifier/job/M = GLOB.skill_modifiers[GET_SKILL_MOD_ID(A, type)]
 			if(istype(M))
 				M.name = "[name] Training"
+	owner.current.AddComponent(/datum/component/activity)
 	SEND_SIGNAL(owner.current, COMSIG_MOB_ANTAG_ON_GAIN, src)
 
 /datum/antagonist/proc/is_banned(mob/M)
@@ -141,6 +143,7 @@ GLOBAL_LIST_EMPTY(antagonists)
 	var/datum/team/team = get_team()
 	if(team)
 		team.remove_member(owner)
+	// we don't remove the activity component on purpose--no real point to it
 	qdel(src)
 
 /datum/antagonist/proc/greet()
@@ -162,14 +165,12 @@ GLOBAL_LIST_EMPTY(antagonists)
 /datum/antagonist/proc/remove_blacklisted_quirks()
 	var/mob/living/L = owner.current
 	if(istype(L))
-		var/list/my_quirks = L.client?.prefs.all_quirks.Copy()
-		SSquirks.filter_quirks(my_quirks,blacklisted_quirks)
 		for(var/q in L.roundstart_quirks)
 			var/datum/quirk/Q = q
-			if(!(SSquirks.quirk_name_by_path(Q.type) in my_quirks))
+			if(Q.type in blacklisted_quirks)
 				if(initial(Q.antag_removal_text))
 					to_chat(L, "<span class='boldannounce'>[initial(Q.antag_removal_text)]</span>")
-				L.remove_quirk(Q.type)
+				qdel(Q)
 
 //Returns the team antagonist belongs to if any.
 /datum/antagonist/proc/get_team()

code/modules/antagonists/abductor/equipment/abduction_gear.dm

@@ -511,8 +511,7 @@
 
 /obj/item/abductor/baton/proc/StunAttack(mob/living/L,mob/living/user)
 
-	L.lastattacker = user.real_name
-	L.lastattackerckey = user.ckey
+	L.set_last_attacker(user)
 
 	L.adjustStaminaLoss(35) //because previously it took 5-6 hits to actually "incapacitate" someone for the purposes of the sleep inducement
 	L.DefaultCombatKnockdown(140)

code/modules/antagonists/blob/blob/overmind.dm

@@ -88,7 +88,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 /mob/camera/blob/proc/is_valid_turf(turf/T)
 	var/area/A = get_area(T)
-	if((A && !A.blob_allowed) || !T || !is_station_level(T.z) || isspaceturf(T))
+	if((A && !(A.area_flags & BLOBS_ALLOWED)) || !T || !is_station_level(T.z) || isspaceturf(T))
 		return FALSE
 	return TRUE
 
@@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 
 		var/area/Ablob = get_area(T)
 
-		if(!Ablob.blob_allowed)
+		if(!(Ablob.area_flags & BLOBS_ALLOWED))
 			continue
 
 		if(!(ROLE_BLOB in L.faction))
@@ -144,7 +144,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 		for(var/area/A in GLOB.sortedAreas)
 			if(!(A.type in GLOB.the_station_areas))
 				continue
-			if(!A.blob_allowed)
+			if(!(A.area_flags & BLOBS_ALLOWED))
 				continue
 			A.color = blobstrain.color
 			A.name = "blob"

code/modules/antagonists/blob/blob/powers.dm

@@ -211,7 +211,7 @@
 		to_chat(src, "<span class='userdanger'>You have no core and are about to die! May you rest in peace.</span>")
 		return
 	var/area/A = get_area(T)
-	if(isspaceturf(T) || A && !A.blob_allowed)
+	if(isspaceturf(T) || A && !(A.area_flags & BLOBS_ALLOWED))
 		to_chat(src, "<span class='warning'>You cannot relocate your core here!</span>")
 		return
 	if(!can_buy(80))

code/modules/antagonists/blob/blob/theblob.dm

@@ -25,7 +25,7 @@
 	if(owner_overmind)
 		overmind = owner_overmind
 		var/area/Ablob = get_area(src)
-		if(Ablob.blob_allowed) //Is this area allowed for winning as blob?
+		if(Ablob.area_flags & BLOBS_ALLOWED) //Is this area allowed for winning as blob?
 			overmind.blobs_legit += src
 	GLOB.blobs += src //Keep track of the blob in the normal list either way
 	setDir(pick(GLOB.cardinals))
@@ -64,7 +64,7 @@
 						result++
 		. -= result - 1
 
-/obj/structure/blob/BlockSuperconductivity()
+/obj/structure/blob/BlockThermalConductivity()
 	return atmosblock
 
 /obj/structure/blob/CanPass(atom/movable/mover, turf/target)

code/modules/antagonists/changeling/changeling.dm

@@ -125,6 +125,8 @@
 /datum/antagonist/changeling/proc/remove_changeling_powers()
 	if(ishuman(owner.current) || ismonkey(owner.current))
 		reset_properties()
+		QDEL_NULL(cellular_emporium)
+		QDEL_NULL(emporium_action)
 		for(var/obj/effect/proc_holder/changeling/p in purchasedpowers)
 			if(p.always_keep)
 				continue
@@ -139,6 +141,7 @@
 /datum/antagonist/changeling/proc/reset_powers()
 	if(purchasedpowers)
 		remove_changeling_powers()
+	create_actions()
 	//Repurchase free powers.
 	for(var/path in all_powers)
 		var/obj/effect/proc_holder/changeling/S = new path()
@@ -225,7 +228,8 @@
 /datum/antagonist/changeling/proc/regenerate()
 	var/mob/living/carbon/the_ling = owner.current
 	if(istype(the_ling))
-		emporium_action.Grant(the_ling)
+		if(emporium_action)
+			emporium_action.Grant(the_ling)
 		if(the_ling.stat == DEAD)
 			chem_charges = min(max(0, chem_charges + chem_recharge_rate - chem_recharge_slowdown), (chem_storage*0.5))
 			geneticdamage = max(LING_DEAD_GENETICDAMAGE_HEAL_CAP,geneticdamage-1)

code/modules/antagonists/changeling/powers/adrenaline.dm

@@ -13,5 +13,5 @@
 
 //Recover from stuns.
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)
-	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list(/datum/reagent/medicine/epinephrine = 3, /datum/reagent/drug/methamphetamine/changeling = 10, /datum/reagent/medicine/changelingadrenaline = 5), "<span class='notice'>Energy rushes through us.</span>", 0, 0.75, 0)
+	user.do_adrenaline(0, FALSE, 70, 0, TRUE, list(/datum/reagent/medicine/epinephrine = 3, /datum/reagent/medicine/changelinghaste = 10, /datum/reagent/medicine/changelingadrenaline = 5), "<span class='notice'>Energy rushes through us.</span>", 0, 0.75, 0)
 	return TRUE

code/modules/antagonists/changeling/powers/biodegrade.dm

@@ -12,24 +12,34 @@
 
 /obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
 	var/used = FALSE // only one form of shackles removed per use
-	if(!user.restrained() && isopenturf(user.loc))
+	if(!user.restrained() && !user.legcuffed && isopenturf(user.loc))
 		to_chat(user, "<span class='warning'>We are already free!</span>")
-		return 0
+		return FALSE
 
 	if(user.handcuffed)
 		var/obj/O = user.get_item_by_slot(SLOT_HANDCUFFED)
 		if(!istype(O))
-			return 0
+			return FALSE
 		user.visible_message("<span class='warning'>[user] vomits a glob of acid on [user.p_their()] [O]!</span>", \
 			"<span class='warning'>We vomit acidic ooze onto our restraints!</span>")
 
 		addtimer(CALLBACK(src, .proc/dissolve_handcuffs, user, O), 30)
 		used = TRUE
 
+	if(user.legcuffed)
+		var/obj/O = user.get_item_by_slot(SLOT_LEGCUFFED)
+		if(!istype(O))
+			return FALSE
+		user.visible_message("<span class='warning'>[user] vomits a glob of acid on [user.p_their()] [O]!</span>", \
+			"<span class='warning'>We vomit acidic ooze onto our restraints!</span>")
+
+		addtimer(CALLBACK(src, .proc/dissolve_legcuffs, user, O), 30)
+		used = TRUE
+
 	if(user.wear_suit && user.wear_suit.breakouttime && !used)
 		var/obj/item/clothing/suit/S = user.get_item_by_slot(SLOT_WEAR_SUIT)
 		if(!istype(S))
-			return 0
+			return FALSE
 		user.visible_message("<span class='warning'>[user] vomits a glob of acid across the front of [user.p_their()] [S]!</span>", \
 			"<span class='warning'>We vomit acidic ooze onto our straight jacket!</span>")
 		addtimer(CALLBACK(src, .proc/dissolve_straightjacket, user, S), 30)
@@ -39,7 +49,7 @@
 	if(istype(user.loc, /obj/structure/closet) && !used)
 		var/obj/structure/closet/C = user.loc
 		if(!istype(C))
-			return 0
+			return FALSE
 		C.visible_message("<span class='warning'>[C]'s hinges suddenly begin to melt and run!</span>")
 		to_chat(user, "<span class='warning'>We vomit acidic goop onto the interior of [C]!</span>")
 		addtimer(CALLBACK(src, .proc/open_closet, user, C), 70)
@@ -48,7 +58,7 @@
 	if(istype(user.loc, /obj/structure/spider/cocoon) && !used)
 		var/obj/structure/spider/cocoon/C = user.loc
 		if(!istype(C))
-			return 0
+			return FALSE
 		C.visible_message("<span class='warning'>[src] shifts and starts to fall apart!</span>")
 		to_chat(user, "<span class='warning'>We secrete acidic enzymes from our skin and begin melting our cocoon...</span>")
 		addtimer(CALLBACK(src, .proc/dissolve_cocoon, user, C), 25) //Very short because it's just webs
@@ -62,6 +72,12 @@
 		new /obj/effect/decal/cleanable/greenglow(O.drop_location())
 		qdel(O)
 
+/obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_legcuffs(mob/living/carbon/human/user, obj/O)
+	if(O && user.legcuffed == O)
+		user.visible_message("<span class='warning'>[O] dissolve[O.gender==PLURAL?"":"s"] into a puddle of sizzling goop.</span>")
+		new /obj/effect/decal/cleanable/greenglow(O.drop_location())
+		qdel(O)
+
 /obj/effect/proc_holder/changeling/biodegrade/proc/dissolve_straightjacket(mob/living/carbon/human/user, obj/S)
 	if(S && user.wear_suit == S)
 		user.visible_message("<span class='warning'>[S] dissolves into a puddle of sizzling goop.</span>")

code/modules/antagonists/changeling/powers/mutations.dm

@@ -466,7 +466,7 @@
 	block_return[BLOCK_RETURN_BLOCK_CAPACITY] = (block_return[BLOCK_RETURN_BLOCK_CAPACITY] || 0) + remaining_uses
 	return ..()
 
-/obj/item/shield/changeling/active_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+/obj/item/shield/changeling/directional_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
 	. = ..()
 	if(--remaining_uses < 1)
 		if(ishuman(loc))
@@ -680,6 +680,12 @@
 	glove_type = /obj/item/clothing/gloves/fingerless/pugilist/cling // just punch his head off dude
 	glove_name_simple = "bone gauntlets"
 
+/obj/effect/proc_holder/changeling/gloves/gauntlets/sting_action(mob/living/user)
+	if(HAS_TRAIT(user, TRAIT_NOPUGILIST))
+		to_chat(user, "<span class='warning'>We would gain nothing by forming our fists into brute-force weapons when we are trained in precision martial arts!</span>")
+		return
+	return ..()
+
 /obj/item/clothing/gloves/fingerless/pugilist/cling // switches between lesser GotNS and Big Punchy Rib Breaky Hands
 	name = "hewn bone gauntlets"
 	icon_state = "ling_gauntlets"

code/modules/antagonists/changeling/powers/revive.dm

@@ -11,6 +11,14 @@
 
 //Revive from revival stasis
 /obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+	if(!changeling)
+		return
+	if(changeling.hostile_absorbed)
+		to_chat(user, "<span class='notice'>We cannot muster up the strength to revive ourselves!</span>")
+		changeling.purchasedpowers -= src
+		src.action.Remove(user)
+		return
 	user.cure_fakedeath("changeling")
 	user.revive(full_heal = 1)
 	var/list/missing = user.get_missing_limbs()
@@ -27,7 +35,6 @@
 		user.regenerate_limbs(0, list(BODY_ZONE_HEAD))
 	user.regenerate_organs()
 	to_chat(user, "<span class='notice'>We have revived ourselves.</span>")
-	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	changeling.purchasedpowers -= src
 	src.action.Remove(user)
 	return TRUE

code/modules/antagonists/changeling/powers/strained_muscles.dm

@@ -4,7 +4,7 @@
 /obj/effect/proc_holder/changeling/strained_muscles
 	name = "Strained Muscles"
 	desc = "We evolve the ability to reduce the acid buildup in our muscles, allowing us to move much faster."
-	helptext = "The strain will make us tired, and we will rapidly become fatigued. Standard weight restrictions, like hardsuits, still apply. Cannot be used in lesser form."
+	helptext = "The strain will make us tired, and we will rapidly become fatigued. Standard weight restrictions, like hardsuits, still apply. Our chemical generation is drastically slowed while this is active. Cannot be used in lesser form."
 	dna_cost = 1
 	req_human = 1
 	var/stacks = 0 //Increments every 5 seconds; damage increases over time
@@ -14,12 +14,15 @@
 	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/strained_muscles/sting_action(mob/living/carbon/user)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	active = !active
 	if(active)
 		to_chat(user, "<span class='notice'>Our muscles tense and strengthen.</span>")
+		changeling.chem_recharge_slowdown += 0.8 // stacking this with other abilities will cause you to actively lose chemicals
 	else
 		user.remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
 		to_chat(user, "<span class='notice'>Our muscles relax.</span>")
+		changeling.chem_recharge_slowdown -= 0.8
 		if(stacks >= 10)
 			to_chat(user, "<span class='danger'>We collapse in exhaustion.</span>")
 			user.DefaultCombatKnockdown(60)
@@ -30,6 +33,7 @@
 	return TRUE
 
 /obj/effect/proc_holder/changeling/strained_muscles/proc/muscle_loop(mob/living/carbon/user)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	while(active)
 		user.add_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
 		if(user.stat != CONSCIOUS || user.staminaloss >= 90)
@@ -37,6 +41,7 @@
 			to_chat(user, "<span class='notice'>Our muscles relax without the energy to strengthen them.</span>")
 			user.DefaultCombatKnockdown(40)
 			user.remove_movespeed_modifier(/datum/movespeed_modifier/strained_muscles)
+			changeling.chem_recharge_slowdown -= 0.8
 			break
 
 		stacks++

code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm

@@ -225,18 +225,22 @@
 	return ..()
 
 /obj/effect/clockwork/sigil/transmission/process()
-    var/power_drained = 0
-    var/power_mod = 0.005
-    for(var/t in spiral_range_turfs(SIGIL_ACCESS_RANGE, src))
-        var/turf/T = t
-        for(var/M in T)
-            var/atom/movable/A = M
-            power_drained += A.power_drain(TRUE)
+	do_process()
 
-        CHECK_TICK
+/obj/effect/clockwork/sigil/transmission/proc/do_process()
+	set waitfor = FALSE
+	var/power_drained = 0
+	var/power_mod = 0.005
+	for(var/t in spiral_range_turfs(SIGIL_ACCESS_RANGE, src))
+		var/turf/T = t
+		for(var/M in T)
+			var/atom/movable/A = M
+			power_drained += A.power_drain(TRUE)
 
-    adjust_clockwork_power(power_drained * power_mod * 15)
-    new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035))
+		CHECK_TICK
+
+	adjust_clockwork_power(power_drained * power_mod * 15)
+	new /obj/effect/temp_visual/ratvar/sigil/transmission(loc, 1 + (power_drained * 0.0035))
 
 /obj/effect/clockwork/sigil/transmission/proc/charge_cyborg(mob/living/silicon/robot/cyborg)
 	if(!cyborg_checks(cyborg))

code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm

@@ -29,7 +29,7 @@
 			return
 	return TRUE
 
-/obj/effect/clockwork/servant_blocker/BlockSuperconductivity()
+/obj/effect/clockwork/servant_blocker/BlockThermalConductivity()
 	return TRUE
 
 /obj/effect/clockwork/servant_blocker/singularity_act()

code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm

@@ -8,7 +8,7 @@
 	desc = "A resilient shield made out of brass.. It feels warm to the touch."
 	var/clockwork_desc = "A powerful shield of ratvarian making. It absorbs blocked attacks to charge devastating bashes."
 	armor = list("melee" = 80, "bullet" = 70, "laser" = -10, "energy" = -20, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	shield_flags = SHIELD_FLAGS_DEFAULT
+	shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_KINETIC_STRONG | SHIELD_ENERGY_WEAK
 	max_integrity = 300 //High integrity, extremely strong against melee / bullets, but still quite easy to destroy with lasers and energy
 	repair_material = /obj/item/stack/tile/brass
 	var/dam_absorbed = 0

code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm

@@ -90,7 +90,6 @@
 	parry_time_perfect = 2
 	parry_efficiency_perfect = 110 //Very low leeway for counterattacks...
 	parry_efficiency_considered_successful = 0.8
-	parry_efficiency_to_counterattack = 1
+	parry_efficiency_to_counterattack = 110
 	parry_cooldown = 15 //But also very low cooldown..
 	parry_failed_stagger_duration = 2 SECONDS //And relatively small penalties for failing.
-	parry_failed_clickcd_duration = 1 SECONDS

code/modules/antagonists/clockcult/clock_mobs/_eminence.dm

@@ -37,7 +37,7 @@
 					lastWarning = world.time
 					to_chat(src, "<span class='warning'>This turf is consecrated and can't be crossed!</span>")
 				return
-			if(istype(get_area(T), /area/chapel))
+			if(istype(get_area(T), /area/service/chapel))
 				if((world.time - lastWarning) >= 30)
 					lastWarning = world.time
 					to_chat(src, "<span class='warning'>The Chapel is hallowed ground under a heretical deity, and can't be accessed!</span>")

code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm

@@ -24,7 +24,8 @@
 
 /datum/clockwork_scripture/create_object/stargazer/check_special_requirements()
 	var/area/A = get_area(invoker)
-	if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
+	var/turf/T = get_turf(invoker)
+	if(!is_station_level(invoker.z) || isspaceturf(T) || !(A?.area_flags & CULT_PERMITTED))
 		to_chat(invoker, "<span class='danger'>Stargazers can't be built off-station.</span>")
 		return
 	return ..()

code/modules/antagonists/clockcult/clock_scriptures/scripture_judgement.dm

@@ -34,7 +34,7 @@
 			return FALSE
 		var/area/A = get_area(invoker)
 		var/turf/T = get_turf(invoker)
-		if(!T || !is_station_level(T.z) || istype(A, /area/shuttle) || !A.blob_allowed)
+		if(!is_station_level(T.z) || isspaceturf(T) || !(A?.area_flags & CULT_PERMITTED) || isshuttleturf(T))
 			to_chat(invoker, "<span class='warning'>You must be on the station to activate the Ark!</span>")
 			return FALSE
 		if(GLOB.clockwork_gateway_activated)

code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm

@@ -87,7 +87,7 @@
 		if(!M || !M.current)
 			continue
 		if(ishuman(M.current))
-			M.current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
+			M.current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -ANTAG_LAYER))
 	var/turf/T = get_turf(src)
 	var/list/open_turfs = list()
 	for(var/turf/open/OT in orange(1, T))
@@ -181,9 +181,15 @@
 			make_glow()
 			glow.icon_state = "clockwork_gateway_disrupted"
 			resistance_flags |= INDESTRUCTIBLE
-			sleep(27)
-			explosion(src, 1, 3, 8, 8)
-			sound_to_playing_players('sound/effects/explosion_distant.ogg', volume = 50)
+			addtimer(CALLBACK(src, .proc/go_boom), 2.7 SECONDS)
+			return
+	qdel(src)
+
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/go_boom()
+	if(QDELETED(src))
+		return
+	explosion(src, 1, 3, 8, 8)
+	sound_to_playing_players('sound/effects/explosion_distant.ogg', volume = 50)
 	qdel(src)
 
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/make_glow()
@@ -240,6 +246,36 @@
 				if(GATEWAY_RATVAR_COMING to INFINITY)
 					. += "<span class='boldwarning'>The anomaly is stable! Something is coming through!</span>"
 
+/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/fulfill_purpose()
+	set waitfor = FALSE
+	countdown.stop()
+	resistance_flags |= INDESTRUCTIBLE
+	purpose_fulfilled = TRUE
+	make_glow()
+	animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
+	sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds
+	sleep(125)
+	make_glow()
+	animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
+	QDEL_IN(src, 3)
+	sleep(3)
+	GLOB.clockwork_gateway_activated = TRUE
+	var/turf/T = SSmapping.get_station_center()
+	new /obj/structure/destructible/clockwork/massive/ratvar(T)
+	var/x0 = T.x
+	var/y0 = T.y
+	for(var/I in spiral_range_turfs(255, T, tick_checked = TRUE))
+		var/turf/T2 = I
+		if(!T2)
+			continue
+		var/dist = cheap_hypotenuse(T2.x, T2.y, x0, y0)
+		if(dist < 100)
+			dist = TRUE
+		else
+			dist = FALSE
+		T.ratvar_act(dist)
+		CHECK_TICK
+
 /obj/structure/destructible/clockwork/massive/celestial_gateway/process()
 	adjust_clockwork_power(2.5) //Provides weak power generation on its own
 	if(seconds_until_activation)
@@ -300,33 +336,7 @@
 			glow.icon_state = "clockwork_gateway_closing"
 		if(GATEWAY_RATVAR_ARRIVAL to INFINITY)
 			if(!purpose_fulfilled)
-				countdown.stop()
-				resistance_flags |= INDESTRUCTIBLE
-				purpose_fulfilled = TRUE
-				make_glow()
-				animate(glow, transform = matrix() * 1.5, alpha = 255, time = 125)
-				sound_to_playing_players(volume = 100, channel = CHANNEL_JUSTICAR_ARK, S = sound('sound/effects/ratvar_rises.ogg')) //End the sounds
-				sleep(125)
-				make_glow()
-				animate(glow, transform = matrix() * 3, alpha = 0, time = 5)
-				QDEL_IN(src, 3)
-				sleep(3)
-				GLOB.clockwork_gateway_activated = TRUE
-				var/turf/T = SSmapping.get_station_center()
-				new /obj/structure/destructible/clockwork/massive/ratvar(T)
-				var/x0 = T.x
-				var/y0 = T.y
-				for(var/I in spiral_range_turfs(255, T, tick_checked = TRUE))
-					var/turf/T2 = I
-					if(!T2)
-						continue
-					var/dist = cheap_hypotenuse(T2.x, T2.y, x0, y0)
-					if(dist < 100)
-						dist = TRUE
-					else
-						dist = FALSE
-					T.ratvar_act(dist)
-					CHECK_TICK
+				fulfill_purpose()
 
 //Converts nearby turfs into their clockwork equivalent, with ever-increasing range the closer the ark is to summoning Ratvar
 /obj/structure/destructible/clockwork/massive/celestial_gateway/proc/conversion_pulse()

code/modules/antagonists/clockcult/clock_structures/prolonging_prism.dm

@@ -60,12 +60,8 @@
 		delay_remaining += PRISM_DELAY_DURATION
 		toggle(0, user)
 
-/obj/structure/destructible/clockwork/powered/prolonging_prism/process()
-	var/turf/own_turf = get_turf(src)
-	if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !is_station_level(own_turf.z))
-		forced_disable(FALSE)
-		return
-	. = ..()
+/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/do_process()
+	set waitfor = FALSE
 	var/delay_amount = 40
 	delay_remaining -= delay_amount
 	var/efficiency = get_efficiency_mod()
@@ -114,6 +110,14 @@
 				new /obj/effect/temp_visual/ratvar/prolonging_prism(T)
 		CHECK_TICK //we may be going over a hell of a lot of turfs
 
+/obj/structure/destructible/clockwork/powered/prolonging_prism/process()
+	var/turf/own_turf = get_turf(src)
+	if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || !is_station_level(own_turf.z))
+		forced_disable(FALSE)
+		return
+	. = ..()
+	do_process()
+
 /obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost()
 	return FLOOR(delay_cost, MIN_CLOCKCULT_POWER)
 

code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm

@@ -110,6 +110,7 @@
 
 //Put me in Reebe, will you? Ratvar has found and is going to do a hecking murder on Nar'Sie
 /obj/structure/destructible/clockwork/massive/ratvar/proc/clash_of_the_titans(obj/singularity/narsie/narsie)
+	set waitfor = FALSE
 	var/winner = "Undeclared"
 	var/base_victory_chance = 1
 	while(src && narsie)

code/modules/antagonists/clockcult/clock_structures/stargazer.dm

@@ -52,7 +52,7 @@
 				break
 	if(has_starlight && anchored)
 		var/area/A = get_area(src)
-		if(A.outdoors || A.map_name == "Space" || !A.blob_allowed)
+		if(A.outdoors || A.map_name == "Space" || !(A?.area_flags & CULT_PERMITTED))
 			has_starlight = FALSE
 	if(old_status != has_starlight)
 		if(has_starlight)

code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm

@@ -115,7 +115,7 @@
 			skewee.visible_message("<span class='warning'>[skewee] painfully slides back down [src].</span>")
 			if(skewee.stat >= UNCONSCIOUS)
 				return //by ratvar, no more spamming my deadchat, holy fuck
-			skewee.say("Oof, ouch owwie!!", forced = "fail brass skewer removal")
+			skewee.emote("pain")
 			return
 	skewee.visible_message("<span class='danger'>[skewee] comes free of [src] with a squelching pop!</span>", \
 	"<span class='boldannounce'>You come free of [src]!</span>")

code/modules/antagonists/clockcult/clockcult.dm

@@ -139,7 +139,7 @@
 	current.throw_alert("clockinfo", /obj/screen/alert/clockwork/infodump)
 	var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
 	if(G && G.active && ishuman(current))
-		current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -MUTATIONS_LAYER))
+		current.add_overlay(mutable_appearance('icons/effects/genetics.dmi', "servitude", -ANTAG_LAYER))
 
 /datum/antagonist/clockcult/remove_innate_effects(mob/living/mob_override)
 	var/mob/living/current = owner.current

code/modules/antagonists/cult/blood_magic.dm

@@ -385,8 +385,7 @@
 		qdel(src)
 		return
 	log_combat(user, M, "used a cult spell on", source.name, "")
-	M.lastattacker = user.real_name
-	M.lastattackerckey = user.ckey
+	M.set_last_attacker(user)
 
 /obj/item/melee/blood_magic/afterattack(atom/target, mob/living/carbon/user, proximity)
 	. = ..()

code/modules/antagonists/cult/cult.dm

@@ -332,7 +332,7 @@
 		var/mob/living/carbon/human/H = cultist
 		new /obj/effect/temp_visual/cult/sparks(get_turf(H), H.dir)
 		var/istate = pick("halo1","halo2","halo3","halo4","halo5","halo6")
-		H.add_overlay(mutable_appearance('icons/effects/32x64.dmi', istate, -BODY_FRONT_LAYER))
+		H.add_overlay(mutable_appearance('icons/effects/32x64.dmi', istate, -ANTAG_LAYER))
 
 /datum/team/cult/proc/setup_objectives()
 	//SAC OBJECTIVE , todo: move this to objective internals
@@ -419,7 +419,7 @@
 	var/sanity = 0
 	while(summon_spots.len < SUMMON_POSSIBILITIES && sanity < 100)
 		var/area/summon = pick(GLOB.sortedAreas - summon_spots)
-		if(summon && is_station_level(summon.z) && summon.valid_territory)
+		if(summon && is_station_level(summon.z) && (summon.area_flags & VALID_TERRITORY))
 			summon_spots += summon
 		sanity++
 	update_explanation_text()

code/modules/antagonists/cult/cult_structures.dm

@@ -204,26 +204,31 @@
 	STOP_PROCESSING(SSfastprocess, src)
 	return ..()
 
+/obj/structure/destructible/cult/pylon/proc/heal_friends()
+	set waitfor = FALSE
+	for(var/mob/living/L in range(5, src))
+		if(iscultist(L) || isshade(L) || isconstruct(L))
+			if(L.health != L.maxHealth)
+				new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
+				if(ishuman(L))
+					L.adjustBruteLoss(-1, 0, only_organic = FALSE)
+					L.adjustFireLoss(-1, 0, only_organic = FALSE)
+					L.updatehealth()
+				if(isshade(L) || isconstruct(L))
+					var/mob/living/simple_animal/M = L
+					if(M.health < M.maxHealth)
+						M.adjustHealth(-3)
+			if(ishuman(L) && L.blood_volume < (BLOOD_VOLUME_NORMAL * L.blood_ratio))
+				L.blood_volume += 1.0
+		CHECK_TICK
+
+
 /obj/structure/destructible/cult/pylon/process()
 	if(!anchored)
 		return
 	if(last_heal <= world.time)
 		last_heal = world.time + heal_delay
-		for(var/mob/living/L in range(5, src))
-			if(iscultist(L) || isshade(L) || isconstruct(L))
-				if(L.health != L.maxHealth)
-					new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
-					if(ishuman(L))
-						L.adjustBruteLoss(-1, 0, only_organic = FALSE)
-						L.adjustFireLoss(-1, 0, only_organic = FALSE)
-						L.updatehealth()
-					if(isshade(L) || isconstruct(L))
-						var/mob/living/simple_animal/M = L
-						if(M.health < M.maxHealth)
-							M.adjustHealth(-3)
-				if(ishuman(L) && L.blood_volume < (BLOOD_VOLUME_NORMAL * L.blood_ratio))
-					L.AddIntegrationBlood(1)
-			CHECK_TICK
+		heal_friends()
 	if(last_corrupt <= world.time)
 		var/list/validturfs = list()
 		var/list/cultturfs = list()

code/modules/antagonists/cult/ritual.dm

@@ -148,7 +148,7 @@ This file contains the cult dagger and rune list code
 		to_chat(user, "<span class='cult'>There is already a rune here.</span>")
 		return FALSE
 	var/area/A = get_area(T)
-	if((!is_station_level(T.z) && !is_mining_level(T.z)) || (A && !A.blob_allowed))
+	if((!is_station_level(T.z) && !is_mining_level(T.z)) || !(A?.area_flags & CULT_PERMITTED))
 		to_chat(user, "<span class='warning'>The veil is not weak enough here.</span>")
 		return FALSE
 	return TRUE

code/modules/antagonists/cult/runes.dm

@@ -647,7 +647,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	GLOB.wall_runes -= src
 	return ..()
 
-/obj/effect/rune/wall/BlockSuperconductivity()
+/obj/effect/rune/wall/BlockThermalConductivity()
 	return density
 
 /obj/effect/rune/wall/invoke(var/list/invokers)

code/modules/antagonists/devil/devil.dm

@@ -515,7 +515,6 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 		var/mob/living/silicon/robot_devil = owner.current
 		var/laws = list("You may not use violence to coerce someone into selling their soul.", "You may not directly and knowingly physically harm a devil, other than yourself.", GLOB.lawlorify[LAW][ban], GLOB.lawlorify[LAW][obligation], "Accomplish your objectives at all costs.")
 		robot_devil.set_law_sixsixsix(laws)
-	sleep(10)
 	if(owner.assigned_role == "Clown" && ishuman(owner.current))
 		var/mob/living/carbon/human/S = owner.current
 		to_chat(S, "<span class='notice'>Your infernal nature has allowed you to overcome your clownishness.</span>")

code/modules/antagonists/eldritch_cult/eldritch_antag.dm

@@ -25,9 +25,9 @@
 	to_chat(owner, "<span class='boldannounce'>You are the Heretic!</span><br>\
 	<B>The old ones gave you these tasks to fulfill:</B>")
 	owner.announce_objectives()
-	to_chat(owner, "<span class='cult'>The book whispers, the forbidden knowledge walks once again!<br>\
-	Your book allows you to research abilities, but be careful, you cannot undo what has been done.<br>\
-	You gain charges by either collecting influences or sacrificing people tracked by the living heart<br> \
+	to_chat(owner, "<span class='cult'>The book whispers softly, its forbidden knowledge walks this plane once again!<br>\
+	Your book allows you to research abilities. Read it very carefully, for you cannot undo what has been done!<br>\
+	You gain charges by either collecting influences or sacrificing people tracked by the living heart.<br> \
 	You can find a basic guide at : https://tgstation13.org/wiki/Heresy_101 </span>")
 
 /datum/antagonist/heretic/on_gain()
@@ -39,7 +39,6 @@
 		gain_knowledge(/datum/eldritch_knowledge/spell/basic)
 		gain_knowledge(/datum/eldritch_knowledge/living_heart)
 		gain_knowledge(/datum/eldritch_knowledge/codex_cicatrix)
-		gain_knowledge(/datum/eldritch_knowledge/eldritch_blade)
 	current.log_message("has been converted to the cult of the forgotten ones!", LOG_ATTACK, color="#960000")
 	GLOB.reality_smash_track.AddMind(owner)
 	START_PROCESSING(SSprocessing,src)
@@ -59,6 +58,8 @@
 	GLOB.reality_smash_track.RemoveMind(owner)
 	STOP_PROCESSING(SSprocessing,src)
 
+	on_death()
+
 	return ..()
 
 
@@ -90,15 +91,25 @@
 
 /datum/antagonist/heretic/process()
 
+	if(owner.current.stat == DEAD)
+		return
+
 	for(var/X in researched_knowledge)
 		var/datum/eldritch_knowledge/EK = researched_knowledge[X]
 		EK.on_life(owner.current)
 
+///What happens to the heretic once he dies, used to remove any custom perks
+/datum/antagonist/heretic/proc/on_death()
+
+	for(var/X in researched_knowledge)
+		var/datum/eldritch_knowledge/EK = researched_knowledge[X]
+		EK.on_death(owner.current)
+
 /datum/antagonist/heretic/proc/forge_primary_objectives()
 	var/list/assasination = list()
 	var/list/protection = list()
 	for(var/i in 1 to 2)
-		var/pck = pick("assasinate","protect")
+		var/pck = pick("assasinate")
 		switch(pck)
 			if("assasinate")
 				var/datum/objective/assassinate/once/A = new
@@ -107,13 +118,6 @@
 				A.find_target(owners,protection)
 				assasination += A.target
 				objectives += A
-			if("protect")
-				var/datum/objective/protect/P = new
-				P.owner = owner
-				var/list/owners = P.get_owners()
-				P.find_target(owners,assasination)
-				protection += P.target
-				objectives += P
 
 	var/datum/objective/sacrifice_ecult/SE = new
 	SE.owner = owner
@@ -126,7 +130,7 @@
 	if(mob_override)
 		current = mob_override
 	add_antag_hud(antag_hud_type, antag_hud_name, current)
-	handle_clown_mutation(current, mob_override ? null : "Knowledge described in the book allowed you to overcome your clownish nature, allowing you to use complex items effectively.")
+	handle_clown_mutation(current, mob_override ? null : "Ancient knowledge described in the book allows you to overcome your clownish nature, allowing you to use complex items effectively.")
 	current.faction |= "heretics"
 
 /datum/antagonist/heretic/remove_innate_effects(mob/living/mob_override)
@@ -161,7 +165,7 @@
 				cultiewin = FALSE
 			count++
 	if(ascended)
-		parts += "<span class='greentext big'>HERETIC HAS ASCENDED!</span>"
+		parts += "<span class='greentext big'>THE HERETIC ASCENDED!</span>"
 	else
 		if(cultiewin)
 			parts += "<span class='greentext'>The heretic was successful!</span>"

code/modules/antagonists/eldritch_cult/eldritch_book.dm

@@ -1,6 +1,6 @@
 /obj/item/forbidden_book
 	name = "Codex Cicatrix"
-	desc = "Book describing the secrets of the veil."
+	desc = "This book describes the secrets of the veil between worlds."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "codex"
 	item_state = "codex"
@@ -74,8 +74,8 @@
 	last_user = user
 	ui = SStgui.try_update_ui(user, src, ui)
 	if(!ui)
-		icon_state = "book_open"
-		flick("book_opening", src)
+		icon_state = "codex_open"
+		flick("codex_opening", src)
 		ui = new(user, src, "ForbiddenLore", name)
 		ui.open()
 
@@ -89,6 +89,7 @@
 	var/list/lore = list()
 
 	data["charges"] = charge
+	data["total_sacs"] = cultie.total_sacrifices
 
 	for(var/X in to_know)
 		lore = list()
@@ -96,7 +97,11 @@
 		lore["type"] = EK.type
 		lore["name"] = EK.name
 		lore["cost"] = EK.cost
-		lore["disabled"] = EK.cost <= charge ? FALSE : TRUE
+		lore["sacs"] = EK.sacs_needed
+		if(EK.cost <= charge && cultie.total_sacrifices >= EK.sacs_needed)
+			lore["disabled"] = FALSE
+		else
+			lore["disabled"] = TRUE
 		lore["path"] = EK.route
 		lore["state"] = "Research"
 		lore["flavour"] = EK.gain_text
@@ -108,6 +113,7 @@
 		var/datum/eldritch_knowledge/EK = known[X]
 		lore["name"] = EK.name
 		lore["cost"] = EK.cost
+		lore["sacs"] = EK.sacs_needed
 		lore["disabled"] = TRUE
 		lore["path"] = EK.route
 		lore["state"] = "Researched"
@@ -133,13 +139,13 @@
 				if(initial(EK.name) != ekname)
 					continue
 				if(cultie.gain_knowledge(EK))
-					charge -= text2num(params["cost"])
+					charge -= initial(EK.cost)
 					return TRUE
 
 	update_icon() // Not applicable to all objects.
 
 /obj/item/forbidden_book/ui_close(mob/user)
-	flick("book_closing",src)
+	flick("codex_closing",src)
 	icon_state = initial(icon_state)
 	return ..()
 

code/modules/antagonists/eldritch_cult/eldritch_effects.dm

@@ -1,6 +1,6 @@
 /obj/effect/eldritch
 	name = "Generic rune"
-	desc = "Weird combination of shapes and symbols etched into the floor itself. The indentation is filled with thick black tar-like fluid."
+	desc = "A flowing circle of shapes and runes is etched into the floor, filled with a thick black tar-like fluid."
 	anchored = TRUE
 	icon_state = ""
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -14,7 +14,7 @@
 	I.override = TRUE
 	add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", I)
 
-/obj/effect/eldritch/attack_hand(mob/living/user)
+/obj/effect/eldritch/attack_hand(mob/living/user, list/modifiers)
 	. = ..()
 	if(.)
 		return
@@ -81,7 +81,7 @@
 			continue
 
 		flick("[icon_state]_active",src)
-		playsound(user, 'sound/magic/castsummon.ogg', 75, TRUE)
+		playsound(user, 'sound/magic/castsummon.ogg', 75, TRUE, extrarange = SILENCED_SOUND_EXTRARANGE, falloff_exponent = 10)
 		//we are doing this since some on_finished_recipe subtract the atoms from selected_atoms making them invisible permanently.
 		var/list/atoms_to_disappear = selected_atoms.Copy()
 		for(var/to_disappear in atoms_to_disappear)
@@ -90,31 +90,31 @@
 			atom_to_disappear.invisibility = INVISIBILITY_ABSTRACT
 		if(current_eldritch_knowledge.on_finished_recipe(user,selected_atoms,loc))
 			current_eldritch_knowledge.cleanup_atoms(selected_atoms)
-			is_in_use = FALSE
 
 		for(var/to_appear in atoms_to_disappear)
 			var/atom/atom_to_appear = to_appear
 			//we need to reappear the item just in case the ritual didnt consume everything... or something.
 			atom_to_appear.invisibility = initial(atom_to_appear.invisibility)
 
+		is_in_use = FALSE
 		return
 	is_in_use = FALSE
-	to_chat(user,"<span class='warning'>Your ritual failed! You used either wrong components or are missing something important!</span>")
+	to_chat(user,"<span class='warning'>Your ritual failed! You either used the wrong components or are missing something important!</span>")
 
 /obj/effect/eldritch/big
-	name = "transmutation circle"
+	name = "transmutation rune"
 	icon = 'icons/effects/96x96.dmi'
 	icon_state = "eldritch_rune1"
 	pixel_x = -32 //So the big ol' 96x96 sprite shows up right
 	pixel_y = -32
 
 /**
-  * #Reality smash tracker
-  *
-  * Stupid fucking list holder, DONT create new ones, it will break the game, this is automnatically created whenever eldritch cultists are created.
-  *
-  * Tracks relevant data, generates relevant data, useful tool
-  */
+ * #Reality smash tracker
+ *
+ * Stupid fucking list holder, DONT create new ones, it will break the game, this is automnatically created whenever eldritch cultists are created.
+ *
+ * Tracks relevant data, generates relevant data, useful tool
+ */
 /datum/reality_smash_tracker
 	///list of tracked reality smashes
 	var/list/smashes = list()
@@ -127,12 +127,11 @@
 	QDEL_LIST(smashes)
 	targets.Cut()
 	return ..()
-
 /**
-  * Automatically fixes the target and smash network
-  *
-  * Fixes any bugs that are caused by late Generate() or exchanging clients
-  */
+ * Automatically fixes the target and smash network
+ *
+ * Fixes any bugs that are caused by late Generate() or exchanging clients
+ */
 /datum/reality_smash_tracker/proc/ReworkNetwork()
 	listclearnulls(smashes)
 	for(var/mind in targets)
@@ -144,52 +143,70 @@
 			reality_smash.AddMind(mind)
 
 /**
-  * Generates a set amount of reality smashes based on the N value
-  *
-  * Automatically creates more reality smashes
-  */
-/datum/reality_smash_tracker/proc/_Generate()
+ * Generates a set amount of reality smashes based on the N value
+ *
+ * Automatically creates more reality smashes
+ */
+/datum/reality_smash_tracker/proc/Generate(mob/caller)
+	if(istype(caller))
+		targets += caller
 	var/targ_len = length(targets)
 	var/smash_len = length(smashes)
-	var/number = targ_len * 6 - smash_len
+	var/number = max(targ_len * (6-(targ_len-1)) - smash_len,1)
 
 	for(var/i in 0 to number)
-
 		var/turf/chosen_location = get_safe_random_station_turf()
+
 		//we also dont want them close to each other, at least 1 tile of seperation
 		var/obj/effect/reality_smash/what_if_i_have_one = locate() in range(1, chosen_location)
 		var/obj/effect/broken_illusion/what_if_i_had_one_but_got_used = locate() in range(1, chosen_location)
 		if(what_if_i_have_one || what_if_i_had_one_but_got_used) //we dont want to spawn
 			continue
-		var/obj/effect/reality_smash/RS = new/obj/effect/reality_smash(chosen_location)
-		smashes += RS
+		new /obj/effect/reality_smash(chosen_location)
 	ReworkNetwork()
 
+/**
+*CIT CHANGE
+*
+*Creates a singular reality smash
+*Credit to slimelust
+*/
+
+/datum/reality_smash_tracker/proc/RandomSpawnSmash(var/deferred = FALSE)
+	var/turf/chosen_location = get_safe_random_station_turf()
+	//we also dont want them close to each other, at least 1 tile of separation
+	var/obj/effect/reality_smash/what_if_i_have_one = locate() in range(1, chosen_location)
+	var/obj/effect/broken_illusion/what_if_i_had_one_but_got_used = locate() in range(1, chosen_location)
+	var/tries = 10
+	while((what_if_i_have_one || what_if_i_had_one_but_got_used) && tries-- > 0)
+		chosen_location = get_safe_random_station_turf()
+	new /obj/effect/reality_smash(chosen_location)
+	if(!deferred)
+		ReworkNetwork()
 
 /**
-  * Adds a mind to the list of people that can see the reality smashes
-  *
-  * Use this whenever you want to add someone to the list
-  */
-/datum/reality_smash_tracker/proc/AddMind(var/datum/mind/M)
-	RegisterSignal(M.current,COMSIG_MOB_CLIENT_LOGIN,.proc/ReworkNetwork)
-	targets |= M
-	_Generate()
-	for(var/X in smashes)
-		var/obj/effect/reality_smash/reality_smash = X
-		reality_smash.AddMind(M)
+ * Adds a mind to the list of people that can see the reality smashes
+ *
+ * Use this whenever you want to add someone to the list
+ */
+/datum/reality_smash_tracker/proc/AddMind(datum/mind/e_cultists)
+	RegisterSignal(e_cultists.current,COMSIG_MOB_CLIENT_LOGIN,.proc/ReworkNetwork)
+	targets |= e_cultists
+	Generate()
+	for(var/obj/effect/reality_smash/reality_smash in smashes)
+		reality_smash.AddMind(e_cultists)
 
 
 /**
-  * Removes a mind from the list of people that can see the reality smashes
-  *
-  * Use this whenever you want to remove someone from the list
-  */
-/datum/reality_smash_tracker/proc/RemoveMind(var/datum/mind/M)
-	UnregisterSignal(M.current,COMSIG_MOB_CLIENT_LOGIN)
-	targets -= M
-	for(var/obj/effect/reality_smash/RS in smashes)
-		RS.RemoveMind(M)
+ * Removes a mind from the list of people that can see the reality smashes
+ *
+ * Use this whenever you want to remove someone from the list
+ */
+/datum/reality_smash_tracker/proc/RemoveMind(datum/mind/e_cultists)
+	UnregisterSignal(e_cultists.current,COMSIG_MOB_CLIENT_LOGIN)
+	targets -= e_cultists
+	for(var/obj/effect/reality_smash/reality_smash in smashes)
+		reality_smash.RemoveMind(e_cultists)
 
 /obj/effect/broken_illusion
 	name = "pierced reality"
@@ -198,66 +215,75 @@
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	alpha = 0
-	invisibility = INVISIBILITY_OBSERVER
 
 /obj/effect/broken_illusion/Initialize()
 	. = ..()
-	addtimer(CALLBACK(src, .proc/show_presence), 15 SECONDS)
-	var/image/I = image(icon = 'icons/effects/eldritch.dmi', icon_state = null, loc = src)
+	addtimer(CALLBACK(src,.proc/show_presence),15 SECONDS)
+	addtimer(CALLBACK(src,.proc/remove_presence),195 SECONDS)
+
+	var/image/I = image('icons/effects/eldritch.dmi',src,null,OBJ_LAYER)
 	I.override = TRUE
 	add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "pierced_reality", I)
 
-/obj/effect/broken_illusion/proc/show_presence()
-	invisibility = 0
-	animate(src, alpha = 255, time = 15 SECONDS)
+/obj/effect/broken_illusion/Destroy()
+	GLOB.reality_smash_track.RandomSpawnSmash()
+	return ..()
 
-/obj/effect/broken_illusion/attack_hand(mob/living/user)
+///Makes this obj appear out of nothing
+/obj/effect/broken_illusion/proc/show_presence()
+	animate(src,alpha = 255,time = 15 SECONDS)
+
+/obj/effect/broken_illusion/proc/remove_presence()
+	qdel(src)
+
+/obj/effect/broken_illusion/attack_hand(mob/living/user, list/modifiers)
 	if(!ishuman(user))
 		return ..()
 	var/mob/living/carbon/human/human_user = user
 	if(IS_HERETIC(human_user))
-		to_chat(human_user,"<span class='boldwarning'>You know better than to tempt forces out of your control.</span>")
+		to_chat(human_user,"<span class='boldwarning'>You know better than to tempt forces out of your control!</span>")
 	else
 		var/obj/item/bodypart/arm = human_user.get_active_hand()
 		if(prob(25))
-			to_chat(human_user,"<span class='userdanger'>An otherwordly presence tears your arm apart into atoms as you try to touch the hole in the very fabric of reality!</span>")
+			to_chat(human_user,"<span class='userdanger'>An otherwordly presence tears and atomizes your arm as you try to touch the hole in the very fabric of reality!</span>")
 			arm.dismember()
 			qdel(arm)
 		else
-			to_chat(human_user,"<span class='danger'>You pull your hand away from the hole as eldritch energy flails out, trying to latch onto existence itself!</span>")
+			to_chat(human_user,"<span class='danger'>You pull your hand away from the hole as the eldritch energy flails trying to latch onto existance itself!</span>")
+
 
 /obj/effect/broken_illusion/attack_tk(mob/user)
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/human_user = user
 	if(IS_HERETIC(human_user))
-		to_chat(human_user,"<span class='boldwarning'>You know better than to tempt forces out of your control.</span>")
+		to_chat(human_user,"<span class='boldwarning'>You know better than to tempt forces out of your control!</span>")
+		return
+	//a very elaborate way to suicide
+	to_chat(human_user,"<span class='userdanger'>Eldritch energy lashes out, piercing your fragile mind, tearing it to pieces!</span>")
+	human_user.ghostize()
+	var/obj/item/bodypart/head/head = locate() in human_user.bodyparts
+	if(head)
+		head.dismember()
+		qdel(head)
 	else
-		//a very elaborate way to suicide
-		to_chat(human_user,"<span class='userdanger'>Eldritch energy lashes out, piercing your fragile mind, tearing it to pieces!</span>")
-		human_user.ghostize()
-		var/obj/item/bodypart/head/head = locate() in human_user.bodyparts
-		if(head)
-			head.dismember()
-			qdel(head)
-		else
-			human_user.gib()
+		human_user.gib()
+
+	var/datum/effect_system/reagents_explosion/explosion = new()
+	explosion.set_up(1, get_turf(human_user), TRUE, 0)
+	explosion.start()
 
-		var/datum/effect_system/reagents_explosion/explosion = new()
-		explosion.set_up(1, get_turf(human_user), 1, 0)
-		explosion.start()
 
 /obj/effect/broken_illusion/examine(mob/user)
 	. = ..()
 	if(!IS_HERETIC(user) && ishuman(user))
 		var/mob/living/carbon/human/human_user = user
-		to_chat(human_user,"<span class='userdanger'>Your brain hurts when you look at this!</span>")
-		human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,20,190)
+		to_chat(human_user,"<span class='warning'>Your mind burns as you stare at the tear!</span>")
+		human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,10,190)
 		SEND_SIGNAL(human_user, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus)
-		log_game("[key_name(user)] stared at a pierced reality at [AREACOORD(user)]")
 
 /obj/effect/reality_smash
-	name = "/improper reality smash"
+	name = "reality smash"
 	icon = 'icons/effects/eldritch.dmi'
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -271,44 +297,41 @@
 
 /obj/effect/reality_smash/Initialize()
 	. = ..()
+	GLOB.reality_smash_track.smashes += src
 	img = image(icon, src, image_state, OBJ_LAYER)
 	generate_name()
 
 /obj/effect/reality_smash/Destroy()
+	GLOB.reality_smash_track.smashes -= src
 	on_destroy()
 	return ..()
 
-///Custom effect that happens on destruction
 /obj/effect/reality_smash/proc/on_destroy()
-	for(var/cm in minds)
-		var/datum/mind/cultie = cm
-		if(cultie.current?.client)
-			cultie.current.client.images -= img
+	for(var/e_cultists in minds)
+		var/datum/mind/e_cultie = e_cultists
+		if(e_cultie.current?.client)
+			e_cultie.current.client.images -= img
 		//clear the list
-		minds -= cultie
-	GLOB.reality_smash_track.smashes -= src
+		minds -= e_cultie
 	img = null
-	new /obj/effect/broken_illusion(drop_location())
+	var/obj/effect/broken_illusion/illusion = new /obj/effect/broken_illusion(drop_location())
+	illusion.name = pick("Researched","Siphoned","Analyzed","Emptied","Drained") + " " + name
 
 ///Makes the mind able to see this effect
-/obj/effect/reality_smash/proc/AddMind(var/datum/mind/cultie)
-	minds |= cultie
-	if(cultie.current.client)
-		cultie.current.client.images |= img
-
-
+/obj/effect/reality_smash/proc/AddMind(datum/mind/e_cultie)
+	minds |= e_cultie
+	if(e_cultie.current.client)
+		e_cultie.current.client.images |= img
 
 ///Makes the mind not able to see this effect
-/obj/effect/reality_smash/proc/RemoveMind(var/datum/mind/cultie)
-	minds -= cultie
-	if(cultie.current.client)
-		cultie.current.client.images -= img
-
-
+/obj/effect/reality_smash/proc/RemoveMind(datum/mind/e_cultie)
+	minds -= e_cultie
+	if(e_cultie.current.client)
+		e_cultie.current.client.images -= img
 
 ///Generates random name
 /obj/effect/reality_smash/proc/generate_name()
 	var/static/list/prefix = list("Omniscient","Thundering","Enlightening","Intrusive","Rejectful","Atomized","Subtle","Rising","Lowering","Fleeting","Towering","Blissful","Arrogant","Threatening","Peaceful","Aggressive")
 	var/static/list/postfix = list("Flaw","Presence","Crack","Heat","Cold","Memory","Reminder","Breeze","Grasp","Sight","Whisper","Flow","Touch","Veil","Thought","Imperfection","Blemish","Blush")
 
-	name = pick(prefix) + " " + pick(postfix)
+	name = "\improper" + pick(prefix) + " " + pick(postfix)

code/modules/antagonists/eldritch_cult/eldritch_items.dm

@@ -1,6 +1,6 @@
 /obj/item/living_heart
 	name = "living heart"
-	desc = "Link to the worlds beyond."
+	desc = "A link to the worlds beyond."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "living_heart"
 	w_class = WEIGHT_CLASS_SMALL
@@ -35,7 +35,7 @@
 			if(0 to 15)
 				to_chat(user,"<span class='warning'>[target.real_name] is near you. They are to the [dir2text(dir)] of you!</span>")
 			if(16 to 31)
-				to_chat(user,"<span class='warning'>[target.real_name] is somewhere in your vicinty. They are to the [dir2text(dir)] of you!</span>")
+				to_chat(user,"<span class='warning'>[target.real_name] is somewhere in your vicinity. They are to the [dir2text(dir)] of you!</span>")
 			if(32 to 127)
 				to_chat(user,"<span class='warning'>[target.real_name] is far away from you. They are to the [dir2text(dir)] of you!</span>")
 			else
@@ -44,38 +44,8 @@
 	if(target.stat == DEAD)
 		to_chat(user,"<span class='warning'>[target.real_name] is dead. Bring them onto a transmutation rune!</span>")
 
-/datum/action/innate/heretic_shatter
-	name = "Shattering Offer"
-	desc = "By breaking your blade, you will be granted salvation from a dire situation. (Teleports you to a random safe turf on your current z level, but destroys your blade.)"
-	background_icon_state = "bg_ecult"
-	button_icon_state = "shatter"
-	icon_icon = 'icons/mob/actions/actions_ecult.dmi'
-	check_flags = NONE	// required_mobility_flags handles this
-	required_mobility_flags = MOBILITY_HOLD|MOBILITY_MOVE|MOBILITY_USE
-	var/mob/living/carbon/human/holder
-	var/obj/item/melee/sickly_blade/sword
-
-/datum/action/innate/heretic_shatter/Grant(mob/user, obj/object)
-	sword = object
-	holder = user
-	//i know what im doing
-	return ..()
-
-/datum/action/innate/heretic_shatter/IsAvailable()
-	if(IS_HERETIC(holder) || IS_HERETIC_MONSTER(holder))
-		return ..()
-	else
-		return FALSE
-
-/datum/action/innate/heretic_shatter/Activate()
-	. = ..()
-	var/turf/safe_turf = find_safe_turf(zlevels = sword.z, extended_safety_checks = TRUE)
-	do_teleport(holder,safe_turf,forceMove = TRUE)
-	to_chat(holder,"<span class='warning'>You feel a gust of energy flow through your body... the Rusted Hills heard your call...</span>")
-	qdel(sword)
-
 /obj/item/melee/sickly_blade
-	name = "eldritch blade"
+	name = "sickly blade"
 	desc = "A sickly green crescent blade, decorated with an ornamental eye. You feel like you're being watched..."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "eldritch_blade"
@@ -91,45 +61,56 @@
 	throwforce = 10
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended")
-	var/datum/action/innate/heretic_shatter/linked_action
 
-/obj/item/melee/sickly_blade/Initialize()
-	. = ..()
-	linked_action = new(src)
-
-/obj/item/melee/sickly_blade/attack(mob/living/M, mob/living/user)
-	if(!(IS_HERETIC(user) || !IS_HERETIC_MONSTER(user)))
-		to_chat(user,"<span class='danger'>You feel a pulse of some alien intellect lash out at your mind!</span>")
-		var/mob/living/carbon/human/human_user = user
-		human_user.AdjustParalyzed(5 SECONDS)
-		return FALSE
+/obj/item/melee/sickly_blade/attack(mob/living/target, mob/living/user)
+	if(!(IS_HERETIC(user) || IS_HERETIC_MONSTER(user)))
+		to_chat(user,"<span class='danger'>You feel a pulse of alien intellect lash out at your mind!</span>")
+		user.DefaultCombatKnockdown(100)
+		user.dropItemToGround(src, TRUE)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			H.apply_damage(rand(force/2, force), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
+		else
+			user.adjustBruteLoss(rand(force/2,force))
+		return
 	return ..()
 
-/obj/item/melee/sickly_blade/pickup(mob/user)
-	. = ..()
-	linked_action.Grant(user, src)
-
-/obj/item/melee/sickly_blade/dropped(mob/user, silent)
-	. = ..()
-	linked_action.Remove(user, src)
+/obj/item/melee/sickly_blade/attack_self(mob/user)
+	var/turf/safe_turf = find_safe_turf(zlevels = z, extended_safety_checks = TRUE)
+	if(IS_HERETIC(user) || IS_HERETIC_MONSTER(user))
+		if(do_teleport(user, safe_turf, forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC))
+			to_chat(user,"<span class='warning'>As you shatter [src], you feel a gust of energy flow through your body. The Rusted Hills heard your call...</span>")
+		else
+			to_chat(user,"<span class='warning'>You shatter [src], but your plea goes unanswered.</span>")
+	else
+		to_chat(user,"<span class='warning'>You shatter [src].</span>")
+	playsound(src, "shatter", 70, TRUE) //copied from the code for smashing a glass sheet onto the ground to turn it into a shard
+	qdel(src)
 
 /obj/item/melee/sickly_blade/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	var/datum/antagonist/heretic/cultie = user.mind.has_antag_datum(/datum/antagonist/heretic)
-	if(!cultie || !proximity_flag)
+	if(!cultie)
 		return
 	var/list/knowledge = cultie.get_all_knowledge()
 	for(var/X in knowledge)
 		var/datum/eldritch_knowledge/eldritch_knowledge_datum = knowledge[X]
-		eldritch_knowledge_datum.on_eldritch_blade(target,user,proximity_flag,click_parameters)
+		if(proximity_flag)
+			eldritch_knowledge_datum.on_eldritch_blade(target,user,proximity_flag,click_parameters)
+		else
+			eldritch_knowledge_datum.on_ranged_attack_eldritch_blade(target,user,click_parameters)
+
+/obj/item/melee/sickly_blade/examine(mob/user)
+	. = ..()
+	if(IS_HERETIC(user) || IS_HERETIC_MONSTER(user))
+		. += "<span class='notice'><B>A heretic (or a servant of one) can shatter this blade to teleport to a random, mostly safe location by activating it in-hand.</B></span>"
 
 /obj/item/melee/sickly_blade/rust
 	name = "rusted blade"
-	desc = "This crescent blade is decrepit, wasting to dust. Yet still it bites, catching flesh with jagged, rotten teeth."
+	desc = "This crescent blade is decrepit, wasting to rust. Yet still it bites, ripping flesh and bone with jagged, rotten teeth."
 	icon_state = "rust_blade"
 	item_state = "rust_blade"
 	embedding = list("pain_mult" = 4, "embed_chance" = 75, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
-	throwforce = 17
 
 /obj/item/melee/sickly_blade/ash
 	name = "ashen blade"
@@ -140,15 +121,22 @@
 
 /obj/item/melee/sickly_blade/flesh
 	name = "flesh blade"
-	desc = "A crescent blade born from a fleshwarped creature. Keenly aware, it seeks to spread to others the excruciations it has endured from dead origins."
+	desc = "A crescent blade born from a fleshwarped creature. Keenly aware, it seeks to spread to others the suffering it has endured from its dreadful origins."
 	icon_state = "flesh_blade"
 	item_state = "flesh_blade"
 	wound_bonus = 10
 	bare_wound_bonus = 20
 
+/obj/item/melee/sickly_blade/void
+	name = "void blade"
+	desc = "Devoid of any substance, this blade reflects nothingness. It is a real depiction of purity, and chaos that ensues after its implementation."
+	icon_state = "void_blade"
+	item_state = "void_blade"
+	throwforce = 25
+
 /obj/item/clothing/neck/eldritch_amulet
 	name = "warm eldritch medallion"
-	desc = "A strange medallion. Peering through the crystalline surface, the world around you melts away. You see your own beating heart, and the pulse of a thousand others."
+	desc = "A strange medallion. Peering through the crystalline surface, the world around you melts away. You see your own beating heart, and the pulsing of a thousand others."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "eye_medalion"
 	w_class = WEIGHT_CLASS_SMALL
@@ -186,7 +174,7 @@
 	item_state = "eldritch_armor"
 	flags_inv = HIDESHOES|HIDEJUMPSUIT
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS
-	allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book)
+	allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book, /obj/item/living_heart)
 	hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/eldritch
 	// slightly better than normal cult robes
 	armor = list("melee" = 50, "bullet" = 50, "laser" = 50,"energy" = 50, "bomb" = 35, "bio" = 20, "rad" = 0, "fire" = 20, "acid" = 20)
@@ -194,7 +182,244 @@
 
 /obj/item/reagent_containers/glass/beaker/eldritch
 	name = "flask of eldritch essence"
-	desc = "Toxic to the close minded. Healing to those with knowledge of the beyond."
+	desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "eldrich_flask"
 	list_reagents = list(/datum/reagent/eldritch = 50)
+
+/obj/item/clothing/head/hooded/cult_hoodie/void
+	name = "void hood"
+	icon_state = "void_cloak"
+	flags_inv = NONE
+	flags_cover = NONE
+	desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, with each flash you lose comprehension of what you are seeing."
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	obj_flags = NONE | EXAMINE_SKIP
+
+/obj/item/clothing/suit/hooded/cultrobes/void
+	name = "void cloak"
+	desc = "Black like tar, doesn't reflect any light. Runic symbols line the outside, with each flash you loose comprehension of what you are seeing."
+	icon_state = "void_cloak"
+	item_state = "void_cloak"
+	allowed = list(/obj/item/melee/sickly_blade, /obj/item/forbidden_book, /obj/item/living_heart)
+	hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/void
+	flags_inv = NONE
+	// slightly worse than normal cult robes
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 30, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/void_cloak
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+
+/obj/item/clothing/suit/hooded/cultrobes/void/ToggleHood()
+	if(!iscarbon(loc))
+		return
+	var/mob/living/carbon/carbon_user = loc
+	if(IS_HERETIC(carbon_user) || IS_HERETIC_MONSTER(carbon_user))
+		. = ..()
+		//We need to account for the hood shenanigans, and that way we can make sure items always fit, even if one of the slots is used by the fucking hood.
+		if(suittoggled)
+			to_chat(carbon_user,"<span class='notice'>The light shifts around you making the cloak invisible!</span>")
+			obj_flags |= EXAMINE_SKIP
+		else if(obj_flags & EXAMINE_SKIP) // ensures that it won't toggle visibility if raising the hood failed
+			to_chat(carbon_user,"<span class='notice'>The kaleidoscope of colours collapses around you, as the cloak shifts to visibility!</span>")
+			obj_flags ^= EXAMINE_SKIP
+	else
+		to_chat(carbon_user,"<span class='danger'>You can't force the hood onto your head!</span>")
+
+/obj/item/clothing/mask/void_mask
+	name = "abyssal mask"
+	desc = "Mask created from the suffering of existance, you can look down it's eyes, and notice something gazing back at you."
+	icon_state = "mad_mask"
+	item_state = "mad_mask"
+	w_class = WEIGHT_CLASS_SMALL
+	flags_cover = MASKCOVERSEYES
+	resistance_flags = FLAMMABLE
+	flags_inv = HIDEFACE|HIDEFACIALHAIR
+	///Who is wearing this
+	var/mob/living/carbon/human/local_user
+
+/obj/item/clothing/mask/void_mask/equipped(mob/user, slot)
+	. = ..()
+	if(ishuman(user) && user.mind && slot == SLOT_WEAR_MASK)
+		local_user = user
+		START_PROCESSING(SSobj, src)
+
+		if(IS_HERETIC(user) || IS_HERETIC_MONSTER(user))
+			return
+		ADD_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
+
+/obj/item/clothing/mask/void_mask/dropped(mob/M)
+	local_user = null
+	STOP_PROCESSING(SSobj, src)
+	REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
+	return ..()
+
+/obj/item/clothing/mask/void_mask/process(delta_time)
+	if(!local_user)
+		return PROCESS_KILL
+
+	if((IS_HERETIC(local_user) || IS_HERETIC_MONSTER(local_user)) && HAS_TRAIT(src,TRAIT_NODROP))
+		REMOVE_TRAIT(src, TRAIT_NODROP, CLOTHING_TRAIT)
+
+	for(var/mob/living/carbon/human/human_in_range in spiral_range(9,local_user))
+		if(IS_HERETIC(human_in_range) || IS_HERETIC_MONSTER(human_in_range))
+			continue
+
+		SEND_SIGNAL(human_in_range,COMSIG_VOID_MASK_ACT,rand(-2,-20)*delta_time)
+
+		if(DT_PROB(60,delta_time))
+			human_in_range.hallucination += 5
+
+		if(DT_PROB(40,delta_time))
+			human_in_range.Jitter(5)
+
+		if(DT_PROB(30,delta_time))
+			human_in_range.emote(pick("giggle","laugh"))
+			human_in_range.adjustStaminaLoss(6)
+
+		if(DT_PROB(25,delta_time))
+			human_in_range.Dizzy(5)
+
+/obj/item/melee/rune_knife
+	name = "\improper Carving Knife"
+	desc = "Cold steel, pure, perfect, this knife can carve the floor in many ways, but only few can evoke the dangers that lurk beneath reality."
+	icon = 'icons/obj/eldritch.dmi'
+	icon_state = "rune_carver"
+	flags_1 = CONDUCT_1
+	sharpness = SHARP_EDGED
+	w_class = WEIGHT_CLASS_SMALL
+	wound_bonus = 20
+	force = 10
+	throwforce = 20
+	embedding = list(embed_chance=75, jostle_chance=2, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=3, jostle_pain_mult=5, rip_time=15)
+	hitsound = 'sound/weapons/bladeslice.ogg'
+	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "tore", "lacerated", "ripped", "diced", "rended")
+	///turfs that you cannot draw carvings on
+	var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava))
+	///A check to see if you are in process of drawing a rune
+	var/drawing = FALSE
+	///A list of current runes
+	var/list/current_runes = list()
+	///Max amount of runes
+	var/max_rune_amt = 3
+	///Linked action
+	var/datum/action/innate/rune_shatter/linked_action
+
+/obj/item/melee/rune_knife/examine(mob/user)
+	. = ..()
+	. += "This item can carve 'Alert carving' - nearly invisible rune that when stepped on gives you a prompt about where someone stood on it and who it was, doesn't get destroyed by being stepped on."
+	. += "This item can carve 'Grasping carving' - when stepped on it causes heavy damage to the legs and stuns for 5 seconds."
+	. += "This item can carve 'Mad carving' - when stepped on it causes dizzyness, jiterryness, temporary blindness, confusion , stuttering and slurring."
+
+/obj/item/melee/rune_knife/Initialize()
+	. = ..()
+	linked_action = new(src)
+
+/obj/item/melee/rune_knife/pickup(mob/user)
+	. = ..()
+	linked_action.Grant(user, src)
+
+/obj/item/melee/rune_knife/dropped(mob/user, silent)
+	. = ..()
+	linked_action.Remove(user, src)
+
+/obj/item/melee/rune_knife/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
+	. = ..()
+	if(!is_type_in_typecache(target,blacklisted_turfs) && !drawing && proximity_flag)
+		carve_rune(target,user,proximity_flag,click_parameters)
+
+///Action of carving runes, gives you the ability to click on floor and choose a rune of your need.
+/obj/item/melee/rune_knife/proc/carve_rune(atom/target, mob/user, proximity_flag, click_parameters)
+	var/obj/structure/trap/eldritch/elder = locate() in range(1,target)
+	if(elder)
+		to_chat(user,"<span class='notice'>You can't draw runes that close to each other!</span>")
+		return
+
+	for(var/X in current_runes)
+		var/obj/structure/trap/eldritch/eldritch = X
+		if(QDELETED(eldritch) || !eldritch)
+			current_runes -= eldritch
+
+	if(current_runes.len >= max_rune_amt)
+		to_chat(user,"<span class='notice'>The blade cannot support more runes!</span>")
+		return
+
+	var/list/pick_list = list()
+	for(var/E in subtypesof(/obj/structure/trap/eldritch))
+		var/obj/structure/trap/eldritch/eldritch = E
+		pick_list[initial(eldritch.name)] = eldritch
+
+	drawing = TRUE
+
+	var/type = pick_list[input(user,"Choose the rune","Rune") as null|anything in pick_list ]
+	if(!type)
+		drawing = FALSE
+		return
+
+
+	to_chat(user,"<span class='notice'>You start drawing the rune...</span>")
+	if(!do_after(user,5 SECONDS,target = target))
+		drawing = FALSE
+		return
+
+	drawing = FALSE
+	var/obj/structure/trap/eldritch/eldritch = new type(target)
+	eldritch.set_owner(user)
+	current_runes += eldritch
+
+/datum/action/innate/rune_shatter
+	name = "Rune Break"
+	desc = "Destroys all runes that were drawn by this blade."
+	background_icon_state = "bg_ecult"
+	button_icon_state = "rune_break"
+	icon_icon = 'icons/mob/actions/actions_ecult.dmi'
+	check_flags = AB_CHECK_CONSCIOUS
+	///Reference to the rune knife it is inside of
+	var/obj/item/melee/rune_knife/sword
+
+/datum/action/innate/rune_shatter/Grant(mob/user, obj/object)
+	sword = object
+	return ..()
+
+/datum/action/innate/rune_shatter/Activate()
+	for(var/X in sword.current_runes)
+		var/obj/structure/trap/eldritch/eldritch = X
+		if(!QDELETED(eldritch) && eldritch)
+			qdel(eldritch)
+
+/obj/item/eldritch_potion
+	name = "Brew of Day and Night"
+	desc = "You should never see this"
+	icon = 'icons/obj/eldritch.dmi'
+	///Typepath to the status effect this is supposed to hold
+	var/status_effect
+
+/obj/item/eldritch_potion/attack_self(mob/user)
+	. = ..()
+	to_chat(user,"<span class='notice'>You drink the potion and with the viscous liquid, the glass dematerializes.</span>")
+	effect(user)
+	qdel(src)
+
+///The effect of the potion if it has any special one, in general try not to override this and utilize the status_effect var to make custom effects.
+/obj/item/eldritch_potion/proc/effect(mob/user)
+	if(!iscarbon(user))
+		return
+	var/mob/living/carbon/carbie = user
+	carbie.apply_status_effect(status_effect)
+
+/obj/item/eldritch_potion/crucible_soul
+	name = "Brew of Crucible Soul"
+	desc = "Allows you to phase through walls for 15 seconds, after the time runs out, you get teleported to your original location."
+	icon_state = "crucible_soul"
+	status_effect = /datum/status_effect/crucible_soul
+
+/obj/item/eldritch_potion/duskndawn
+	name = "Brew of Dusk and Dawn"
+	desc = "Allows you to see clearly through walls and objects for 60 seconds."
+	icon_state = "clarity"
+	status_effect = /datum/status_effect/duskndawn
+
+/obj/item/eldritch_potion/wounded
+	name = "Brew of Wounded Soldier"
+	desc = "For the next 60 seconds each wound will heal you, minor wounds heal 1 of it's damage type per second, moderate heal 3 and critical heal 6. You also become immune to damage slowdon."
+	icon_state = "marshal"
+	status_effect = /datum/status_effect/marshal

code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm

@@ -15,6 +15,8 @@
 	var/gain_text = ""
 	///Cost of knowledge in souls
 	var/cost = 0
+	///Required sacrifices to unlock
+	var/sacs_needed = 0
 	///Next knowledge in the research tree
 	var/list/next_knowledge = list()
 	///What knowledge is incompatible with this. This will simply make it impossible to research knowledges that are in banned_knowledge once this gets researched.
@@ -65,6 +67,14 @@
 /datum/eldritch_knowledge/proc/recipe_snowflake_check(list/atoms,loc)
 	return TRUE
 
+/**
+  * A proc that handles the code when the mob dies
+  *
+  * This proc is primarily used to end any soundloops when the heretic dies
+  */
+/datum/eldritch_knowledge/proc/on_death(mob/user)
+	return
+
 /**
   * What happens once the recipe is succesfully finished
   *
@@ -100,7 +110,6 @@
 /datum/eldritch_knowledge/proc/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
 	return FALSE
 
-
 /**
   * Sickly blade act
   *
@@ -109,6 +118,14 @@
 /datum/eldritch_knowledge/proc/on_eldritch_blade(target,user,proximity_flag,click_parameters)
 	return
 
+/**
+  * Sickly blade distant act
+  *
+  * Same as [/datum/eldritch_knowledge/proc/on_eldritch_blade] but works on targets that are not in proximity to you.
+  */
+/datum/eldritch_knowledge/proc/on_ranged_attack_eldritch_blade(atom/target,mob/user,click_parameters)
+	return
+
 //////////////
 ///Subtypes///
 //////////////
@@ -150,7 +167,7 @@
 			compiled_list[human_to_check.real_name] = human_to_check
 
 	if(compiled_list.len == 0)
-		to_chat(user, "<span class='warning'>The items don't posses required fingerprints.</span>")
+		to_chat(user, "<span class='warning'>These items don't possess the required fingerprints or DNA.</span>")
 		return FALSE
 
 	var/chosen_mob = input("Select the person you wish to curse","Your target") as null|anything in sortList(compiled_list, /proc/cmp_mob_realname_dsc)
@@ -215,16 +232,15 @@
 		atoms -= H
 		H.gib()
 
-
 ///////////////
 ///Base lore///
 ///////////////
 
 /datum/eldritch_knowledge/spell/basic
 	name = "Break of Dawn"
-	desc = "Starts your journey in the mansus. Allows you to select a target using a living heart on a transmutation rune."
-	gain_text = "Gates of Mansus open up to your mind."
-	next_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/spell/silence)
+	desc = "Starts your journey in the Mansus. Allows you to select a target using a living heart on a transmutation rune."
+	gain_text = "Another day at a meaningless job. You feel a shimmer around you, as a realization of something strange in your backpack unfolds. You look at it, unknowingly opening a new chapter in your life."
+	next_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/base_void)
 	cost = 0
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/mansus_grasp
 	required_atoms = list(/obj/item/living_heart)
@@ -279,7 +295,7 @@
 				var/datum/mind/targeted =  A.find_target(blacklist = target_blacklist)//easy way, i dont feel like copy pasting that entire block of code
 				if(!targeted)
 					break
-				targets[targeted.current.real_name] = targeted.current
+				targets["[targeted.current.real_name] the [targeted.assigned_role]"] = targeted.current
 			LH.target = targets[input(user,"Choose your next target","Target") in targets]
 
 			if(!LH.target && targets.len)
@@ -301,7 +317,6 @@
 				var/datum/antagonist/heretic/EC = carbon_user.mind.has_antag_datum(/datum/antagonist/heretic)
 				LH.sac_targetter = EC
 				EC.sac_targetted.Add(LH.target.real_name)
-
 			else
 				to_chat(user,"<span class='warning'>target could not be found for living heart.</span>")
 
@@ -311,30 +326,22 @@
 /datum/eldritch_knowledge/living_heart
 	name = "Living Heart"
 	desc = "Allows you to create additional living hearts, using a heart, a pool of blood and a poppy. Living hearts when used on a transmutation rune will grant you a person to hunt and sacrifice on the rune. Every sacrifice gives you an additional charge in the book."
-	gain_text = "Disconnected, yet it still beats."
+	gain_text = "The Gates of Mansus open up to your mind."
 	cost = 0
 	required_atoms = list(/obj/item/organ/heart,/obj/effect/decal/cleanable/blood,/obj/item/reagent_containers/food/snacks/grown/poppy)
+	next_knowledge = list(/datum/eldritch_knowledge/spell/silence)
 	result_atoms = list(/obj/item/living_heart)
 	route = "Start"
 
 /datum/eldritch_knowledge/codex_cicatrix
 	name = "Codex Cicatrix"
 	desc = "Allows you to create a spare Codex Cicatrix if you have lost one, using a bible, human skin, a pen and a pair of eyes."
-	gain_text = "Their hands are at your throat, yet you see them not."
+	gain_text = "Their hand is at your throat, yet you see Them not."
 	cost = 0
 	required_atoms = list(/obj/item/organ/eyes,/obj/item/stack/sheet/animalhide/human,/obj/item/storage/book/bible,/obj/item/pen)
 	result_atoms = list(/obj/item/forbidden_book)
 	route = "Start"
 
-/datum/eldritch_knowledge/eldritch_blade
-	name = "Eldritch Blade"
-	desc = "Allows you to create a sickly, eldritch blade by transmuting a glass shard and a metal rod atop a transmutation rune."
-	gain_text = "The first step starts with sacrifice."
-	cost = 0
-	required_atoms = list(/obj/item/shard,/obj/item/stack/rods)
-	result_atoms = list(/obj/item/melee/sickly_blade)
-	route = "Start"
-
 /datum/eldritch_knowledge/spell/silence
 	name = "Silence"
 	desc = "Allows you to use the power of the Mansus to force an individual's tongue to be held down for up to twenty seconds. They'll notice quickly, however."

code/modules/antagonists/eldritch_cult/eldritch_magic.dm

@@ -1,6 +1,6 @@
 /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/ash
 	name = "Ashen Passage"
-	desc = "Low range spell allowing you to pass through a few walls."
+	desc = "A short range spell allowing you to pass unimpeded through a few walls."
 	school = "transmutation"
 	invocation = "DULK'ES PRE'ZIMAS"
 	invocation_type = "whisper"
@@ -31,7 +31,7 @@
 
 /obj/effect/proc_holder/spell/targeted/touch/mansus_grasp
 	name = "Mansus Grasp"
-	desc = "Touch spell that allows you to channel the power of the Old Gods through you."
+	desc = "A touch spell that lets you channel the power of the Old Gods through your grip."
 	hand_path = /obj/item/melee/touch_attack/mansus_fist
 	school = "evocation"
 	charge_max = 100
@@ -42,7 +42,7 @@
 
 /obj/item/melee/touch_attack/mansus_fist
 	name = "Mansus Grasp"
-	desc = "A sinister looking aura that distorts the flow of reality around it. Causes knockdown, major stamina damage aswell as some Brute. It gains additional beneficial effects with certain knowledges you can research."
+	desc = "A sinister looking aura that distorts the flow of reality around it. Causes knockdown and major stamina damage in addition to some brute. It gains additional beneficial effects as you expand your knowledge of the Mansus."
 	icon = 'icons/obj/eldritch.dmi'
 	icon_state = "mansus_grasp"
 	item_state = "mansus"
@@ -50,13 +50,13 @@
 
 /obj/item/melee/touch_attack/mansus_fist/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 
-	if(!proximity_flag || target == user)
+	if(!proximity_flag || (target == user))
 		return
 	playsound(user, 'sound/items/welder.ogg', 75, TRUE)
 	if(ishuman(target))
 		var/mob/living/carbon/human/tar = target
 		if(tar.anti_magic_check())
-			tar.visible_message("<span class='danger'>Spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
+			tar.visible_message("<span class='danger'>The spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
 			return ..()
 	var/datum/mind/M = user.mind
 	var/datum/antagonist/heretic/cultie = M.has_antag_datum(/datum/antagonist/heretic)
@@ -79,7 +79,7 @@
 
 /obj/effect/proc_holder/spell/aoe_turf/rust_conversion
 	name = "Aggressive Spread"
-	desc = "Spreads rust onto nearby turfs."
+	desc = "Spreads rust onto nearby surfaces."
 	school = "transmutation"
 	charge_max = 300 //twice as long as mansus grasp
 	clothes_req = FALSE
@@ -101,7 +101,7 @@
 
 /obj/effect/proc_holder/spell/aoe_turf/rust_conversion/small
 	name = "Rust Conversion"
-	desc = "Spreads rust onto nearby turfs."
+	desc = "Spreads rust onto nearby surfaces."
 	range = 2
 
 /obj/effect/proc_holder/spell/pointed/blood_siphon
@@ -162,7 +162,7 @@
 
 /obj/effect/proc_holder/spell/aimed/rust_wave
 	name = "Patron's Reach"
-	desc = "Channels energy into your gauntlet - firing it results in a wave of rust being created in it's wake."
+	desc = "Channels energy into your gauntlet- unleashing it creates a wave of rust in its wake."
 	projectile_type = /obj/item/projectile/magic/spell/rust_wave
 	charge_max = 350
 	clothes_req = FALSE
@@ -213,7 +213,7 @@
 
 /obj/effect/proc_holder/spell/pointed/cleave
 	name = "Cleave"
-	desc = "Causes severe bleeding on a target and people around them"
+	desc = "Causes severe bleeding on a target and several targets around them."
 	school = "transmutation"
 	charge_max = 350
 	clothes_req = FALSE
@@ -250,7 +250,8 @@
 		var/obj/item/bodypart/bodypart = pick(target.bodyparts)
 		var/datum/wound/slash/critical/crit_wound = new
 		crit_wound.apply_wound(bodypart)
-		target.adjustFireLoss(20)
+		crit_wound.apply_wound(bodypart)
+		target.adjustBruteLoss(20)
 		new /obj/effect/temp_visual/cleave(target.drop_location())
 
 /obj/effect/proc_holder/spell/pointed/cleave/can_target(atom/target, mob/user, silent)
@@ -292,7 +293,7 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/tar = target
 		if(tar.anti_magic_check())
-			tar.visible_message("<span class='danger'>Spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
+			tar.visible_message("<span class='danger'>The spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
 			return ..()
 
 	if(iscarbon(target))
@@ -331,7 +332,7 @@
 	if(ishuman(target))
 		var/mob/living/carbon/human/tar = target
 		if(tar.anti_magic_check())
-			tar.visible_message("<span class='danger'>Spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
+			tar.visible_message("<span class='danger'>The spell bounces off of [target]!</span>","<span class='danger'>The spell bounces off of you!</span>")
 			return ..()
 
 	if(iscarbon(target))
@@ -343,7 +344,7 @@
 
 /obj/effect/proc_holder/spell/pointed/nightwatchers_rite
 	name = "Nightwatcher's Rite"
-	desc = "Powerful spell that releases 5 streams of fire away from you."
+	desc = "A powerful spell that releases 5 streams of fire away from you."
 	school = "transmutation"
 	invocation = "IGNIS'INTI"
 	invocation_type = "whisper"
@@ -390,13 +391,13 @@
 
 		for(var/mob/living/L in T.contents)
 			if(L.anti_magic_check())
-				L.visible_message("<span class='danger'>Spell bounces off of [L]!</span>","<span class='danger'>The spell bounces off of you!</span>")
+				L.visible_message("<span class='danger'>The spell bounces off of [L]!</span>","<span class='danger'>The spell bounces off of you!</span>")
 				continue
 			if(L in hit_list || L == source)
 				continue
 			hit_list += L
 			L.adjustFireLoss(15)
-			to_chat(L, "<span class='userdanger'>You're hit by a blast of fire!</span>")
+			to_chat(L, "<span class='userdanger'>You're hit by [source]'s eldritch flames!</span>")
 
 		new /obj/effect/hotspot(T)
 		T.hotspot_expose(700,50,1)
@@ -433,7 +434,7 @@
 
 /obj/effect/proc_holder/spell/aoe_turf/fire_cascade
 	name = "Fire Cascade"
-	desc = "creates hot turfs around you."
+	desc = "Heats the air around you."
 	school = "transmutation"
 	charge_max = 300 //twice as long as mansus grasp
 	clothes_req = FALSE
@@ -470,7 +471,7 @@
 
 /obj/effect/proc_holder/spell/targeted/fire_sworn
 	name = "Oath of Fire"
-	desc = "For a minute you will passively create a ring of fire around you."
+	desc = "For a minute, you will passively create a ring of fire around you."
 	invocation = "IGNIS'AISTRA'LISTRE"
 	invocation_type = "whisper"
 	clothes_req = FALSE
@@ -509,7 +510,7 @@
 
 /obj/effect/proc_holder/spell/targeted/worm_contract
 	name = "Force Contract"
-	desc = "Forces all the worm parts to collapse onto a single turf"
+	desc = "Forces your body to contract onto a single tile."
 	invocation_type = "none"
 	clothes_req = FALSE
 	action_background_icon_state = "bg_ecult"
@@ -539,7 +540,7 @@
 
 /obj/effect/proc_holder/spell/targeted/fiery_rebirth
 	name = "Nightwatcher's Rebirth"
-	desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a person is in critical condition it finishes them off."
+	desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a target is in critical condition it drains the last of their vitality, killing them."
 	invocation = "PETHRO'MINO'IGNI"
 	invocation_type = "whisper"
 	clothes_req = FALSE
@@ -571,7 +572,7 @@
 
 /obj/effect/proc_holder/spell/pointed/manse_link
 	name = "Mansus Link"
-	desc = "Piercing through reality, connecting minds. This spell allows you to add people to a mansus net, allowing them to communicate with eachother"
+	desc = "Piercing through reality, connecting minds. This spell allows you to add people to a Mansus Net, allowing them to communicate with each other from afar."
 	school = "transmutation"
 	charge_max = 300
 	clothes_req = FALSE
@@ -605,7 +606,7 @@
 
 /datum/action/innate/mansus_speech
 	name = "Mansus Link"
-	desc = "Send a psychic message to everyone connected to your mansus link."
+	desc = "Send a psychic message to everyone connected to your Mansus Net."
 	button_icon_state = "link_speech"
 	icon_icon = 'icons/mob/actions/actions_slime.dmi'
 	background_icon_state = "bg_ecult"
@@ -747,3 +748,219 @@
 		return 3
 	else
 		return 2
+
+/obj/effect/proc_holder/spell/targeted/shed_human_form
+	name = "Shed form"
+	desc = "Shed your fragile form, become one with the arms, become one with the emperor."
+	invocation_type = "shout"
+	invocation = "REALITY UNCOIL!"
+	clothes_req = FALSE
+	action_background_icon_state = "bg_ecult"
+	range = -1
+	include_user = TRUE
+	charge_max = 100
+	action_icon = 'icons/mob/actions/actions_ecult.dmi'
+	action_icon_state = "worm_ascend"
+	var/segment_length = 10
+
+/obj/effect/proc_holder/spell/targeted/shed_human_form/cast(list/targets, mob/user)
+	. = ..()
+	var/mob/living/target = user
+	var/mob/living/mob_inside = locate() in target.contents - target
+
+	if(!mob_inside)
+		var/mob/living/simple_animal/hostile/eldritch/armsy/prime/outside = new(user.loc,TRUE,segment_length)
+		target.mind.transfer_to(outside, TRUE)
+		target.forceMove(outside)
+		target.apply_status_effect(STATUS_EFFECT_STASIS,STASIS_ASCENSION_EFFECT)
+		for(var/mob/living/carbon/human/humie in view(9,outside)-target)
+			if(IS_HERETIC(humie) || IS_HERETIC_MONSTER(humie))
+				continue
+			SEND_SIGNAL(humie, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus)
+			///They see the very reality uncoil before their eyes.
+			if(prob(25))
+				var/trauma = pick(subtypesof(BRAIN_TRAUMA_MILD) + subtypesof(BRAIN_TRAUMA_SEVERE))
+				humie.gain_trauma(new trauma(), TRAUMA_RESILIENCE_LOBOTOMY)
+		return
+
+	if(iscarbon(mob_inside))
+		var/mob/living/simple_animal/hostile/eldritch/armsy/prime/armsy = target
+		if(mob_inside.remove_status_effect(STATUS_EFFECT_STASIS,STASIS_ASCENSION_EFFECT))
+			mob_inside.forceMove(armsy.loc)
+		armsy.mind.transfer_to(mob_inside, TRUE)
+		segment_length = armsy.get_length()
+		qdel(armsy)
+		return
+
+/obj/effect/proc_holder/spell/pointed/void_blink
+	name = "Void Phase"
+	desc = "Let's you blink to your pointed destination, causes 3x3 aoe damage bubble around your pointed destination and your current location. It has a minimum range of 3 tiles and a maximum range of 9 tiles."
+	invocation_type = "whisper"
+	invocation = "PAS'VEIK"
+	clothes_req = FALSE
+	range = 9
+	action_background_icon_state = "bg_ecult"
+	charge_max = 300
+	action_icon = 'icons/mob/actions/actions_ecult.dmi'
+	action_icon_state = "voidblink"
+	selection_type = "range"
+
+/obj/effect/proc_holder/spell/pointed/void_blink/can_target(atom/target, mob/user, silent)
+	. = ..()
+	if(get_dist(get_turf(user),get_turf(target)) < 3 )
+		return FALSE
+
+/obj/effect/proc_holder/spell/pointed/void_blink/cast(list/targets, mob/user)
+	. = ..()
+	var/target = targets[1]
+	var/turf/targeted_turf = get_turf(target)
+
+	playsound(user,'sound/magic/voidblink.ogg',100)
+	playsound(targeted_turf,'sound/magic/voidblink.ogg',100)
+
+	new /obj/effect/temp_visual/voidin(user.drop_location())
+	new /obj/effect/temp_visual/voidout(targeted_turf)
+
+	for(var/mob/living/living_mob in range(1,user)-user)
+		if(IS_HERETIC(living_mob) || IS_HERETIC_MONSTER(living_mob))
+			continue
+		living_mob.adjustBruteLoss(40)
+
+	for(var/mob/living/living_mob in range(1,targeted_turf)-user)
+		if(IS_HERETIC(living_mob) || IS_HERETIC_MONSTER(living_mob))
+			continue
+		living_mob.adjustBruteLoss(40)
+
+	do_teleport(user,targeted_turf,0,TRUE,no_effects = TRUE,channel=TELEPORT_CHANNEL_MAGIC)
+
+/obj/effect/temp_visual/voidin
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "void_blink_in"
+	alpha = 150
+	duration = 6
+	pixel_x = -32
+	pixel_y = -32
+
+/obj/effect/temp_visual/voidout
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "void_blink_out"
+	alpha = 150
+	duration = 6
+	pixel_x = -32
+	pixel_y = -32
+
+/obj/effect/proc_holder/spell/targeted/void_pull
+	name = "Void Pull"
+	desc = "Call the void, this pulls all nearby people closer to you, damages people already around you. If they are 4 tiles or closer they are also knocked down and a micro-stun is applied."
+	invocation_type = "whisper"
+	invocation = "VISA'GALIS TRAUK'IMAS"
+	clothes_req = FALSE
+	action_background_icon_state = "bg_ecult"
+	range = -1
+	include_user = TRUE
+	charge_max = 400
+	action_icon = 'icons/mob/actions/actions_ecult.dmi'
+	action_icon_state = "voidpull"
+
+/obj/effect/proc_holder/spell/targeted/void_pull/cast(list/targets, mob/user)
+	. = ..()
+	for(var/mob/living/living_mob in range(1,user)-user)
+		if(IS_HERETIC(living_mob) || IS_HERETIC_MONSTER(living_mob))
+			continue
+		living_mob.adjustBruteLoss(30)
+
+	playsound(user,'sound/magic/voidpull.ogg',75)
+	new /obj/effect/temp_visual/voidin(user.drop_location())
+	for(var/mob/living/livies in view(7,user)-user)
+
+		if(get_dist(user,livies) < 4)
+			livies.AdjustKnockdown(3 SECONDS)
+			livies.AdjustParalyzed(0.5 SECONDS)
+
+		for(var/i in 1 to 3)
+			livies.forceMove(get_step_towards(livies,user))
+
+
+/obj/effect/proc_holder/spell/pointed/boogie_woogie
+	name = "Void's Applause"
+	desc = "Swap positions with someone at the clap of your hands."
+	school = "transmutation"
+	charge_max = 100
+	clothes_req = FALSE
+	invocation = "BOOGIE WOOGIE"
+	invocation_type = "none"
+	range = 10
+	message = "The world around you suddenly shifts!"
+	action_icon = 'icons/mob/actions/actions_ecult.dmi'
+	action_icon_state = "mansus_link"
+	action_background_icon_state = "bg_ecult"
+
+/obj/effect/proc_holder/spell/pointed/boogie_woogie/cast(list/targets, mob/user)
+	. = ..()
+	var/target = targets[1]
+	user.emote("clap1")
+	playsound(user, 'sound/magic/voidblink.ogg', 75, TRUE)
+	var/turf/targeted_turf = get_turf(target)
+	var/turf/user_turf = get_turf(user)
+
+	new /obj/effect/temp_visual/voidswap(user.drop_location())
+	new /obj/effect/temp_visual/voidswap(targeted_turf)
+
+	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)
+
+
+/obj/effect/proc_holder/spell/pointed/boogie_woogie/can_target(atom/target, mob/user, silent)
+	. = ..()
+	if(!.)
+		return FALSE
+	if(!isliving(target) && !iscontainer(target))
+		if(!silent)
+			to_chat(user, "<span class='warning'>You are unable to swap with the [target]!</span>")
+		return FALSE
+	return TRUE
+
+/obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch //placeholder spell
+	name = "Void's Push"
+	desc = "With the snap of your fingers, send your enemies away."
+	charge_max = 400
+	clothes_req = FALSE
+	invocation = "ISN'YKTI"
+	invocation_type = "shout"
+	range = 3
+	selection_type = "view"
+	sound = 'sound/magic/voidblink.ogg'
+	action_background_icon_state = "bg_ecult"
+	sparkle_path = /obj/effect/temp_visual/voidpush
+
+/obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch/cast(list/targets,mob/user = usr)
+	user.emote("snap")
+	..(targets, user, 60)
+
+/obj/effect/proc_holder/spell/aoe_turf/domain_expansion
+	name = "Infinite Void"
+	desc = "Create a domain that will slow down and mark all opponents with a void mark."
+	charge_max = 1200
+	clothes_req = FALSE
+	invocation = "RYO'IKI TEN'KAI"
+	invocation_type = "none"
+	range = 0
+	action_icon_state = "time"
+	action_background_icon_state = "bg_ecult"
+	var/timestop_range = 7
+	var/timestop_duration = 200
+	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)
+	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)
+	playsound(get_turf(user), Snd, 50, 0)
+	if(do_mob(user,user,50,1))
+		user.cut_overlay(halo)
+		user.emote("clap1")
+		user.say("DOM'ENO ISPLETIMAS")
+		playsound(user, 'sound/magic/domain.ogg', 125, TRUE)
+		new /obj/effect/domain_expansion(get_turf(user), timestop_range, timestop_duration, list(user))

code/modules/antagonists/eldritch_cult/eldritch_monster_antag.dm

@@ -7,6 +7,7 @@
 	job_rank = ROLE_HERETIC
 	antag_hud_type = ANTAG_HUD_HERETIC
 	antag_hud_name = "heretic_beast"
+	show_in_antagpanel = FALSE
 	var/datum/antagonist/master
 
 /datum/antagonist/heretic_monster/admin_add(datum/mind/new_owner,mob/admin)
@@ -29,6 +30,7 @@
 	var/datum/objective/master_obj = new
 	master_obj.owner = src
 	master_obj.explanation_text = "Assist your master in any way you can!"
+	master_obj.completed = TRUE
 	objectives += master_obj
 	owner.announce_objectives()
 	to_chat(owner, "<span class='boldannounce'>Your master is [master.owner.current.real_name]</span>")

code/modules/antagonists/eldritch_cult/eldritch_structures.dm

@@ -0,0 +1,178 @@
+/obj/structure/eldritch_crucible
+	name = "Mawed Crucible"
+	desc = "Immortalized cast iron, the steel-like teeth holding it in place, it's vile extract has the power of rebirthing things, remaking them from the very beginning."
+	icon = 'icons/obj/eldritch.dmi'
+	icon_state = "crucible"
+	anchored = FALSE
+	density = TRUE
+	///How much mass this currently holds
+	var/current_mass = 5
+	///Maximum amount of mass
+	var/max_mass = 5
+	///Check to see if it is currently being used.
+	var/in_use = FALSE
+
+/obj/structure/eldritch_crucible/examine(mob/user)
+	. = ..()
+	if(!IS_HERETIC(user) && !IS_HERETIC_MONSTER(user))
+		return
+	if(current_mass < max_mass)
+		. += "The Crucible requires [max_mass - current_mass] more organs or bodyparts!"
+	else
+		. += "The Crucible is ready to be used!"
+
+	. += "You can anchor and reanchor it using Codex Cicatrix!"
+	. += "It is currently [anchored == FALSE ? "unanchored" : "anchored"]"
+	. += "This structure can brew 'Brew of Crucible soul' - when used it gives you the ability to phase through matter for 15 seconds, after the time elapses it teleports you back to your original location"
+	. += "This structure can brew 'Brew of Dusk and Dawn' - when used it gives you xray for 1 minute"
+	. += "This structure can brew 'Brew of Wounded Soldier' - when used it makes you immune to damage slowdown, additionally you start healing for every wound you have, quickly outpacing the damage caused by them."
+
+/obj/structure/eldritch_crucible/attacked_by(obj/item/I, mob/living/user)
+	if(istype(I,/obj/item/nullrod))
+		qdel(src)
+		return
+
+	if(!IS_HERETIC(user) && !IS_HERETIC_MONSTER(user))
+		if(iscarbon(user))
+			devour(user)
+		return
+
+	if(istype(I,/obj/item/forbidden_book))
+		playsound(src, 'sound/misc/desceration-02.ogg', 75, TRUE)
+		anchored = !anchored
+		to_chat(user,"<span class='notice'>You [anchored == FALSE ? "unanchor" : "anchor"] the crucible</span>")
+		return
+
+	if(istype(I,/obj/item/bodypart) || istype(I,/obj/item/organ))
+		//Both organs and bodyparts hold information if they are organic or robotic in the exact same way.
+		var/obj/item/bodypart/forced = I
+		if(forced.status != BODYPART_ORGANIC)
+			return
+
+		if(current_mass >= max_mass)
+			to_chat(user,"<span class='notice'> Crucible is already full!</span>")
+			return
+		playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
+		to_chat(user,"<span class='notice'>Crucible devours [I.name] and fills itself with a little bit of liquid!</span>")
+		current_mass++
+		qdel(I)
+		update_icon_state()
+		return
+
+	return ..()
+
+/obj/structure/eldritch_crucible/attack_hand(mob/user)
+	if(!IS_HERETIC(user) && !IS_HERETIC_MONSTER(user))
+		if(iscarbon(user))
+			devour(user)
+		return
+
+	if(in_use)
+		to_chat(user,"<span class='notice'>Crucible is already in use!</span>")
+		return
+
+	if(current_mass < max_mass)
+		to_chat(user,"<span class='notice'>Crucible isn't full! Bring it more organs or bodyparts!</span>")
+		return
+
+	in_use = TRUE
+	var/list/lst = list()
+	for(var/X in subtypesof(/obj/item/eldritch_potion))
+		var/obj/item/eldritch_potion/potion = X
+		lst[initial(potion.name)] = potion
+	var/type = lst[input(user,"Choose your brew","Brew") in lst]
+	playsound(src, 'sound/misc/desceration-02.ogg', 75, TRUE)
+	new type(drop_location())
+	current_mass = 0
+	in_use = FALSE
+	update_icon_state()
+
+///Proc that eats the active limb of the victim
+/obj/structure/eldritch_crucible/proc/devour(mob/living/carbon/user)
+	if(HAS_TRAIT(user,TRAIT_NODISMEMBER))
+		return
+	playsound(src, 'sound/items/eatfood.ogg', 100, TRUE)
+	to_chat(user,"<span class='danger'>Crucible grabs your arm and devours it whole!</span>")
+	var/obj/item/bodypart/arm = user.get_active_hand()
+	arm.dismember()
+	qdel(arm)
+	current_mass += current_mass < max_mass ? 1 : 0
+	update_icon_state()
+
+/obj/structure/eldritch_crucible/update_icon_state()
+	. = ..()
+	if(current_mass == max_mass)
+		icon_state = "crucible"
+	else
+		icon_state = "crucible_empty"
+
+/obj/structure/trap/eldritch
+	name = "elder carving"
+	desc = "Collection of unknown symbols, they remind you of days long gone..."
+	icon = 'icons/obj/eldritch.dmi'
+	charges = 1
+	///Owner of the trap
+	var/mob/owner
+
+/obj/structure/trap/eldritch/Crossed(atom/movable/AM)
+	if(!isliving(AM))
+		return ..()
+	var/mob/living/living_mob = AM
+	if((owner && living_mob == owner) || IS_HERETIC(living_mob) || IS_HERETIC_MONSTER(living_mob))
+		return
+	return ..()
+
+/obj/structure/trap/eldritch/attacked_by(obj/item/I, mob/living/user)
+	. = ..()
+	if(istype(I,/obj/item/melee/rune_knife) || istype(I,/obj/item/nullrod))
+		qdel(src)
+
+///Proc that sets the owner
+/obj/structure/trap/eldritch/proc/set_owner(mob/_owner)
+	owner = _owner
+
+/obj/structure/trap/eldritch/alert
+	name = "alert carving"
+	icon_state = "alert_rune"
+	alpha = 10
+
+/obj/structure/trap/eldritch/alert/trap_effect(mob/living/L)
+	if(owner)
+		to_chat(owner,"<span class='big boldwarning'>[L.real_name] has stepped foot on the alert rune in [get_area(src)]!</span>")
+	return ..()
+
+//this trap can only get destroyed by rune carving knife or nullrod
+/obj/structure/trap/eldritch/alert/flare()
+	return
+
+/obj/structure/trap/eldritch/tentacle
+	name = "grasping carving"
+	icon_state = "tentacle_rune"
+
+/obj/structure/trap/eldritch/tentacle/trap_effect(mob/living/L)
+	if(!iscarbon(L))
+		return
+	var/mob/living/carbon/carbon_victim = L
+	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)
+	return ..()
+
+/obj/structure/trap/eldritch/mad
+	name = "mad carving"
+	icon_state = "madness_rune"
+
+/obj/structure/trap/eldritch/mad/trap_effect(mob/living/L)
+	if(!iscarbon(L))
+		return
+	var/mob/living/carbon/carbon_victim = L
+	carbon_victim.adjustStaminaLoss(60)
+	carbon_victim.silent += 10
+	carbon_victim.confused += 5
+	carbon_victim.Jitter(10)
+	carbon_victim.Dizzy(20)
+	carbon_victim.blind_eyes(2)
+	SEND_SIGNAL(carbon_victim, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus)
+	return ..()

code/modules/antagonists/eldritch_cult/knowledge/ash_lore.dm

@@ -1,18 +1,18 @@
 /datum/eldritch_knowledge/base_ash
 	name = "Nightwatcher's Secret"
-	desc = "Inducts you into the Path of Ash. Allows you to transmute a match with an eldritch blade into an ashen blade."
-	gain_text = "The City guard knows their watch. If you ask them at night they may tell you about the ashy lantern."
-	banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/flesh_final)
+	desc = "Inducts you into the Path of Ash. Allows you to transmute a match with a spear into an ashen blade."
+	gain_text = "The City Guard know their watch. If you ask them at night, they may tell you about the ashy lantern."
+	banned_knowledge = list(/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
 	next_knowledge = list(/datum/eldritch_knowledge/ashen_grasp)
-	required_atoms = list(/obj/item/melee/sickly_blade,/obj/item/match)
+	required_atoms = list(/obj/item/spear,/obj/item/match)
 	result_atoms = list(/obj/item/melee/sickly_blade/ash)
-	cost = 1
+	cost = 0
 	route = PATH_ASH
 
 /datum/eldritch_knowledge/spell/ashen_shift
 	name = "Ashen Shift"
-	gain_text = "Ash is all the same, how can one man master it all?"
-	desc = "A short range jaunt that will enable you to escape from danger."
+	gain_text = "The Nightwatcher was the first of them, his treason started it all."
+	desc = "A short range jaunt that can help you escape from bad situations."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift/ash
 	next_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/essence,/datum/eldritch_knowledge/ashen_eyes)
@@ -20,7 +20,7 @@
 
 /datum/eldritch_knowledge/ashen_grasp
 	name = "Grasp of Ash"
-	gain_text = "Gates have opened, minds have flooded, yet I remain."
+	gain_text = "He knew how to walk between the planes."
 	desc = "Empowers your mansus grasp to knock enemies down and throw them away."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift)
@@ -32,7 +32,7 @@
 		return
 
 	var/mob/living/carbon/C = target
-	var/datum/status_effect/eldritch/E = C.has_status_effect(/datum/status_effect/eldritch/rust) || C.has_status_effect(/datum/status_effect/eldritch/ash) || C.has_status_effect(/datum/status_effect/eldritch/flesh)
+	var/datum/status_effect/eldritch/E = C.has_status_effect(/datum/status_effect/eldritch/rust) || C.has_status_effect(/datum/status_effect/eldritch/ash) || C.has_status_effect(/datum/status_effect/eldritch/flesh) || C.has_status_effect(/datum/status_effect/eldritch/void)
 	if(E)
 		. = TRUE
 		E.on_effect()
@@ -49,7 +49,7 @@
 
 /datum/eldritch_knowledge/ashen_eyes
 	name = "Ashen Eyes"
-	gain_text = "Piercing eyes may guide me through the mundane."
+	gain_text = "Piercing eyes, guide me through the mundane."
 	desc = "Allows you to craft thermal vision amulet by transmutating eyes with a glass shard."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/spell/ashen_shift,/datum/eldritch_knowledge/flesh_ghoul)
@@ -58,11 +58,11 @@
 
 /datum/eldritch_knowledge/ash_mark
 	name = "Mark of Ash"
-	gain_text = "Spread the famine."
-	desc = "Your sickly blade now applies ash mark on hit. Use your mansus grasp to proc the mark. Mark of Ash causes stamina damage, and fire loss, and spreads to a nearby carbon. Damage decreases with how many times the mark has spread."
+	gain_text = "The Nightwatcher was a very particular man, always watching in the dead of night. But in spite of his duty, he regularly tranced through the manse with his blazing lantern held high."
+	desc = "Your Mansus Grasp now applies the Mark of Ash on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Ash causes stamina damage and burn damage, and spreads to an additional nearby opponent. The damage decreases with each spread."
 	cost = 2
-	next_knowledge = list(/datum/eldritch_knowledge/curse/blindness)
-	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/flesh_mark)
+	next_knowledge = list(/datum/eldritch_knowledge/mad_mask)
+	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/void_mark)
 	route = PATH_ASH
 
 /datum/eldritch_knowledge/ash_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
@@ -71,28 +71,20 @@
 		var/mob/living/living_target = target
 		living_target.apply_status_effect(/datum/status_effect/eldritch/ash,5)
 
-/datum/eldritch_knowledge/curse/blindness
-	name = "Curse of Blindness"
-	gain_text = "The blind man walks through the world, unnoticed by the masses."
-	desc = "Curse someone with 2 minutes of complete blindness by sacrificing a pair of eyes, a screwdriver and a pool of blood, with an object that the victim has touched with their bare hands."
+/datum/eldritch_knowledge/mad_mask
+	name = "Mask of Madness"
+	gain_text = "He walks the world, unnoticed by the masses."
+	desc = "Allows you to transmute any mask, with a candle and a pair of eyes, to create a mask of madness, It causes passive stamina damage to everyone around the wearer and hallucinations, can be forced on a non believer to make him unable to take it off..."
 	cost = 1
-	required_atoms = list(/obj/item/organ/eyes,/obj/item/screwdriver,/obj/effect/decal/cleanable/blood)
+	result_atoms = list(/obj/item/clothing/mask/void_mask)
+	required_atoms = list(/obj/item/organ/eyes,/obj/item/clothing/mask,/obj/item/candle)
 	next_knowledge = list(/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/curse/paralysis)
-	timer = 2 MINUTES
 	route = PATH_ASH
 
-/datum/eldritch_knowledge/curse/blindness/curse(mob/living/chosen_mob)
-	. = ..()
-	chosen_mob.become_blind(MAGIC_TRAIT)
-
-/datum/eldritch_knowledge/curse/blindness/uncurse(mob/living/chosen_mob)
-	. = ..()
-	chosen_mob.cure_blind(MAGIC_TRAIT)
-
 /datum/eldritch_knowledge/spell/flame_birth
 	name = "Fiery Rebirth"
-	gain_text = "Nightwatcher was a man of principles, and yet he arose from the chaos he vowed to protect from."
-	desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a person is in critical condition it finishes them off."
+	gain_text = "The Nightwatcher was a man of principles, and yet his power arose from the chaos he vowed to combat."
+	desc = "Drains nearby alive people that are engulfed in flames. It heals 10 of each damage type per person. If a target is in critical condition it drains the last of their vitality, killing them."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/fiery_rebirth
 	next_knowledge = list(/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/flame_immunity)
@@ -117,17 +109,22 @@
 	gain_text = "When the Glory of the Lantern scorches and sears their skin, nothing will protect them from the ashes."
 	desc = "Fire off five streams of fire from your hand, each setting ablaze targets hit and scorching them upon contact."
 	cost = 2
+	sacs_needed = 3
 	spell_to_add = /obj/effect/proc_holder/spell/pointed/nightwatchers_rite
 	next_knowledge = list(/datum/eldritch_knowledge/final/ash_final)
 	route = PATH_ASH
 
+/datum/eldritch_knowledge/spell/nightwatchers_rite/on_gain(mob/user)
+	. = ..()
+	priority_announce("Large heat signatures discovered!  A swelling fiery horror is coming..", sound = 'sound/misc/notice1.ogg')
+
 /datum/eldritch_knowledge/ash_blade_upgrade
-	name = "Blazing Steel"
-	gain_text = "May the sun burn the heretics."
-	desc = "Your blade of choice will now add firestacks."
+	name = "Fiery Blade"
+	gain_text = "Blade in hand, he swung and swung as the ash fell from the skies. His city, his people... all burnt to cinders, and yet life still remained in his charred body."
+	desc = "Your blade of choice will now light your enemies ablaze."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/spell/flame_birth)
-	banned_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade)
+	banned_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/void_blade_upgrade)
 	route = PATH_ASH
 
 /datum/eldritch_knowledge/ash_blade_upgrade/on_eldritch_blade(target,user,proximity_flag,click_parameters)
@@ -140,10 +137,10 @@
 /datum/eldritch_knowledge/curse/corrosion
 	name = "Curse of Corrosion"
 	gain_text = "Cursed land, cursed man, cursed mind."
-	desc = "Curse someone for 2 minutes of vomiting and major organ damage. Using a wirecutter, a spill of blood, a heart, left arm and a right arm, and an item that the victim touched  with their bare hands."
+	desc = "Curse someone for 2 minutes of vomiting and major organ damage. Using a wirecutter, a pool of blood, a heart, left arm and a right arm, and an item that the victim touched  with their bare hands."
 	cost = 1
 	required_atoms = list(/obj/item/wirecutters,/obj/effect/decal/cleanable/blood,/obj/item/organ/heart,/obj/item/bodypart/l_arm,/obj/item/bodypart/r_arm)
-	next_knowledge = list(/datum/eldritch_knowledge/curse/blindness,/datum/eldritch_knowledge/spell/area_conversion)
+	next_knowledge = list(/datum/eldritch_knowledge/mad_mask,/datum/eldritch_knowledge/spell/area_conversion)
 	timer = 2 MINUTES
 
 /datum/eldritch_knowledge/curse/corrosion/curse(mob/living/chosen_mob)
@@ -157,10 +154,10 @@
 /datum/eldritch_knowledge/curse/paralysis
 	name = "Curse of Paralysis"
 	gain_text = "Corrupt their flesh, make them bleed."
-	desc = "Curse someone for 5 minutes of inability to walk. Using a knife, pool of blood, left leg, right leg, a hatchet and an item that the victim touched  with their bare hands. "
+	desc = "Curse someone for 5 minutes of inability to walk. Sacrifice a knife, a pool of blood, a pair of legs, a hatchet and an item that the victim touched with their bare hands. "
 	cost = 1
 	required_atoms = list(/obj/item/kitchen/knife,/obj/effect/decal/cleanable/blood,/obj/item/bodypart/l_leg,/obj/item/bodypart/r_leg,/obj/item/hatchet)
-	next_knowledge = list(/datum/eldritch_knowledge/curse/blindness,/datum/eldritch_knowledge/summon/raw_prophet)
+	next_knowledge = list(/datum/eldritch_knowledge/mad_mask,/datum/eldritch_knowledge/summon/raw_prophet)
 	timer = 5 MINUTES
 
 /datum/eldritch_knowledge/curse/paralysis/curse(mob/living/chosen_mob)
@@ -177,7 +174,7 @@
 
 /datum/eldritch_knowledge/spell/cleave
 	name = "Blood Cleave"
-	gain_text = "At first I was unfamiliar with these instruments of war, but the priest told me how to use them."
+	gain_text = "At first I didn't understand these instruments of war, but the priest told me to use them regardless. Soon, he said, I would know them well."
 	desc = "Grants a spell that will inflict wounds and bleeding upon the target, as well as in a short radius around them."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/pointed/cleave
@@ -185,10 +182,11 @@
 
 /datum/eldritch_knowledge/final/ash_final
 	name = "Ashlord's Rite"
-	gain_text = "The forgotten lords have spoken! The Lord of Ash has come! Fear the flame!"
-	desc = "Bring three corpses onto a transmutation rune, after ascending you will become immune to fire, space, temperature and other environmental hazards. You will develop resistance to all other damages. You will be granted two spells, one which can bring forth a cascade of massive fire, and another which will surround your body in precious flames for a minute."
+	gain_text = "The Nightwatcher found the rite and shared it amongst mankind! For now I am one with the fire, WITNESS MY ASCENSION!"
+	desc = "Bring 3 corpses onto a transmutation rune, you will become immune to fire, the vacuum of space, cold and other enviromental hazards and become overall sturdier to all other damages. You will gain a spell that passively creates ring of fire around you as well ,as you will gain a powerful ability that lets you create a wave of flames all around you."
 	required_atoms = list(/mob/living/carbon/human)
 	cost = 5
+	sacs_needed = 8
 	route = PATH_ASH
 	var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE)
 

code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm

@@ -1,21 +1,21 @@
 /datum/eldritch_knowledge/base_flesh
 	name = "Principle of Hunger"
-	desc = "Inducts you into the Path of Flesh. Allows you to transmute a pool of blood with your eldritch blade into a Blade of Flesh."
-	gain_text = "Hundred's of us starved, but I.. I found the strength in my greed."
-	banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/rust_final)
+	desc = "Inducts you into the Path of Flesh. Allows you to transmute a pool of blood with a spear into a Blade of Flesh."
+	gain_text = "Hundreds of us starved, but not me... I found strength in my greed."
+	banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/rust_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
 	next_knowledge = list(/datum/eldritch_knowledge/flesh_grasp)
-	required_atoms = list(/obj/item/melee/sickly_blade,/obj/effect/decal/cleanable/blood)
+	required_atoms = list(/obj/item/spear,/obj/effect/decal/cleanable/blood)
 	result_atoms = list(/obj/item/melee/sickly_blade/flesh)
-	cost = 1
+	cost = 0
 	route = PATH_FLESH
 
 /datum/eldritch_knowledge/flesh_ghoul
 	name = "Imperfect Ritual"
 	desc = "Allows you to resurrect the dead as voiceless dead by sacrificing them on the transmutation rune with a poppy. Voiceless dead are mute and have 50 HP. You can only have 2 at a time."
-	gain_text = "I found notes... notes of a ritual, scraps, unfinished, and yet... I still did it."
+	gain_text = "I found notes of a dark ritual, unfinished... yet still, I pushed forward."
 	cost = 1
 	required_atoms = list(/mob/living/carbon/human,/obj/item/reagent_containers/food/snacks/grown/poppy)
-	next_knowledge = list(/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/armor,/datum/eldritch_knowledge/ashen_eyes)
+	next_knowledge = list(/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/void_cloak,/datum/eldritch_knowledge/ashen_eyes)
 	route = PATH_FLESH
 	var/max_amt = 2
 	var/current_amt = 0
@@ -66,8 +66,8 @@
 
 /datum/eldritch_knowledge/flesh_grasp
 	name = "Grasp of Flesh"
-	gain_text = "'My newfound desire, it drove me to do great things,' The Priest said."
-	desc = "Empowers your Mansus Grasp to be able to create a single ghoul out of a dead player. You cannot raise the same person twice. Ghouls have only 50 HP and look like husks."
+	gain_text = "My new found desires drove me to greater and greater heights."
+	desc = "Empowers your mansus grasp to be able to create a single ghoul out of a dead person. Ghouls are only half as sturdy as a regular person and look like husks to the heathens' eyes."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/flesh_ghoul)
 	var/ghoul_amt = 4
@@ -78,8 +78,12 @@
 	. = ..()
 	if(!ishuman(target) || target == user)
 		return
+
+	if(iscarbon(target))
+		user.reagents.add_reagent(/datum/reagent/eldritch, 5)
+
 	var/mob/living/carbon/human/human_target = target
-	var/datum/status_effect/eldritch/eldritch_effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh)
+	var/datum/status_effect/eldritch/eldritch_effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh)  || human_target.has_status_effect(/datum/status_effect/eldritch/void)
 	if(eldritch_effect)
 		. = TRUE
 		eldritch_effect.on_effect()
@@ -131,25 +135,26 @@
 /datum/eldritch_knowledge/flesh_mark
 	name = "Mark of Flesh"
 	gain_text = "I saw them, the marked ones. The screams... the silence."
-	desc = "Your sickly blade now applies a mark of flesh to those cut by it. Once marked, using your Mansus Grasp upon them will cause additional bleeding from the target."
+	desc = "Your Mansus Grasp now applies the Mark of Flesh on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Flesh causes additional bleeding."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet)
-	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark)
+	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/void_mark)
 	route = PATH_FLESH
 
-/datum/eldritch_knowledge/flesh_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
+/datum/eldritch_knowledge/flesh_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	if(isliving(target))
+		. = TRUE
 		var/mob/living/living_target = target
 		living_target.apply_status_effect(/datum/status_effect/eldritch/flesh)
 
 /datum/eldritch_knowledge/flesh_blade_upgrade
 	name = "Bleeding Steel"
-	gain_text = "It rained blood, that's when I understood the gravekeeper's advice."
-	desc = "Your blade will now cause additional bleeding to those hit by it."
+	gain_text = "And then, blood rained from the heavens. That's when I finally understood the Marshal's teachings."
+	desc = "Your Sickly Blade will now cause additional bleeding."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/summon/stalker)
-	banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/rust_blade_upgrade)
+	banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/void_blade_upgrade)
 	route = PATH_FLESH
 
 /datum/eldritch_knowledge/flesh_blade_upgrade/on_eldritch_blade(target,user,proximity_flag,click_parameters)
@@ -162,18 +167,18 @@
 
 /datum/eldritch_knowledge/summon/raw_prophet
 	name = "Raw Ritual"
-	gain_text = "The uncanny man walks alone in the valley, I was able to call his aid."
-	desc = "You can now summon a Raw Prophet using eyes, a left arm, right arm and a pool of blood using a transmutation circle. Raw prophets have increased seeing range, and can see through walls. They can jaunt long distances, though they are fragile."
+	gain_text = "The Uncanny Man, who walks alone in the valley between the worlds... I was able to summon his aid."
+	desc = "You can now summon a Raw Prophet by transmutating a pair of eyes, a left arm and a pool of blood. Raw prophets have increased seeing range, as well as X-Ray vision, but they are very fragile."
 	cost = 1
-	required_atoms = list(/obj/item/organ/eyes,/obj/item/bodypart/l_arm,/obj/item/bodypart/r_arm,/obj/effect/decal/cleanable/blood)
+	required_atoms = list(/obj/item/organ/eyes,/obj/item/bodypart/l_arm,/obj/effect/decal/cleanable/blood)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/raw_prophet
-	next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/curse/paralysis)
+	next_knowledge = list(/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/rune_carver,/datum/eldritch_knowledge/curse/paralysis)
 	route = PATH_FLESH
 
 /datum/eldritch_knowledge/summon/stalker
 	name = "Lonely Ritual"
-	gain_text = "I was able to combine my greed and desires to summon an eldritch beast I have not seen before."
-	desc = "You can now summon a Stalker using a knife, a candle, a pen and a piece of paper using a transmutation circle. Stalkers possess the ability to shapeshift into various forms while assuming the vigor and powers of that form."
+	gain_text = "I was able to combine my greed and desires to summon an eldritch beast I had never seen before. An ever shapeshifting mass of flesh, it knew well my goals."
+	desc = "You can now summon a Stalker by transmutating a kitchen knife, a candle, a pen and a piece of paper. Stalkers can shapeshift into harmless animals to get close to the victim."
 	cost = 1
 	required_atoms = list(/obj/item/kitchen/knife,/obj/item/candle,/obj/item/pen,/obj/item/paper)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/stalker
@@ -182,7 +187,7 @@
 
 /datum/eldritch_knowledge/summon/ashy
 	name = "Ashen Ritual"
-	gain_text = "I combined principle of hunger with desire of destruction. The eyeful lords have noticed me."
+	gain_text = "I combined my principle of hunger with my desire for destruction. And the Nightwatcher knew my name."
 	desc = "You can now summon an Ashen One by transmuting a pile of ash, a head and a book using a transmutation circle. They possess the ability to jaunt short distances and create a cascade of flames."
 	cost = 1
 	required_atoms = list(/obj/effect/decal/cleanable/ash,/obj/item/bodypart/head,/obj/item/book)
@@ -191,66 +196,44 @@
 
 /datum/eldritch_knowledge/summon/rusty
 	name = "Rusted Ritual"
-	gain_text = "I combined principle of hunger with desire of corruption. The rusted hills call my name."
-	desc = "You can now summon a Rust Walker transmuting a vomit pool, a head, and a book using a transmutation circle. Rust Walkers possess the ability to spread rust and can fire bolts of rust to further corrode the area."
+	gain_text = "I combined my principle of hunger with my desire for corruption. And the Rusted Hills called my name."
+	desc = "You can now summon a Rust Walker by transmuting a vomit pool, a severed head, and a book using a transmutation circle. Rust Walkers possess the ability to spread rust and can fire bolts of rust to further corrode the area."
 	cost = 1
 	required_atoms = list(/obj/effect/decal/cleanable/vomit,/obj/item/bodypart/head,/obj/item/book)
 	mob_to_summon = /mob/living/simple_animal/hostile/eldritch/rust_spirit
-	next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/entropic_plume)
+	next_knowledge = list(/datum/eldritch_knowledge/spell/voidpull,/datum/eldritch_knowledge/spell/entropic_plume)
 
 /datum/eldritch_knowledge/spell/blood_siphon
 	name = "Blood Siphon"
-	gain_text = "Our blood is all the same after all, the owl told me."
-	desc = "You are granted a spell that drains some of the targets health, and returns it to you. It also has a chance to transfer any wounds you possess onto the target."
+	gain_text = "No matter the man, we bleed all the same. That's what the Marshal told me."
+	desc = "You gain a spell that drains lifeforce from your enemies to restore your own."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/pointed/blood_siphon
-	next_knowledge = list(/datum/eldritch_knowledge/summon/raw_prophet,/datum/eldritch_knowledge/spell/area_conversion)
+	next_knowledge = list(/datum/eldritch_knowledge/summon/stalker,/datum/eldritch_knowledge/spell/voidpull)
 
 /datum/eldritch_knowledge/final/flesh_final
 	name = "Priest's Final Hymn"
-	gain_text = "Man of this world. Hear me! For the time of the lord of arms has come!"
-	desc = "Bring three corpses to a transmutation rune to either ascend as The Lord of the Night or summon a single Terror of the Night, however you cannot ascend more than once."
+	gain_text = "Men of this world. Hear me, for the time of the Lord of Arms has come! The Emperor of Flesh guides my army!"
+	desc = "Bring 3 bodies onto a transmutation rune to shed your human form and ascend to untold power."
 	required_atoms = list(/mob/living/carbon/human)
 	cost = 5
+	sacs_needed = 8
 	route = PATH_FLESH
 
 /datum/eldritch_knowledge/final/flesh_final/on_finished_recipe(mob/living/user, list/atoms, loc)
-	var/alert_ = alert(user,"Do you want to ascend as the lord of the night or just summon a terror of the night?","...","Yes","No")
-	user.SetImmobilized(10 HOURS) // no way someone will stand 10 hours in a spot, just so he can move while the alert is still showing.
-	switch(alert_)
-		if("No")
-			var/mob/living/summoned = new /mob/living/simple_animal/hostile/eldritch/armsy(loc)
-			message_admins("[summoned.name] is being summoned by [user.real_name] in [loc]")
-			var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [summoned.real_name]", ROLE_HERETIC, null, ROLE_HERETIC, 100,summoned)
-			user.SetImmobilized(0)
-			if(LAZYLEN(candidates) == 0)
-				to_chat(user,"<span class='warning'>No ghost could be found...</span>")
-				qdel(summoned)
-				return FALSE
-			var/mob/dead/observer/ghost_candidate = pick(candidates)
-			priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the dark, for vassal of arms has ascended! Terror of the night has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
-			log_game("[key_name_admin(ghost_candidate)] has taken control of ([key_name_admin(summoned)]).")
-			summoned.ghostize(FALSE)
-			summoned.key = ghost_candidate.key
-			summoned.mind.add_antag_datum(/datum/antagonist/heretic_monster) //no you will NOT get the achivement you ghost.
-			var/datum/antagonist/heretic_monster/monster = summoned.mind.has_antag_datum(/datum/antagonist/heretic_monster)
-			var/datum/antagonist/heretic/master = user.mind.has_antag_datum(/datum/antagonist/heretic)
-			monster.set_owner(master)
-			master.ascended = TRUE
-		if("Yes")
-			var/mob/living/summoned = new /mob/living/simple_animal/hostile/eldritch/armsy/prime(loc,TRUE,10)
-			summoned.ghostize(0)
-			user.SetImmobilized(0)
-			priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the dark, for king of arms has ascended! Lord of the night has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
-			log_game("[user.real_name] ascended as [summoned.real_name]")
-			if(!ishuman(user))
-				return
-			var/mob/living/carbon/human/H = user
-			H.client?.give_award(/datum/award/achievement/misc/flesh_ascension, H)
-			var/datum/antagonist/heretic/ascension = user.mind.has_antag_datum(/datum/antagonist/heretic)
-			ascension.ascended = TRUE
-			user.mind.transfer_to(summoned, TRUE)
-			user.gib()
+	. = ..()
+	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Ever coiling vortex. Reality unfolded. THE LORD OF ARMS, [user.real_name] has ascended! Fear the ever twisting hand! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
+	user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shed_human_form)
+	if(!ishuman(user))
+		return
+	var/mob/living/carbon/human/H = user
+	H.physiology.brute_mod *= 0.5
+	H.physiology.burn_mod *= 0.5
+	var/datum/antagonist/heretic/heretic = user.mind.has_antag_datum(/datum/antagonist/heretic)
+	var/datum/eldritch_knowledge/flesh_grasp/ghoul1 = heretic.get_knowledge(/datum/eldritch_knowledge/flesh_grasp)
+	ghoul1.ghoul_amt *= 3
+	var/datum/eldritch_knowledge/flesh_ghoul/ghoul2 = heretic.get_knowledge(/datum/eldritch_knowledge/flesh_ghoul)
+	ghoul2.max_amt *= 3
 
 	return ..()
 
@@ -275,6 +258,11 @@
 	gain_text = "The ignorant mind that inhabits their feeble bodies will crumble when they acknowledge - willingly or not, the truth."
 	desc = "By forcing the knowledge of the Mansus upon my foes, I can show them things that would drive any normal man insane."
 	cost = 2
+	sacs_needed = 3
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/mad_touch
 	next_knowledge = list(/datum/eldritch_knowledge/final/flesh_final)
 	route = PATH_FLESH
+
+/datum/eldritch_knowledge/spell/touch_of_madness/on_gain(mob/user)
+	. = ..()
+	priority_announce("The stench of rotting flesh fills the air... An approaching abomination has been detected!", sound = 'sound/misc/notice1.ogg')

code/modules/antagonists/eldritch_cult/knowledge/rust_lore.dm

@@ -1,18 +1,18 @@
 /datum/eldritch_knowledge/base_rust
 	name = "Blacksmith's Tale"
-	desc = "Inducts you into the Path of Rust. Allows you to transmute an eldritch blade with any trash item into a Blade of Rust."
-	gain_text = "'Let me tell you a story,' The Blacksmith said as he gazed into his rusty blade."
-	banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final)
+	desc = "Inducts you into the Path of Rust. Allows you to transmute a spear with any trash item into a Blade of Rust."
+	gain_text = "'Let me tell you a story', said the Blacksmith, as he gazed deep into his rusty blade."
+	banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/final/void_final,/datum/eldritch_knowledge/base_void)
 	next_knowledge = list(/datum/eldritch_knowledge/rust_fist)
-	required_atoms = list(/obj/item/melee/sickly_blade,/obj/item/trash)
+	required_atoms = list(/obj/item/spear,/obj/item/trash)
 	result_atoms = list(/obj/item/melee/sickly_blade/rust)
-	cost = 1
+	cost = 0
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/rust_fist
 	name = "Grasp of Rust"
-	desc = "Empowers your Mansus Grasp to deal 500 damage to non-living matter and rust any structure it touches. Destroys already rusted structures."
-	gain_text = "Rust grows on the ceiling of the mansus."
+	desc = "Empowers your Mansus Grasp to deal 500 damage to non-living matter and rust any surface it touches. Already rusted surfaces are destroyed."
+	gain_text = "On the ceiling of the Mansus, rust grows as moss does on a stone."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/rust_regen)
 	var/rust_force = 500
@@ -20,35 +20,40 @@
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/rust_fist/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
+	. = ..()
+	var/check = FALSE
+	if(ismob(target))
+		var/mob/living/mobster = target
+		if(!(mobster.mob_biotypes & MOB_ROBOTIC))
+			return FALSE
+		else
+			check = TRUE
+	if(user.a_intent == INTENT_HARM || check)
+		target.rust_heretic_act()
+		return TRUE
+
+/datum/eldritch_knowledge/rust_fist/on_eldritch_blade(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = target
-		var/datum/status_effect/eldritch/E = H.has_status_effect(/datum/status_effect/eldritch/rust) || H.has_status_effect(/datum/status_effect/eldritch/ash) || H.has_status_effect(/datum/status_effect/eldritch/flesh)
+		var/datum/status_effect/eldritch/E = H.has_status_effect(/datum/status_effect/eldritch/rust) || H.has_status_effect(/datum/status_effect/eldritch/ash) || H.has_status_effect(/datum/status_effect/eldritch/flesh)  || H.has_status_effect(/datum/status_effect/eldritch/void)
 		if(E)
 			E.on_effect()
 			H.adjustOrganLoss(pick(ORGAN_SLOT_BRAIN,ORGAN_SLOT_EARS,ORGAN_SLOT_EYES,ORGAN_SLOT_LIVER,ORGAN_SLOT_LUNGS,ORGAN_SLOT_STOMACH,ORGAN_SLOT_HEART),25)
-	else
-		for(var/X in user.mind.spell_list)
-			if(!istype(X,/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp))
-				continue
-			var/obj/effect/proc_holder/spell/targeted/touch/mansus_grasp/MG = X
-			MG.charge_counter = min(round(MG.charge_counter + MG.charge_max * 0.75),MG.charge_max)
-	target.rust_heretic_act()
-	return TRUE
 
 /datum/eldritch_knowledge/spell/area_conversion
 	name = "Aggressive Spread"
-	desc = "Spreads rust to nearby turfs. Destroys already rusted walls."
-	gain_text = "All wise men know not to touch the bound king."
+	desc = "Spreads rust to nearby surfaces. Already rusted surfaces are destroyed."
+	gain_text = "All wise men know well not to touch the Bound King."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/rust_conversion
-	next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/spell/rust_wave)
+	next_knowledge = list(/datum/eldritch_knowledge/rust_blade_upgrade,/datum/eldritch_knowledge/curse/corrosion,/datum/eldritch_knowledge/crucible,/datum/eldritch_knowledge/spell/rust_wave)
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/spell/rust_wave
 	name = "Patron's Reach"
 	desc = "You can now send a bolt of rust that corrupts the immediate area, and poisons the first target hit."
-	gain_text = "Messengers of hope fear the Rustbringer."
+	gain_text = "Messengers of Hope, fear the Rustbringer!"
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/aimed/rust_wave
 	route = PATH_RUST
@@ -56,7 +61,7 @@
 /datum/eldritch_knowledge/rust_regen
 	name = "Leeching Walk"
 	desc = "Passively heals you when you are on rusted tiles."
-	gain_text = "'The strength was unparalleled, unnatural.' The Blacksmith was smiling."
+	gain_text = "The strength was unparalleled, unnatural. The Blacksmith was smiling."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/armor,/datum/eldritch_knowledge/essence)
 	route = PATH_RUST
@@ -75,26 +80,27 @@
 
 /datum/eldritch_knowledge/rust_mark
 	name = "Mark of Rust"
-	desc = "Your eldritch blade now applies a rust mark. Rust marks have a chance to deal between 0 to 200 damage to 75% of enemies items. To activate the mark use your Mansus Grasp on it."
-	gain_text = "Lords of the depths help those in dire need at a cost."
+	desc = "Your Mansus Grasp now applies the Mark of Rust on hit. Attack the afflicted with your Sickly Blade to detonate the mark. Upon detonation, the Mark of Rust has a chance to deal between 0 to 200 damage to 75% of your enemy's held items."
+	gain_text = "Rusted Hills help those in dire need at a cost."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/spell/area_conversion)
-	banned_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark)
+	banned_knowledge = list(/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark,/datum/eldritch_knowledge/void_mark)
 	route = PATH_RUST
 
-/datum/eldritch_knowledge/rust_mark/on_eldritch_blade(target,user,proximity_flag,click_parameters)
+/datum/eldritch_knowledge/rust_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	if(isliving(target))
+		. = TRUE
 		var/mob/living/living_target = target
 		living_target.apply_status_effect(/datum/status_effect/eldritch/rust)
 
 /datum/eldritch_knowledge/rust_blade_upgrade
-	name = "Toxic Steel"
-	gain_text = "Let the blade guide you through the flesh."
-	desc = "Your blade of choice will now add toxin to enemies bloodstream."
+	name = "Toxic Blade"
+	gain_text = "The Blade will guide you through the flesh, should you let it."
+	desc = "Your blade of choice will now poison your enemies on hit."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/spell/entropic_plume)
-	banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade)
+	banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/void_blade_upgrade)
 	route = PATH_RUST
 
 /datum/eldritch_knowledge/rust_blade_upgrade/on_eldritch_blade(mob/target,user,proximity_flag,click_parameters)
@@ -106,8 +112,8 @@
 
 /datum/eldritch_knowledge/spell/entropic_plume
 	name = "Entropic Plume"
-	desc = "You can now send a befuddling plume that blinds, poisons and makes enemies strike each other, while also converting the immediate area into rust."
-	gain_text = "If they knew, the truth would turn them against eachother."
+	desc = "You can now send a disorienting plume of pure entropy that blinds, poisons and makes enemies strike each other. It also rusts any tiles it affects."
+	gain_text = "The slightest glimmer of truth would turn them against eachother."
 	cost = 1
 	spell_to_add = /obj/effect/proc_holder/spell/cone/staggered/entropic_plume
 	next_knowledge = list(/datum/eldritch_knowledge/rust_fist_upgrade,/datum/eldritch_knowledge/spell/cleave,/datum/eldritch_knowledge/summon/rusty)
@@ -115,26 +121,26 @@
 
 /datum/eldritch_knowledge/armor
 	name = "Armorer's Ritual"
-	desc = "You can now create eldritch armor using a built table and a gas mask on top of a transmutation rune."
-	gain_text = "For I am the heir to the throne of doom."
+	desc = "You can now create Eldritch Armor using a table and a gas mask."
+	gain_text = "The Rusted Hills welcomed the Blacksmith in their generosity."
 	cost = 1
-	next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/flesh_ghoul)
+	next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/cold_snap)
 	required_atoms = list(/obj/structure/table,/obj/item/clothing/mask/gas)
 	result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/eldritch)
 
 /datum/eldritch_knowledge/essence
 	name = "Priest's Ritual"
-	desc = "You can now transmute a tank of water into a bottle of eldritch fluid."
-	gain_text = "This is an old recipe, I got it from an owl."
+	desc = "You can now transmute a tank of water and a glass shard into a bottle of eldritch water."
+	gain_text = "This is an old recipe. The Owl whispered it to me."
 	cost = 1
 	next_knowledge = list(/datum/eldritch_knowledge/rust_regen,/datum/eldritch_knowledge/spell/ashen_shift)
-	required_atoms = list(/obj/structure/reagent_dispensers/watertank)
+	required_atoms = list(/obj/structure/reagent_dispensers/watertank,/obj/item/shard)
 	result_atoms = list(/obj/item/reagent_containers/glass/beaker/eldritch)
 
 /datum/eldritch_knowledge/rust_fist_upgrade
 	name = "Vile Grip"
 	desc = "Empowers your Mansus Grasp further, sickening your foes and making them vomit, while also strengthening the rate at which your hand decays objects."
-	gain_text = "A sickly diseased touch that was, yet, so welcoming."
+	gain_text = "His touch vile, terrible, and yet so terribly inviting.."
 	cost = 2
 	next_knowledge = list(/datum/eldritch_knowledge/spell/grasp_of_decay)
 	var/rust_force = 750
@@ -145,23 +151,29 @@
 	. = ..()
 	if(ishuman(target))
 		var/mob/living/carbon/human/H = target
-		H.set_disgust(75)
+		H.set_disgust(25)
 	return TRUE
 
 /datum/eldritch_knowledge/spell/grasp_of_decay
 	name = "Grasp of Decay"
-	desc = "Applying your knowledge of rust to the human body, a knowledge that could decay your foes from the inside out, resulting in organ failure, vomiting, or eventual death through peeling flesh."
-	gain_text = "Decay, similar to Rust, yet so much more terribly uninviting."
+	desc = "Applying your knowledge of rust to the human body, a knowledge that could decay your foes from the inside out, resulting in organ failure, vomiting, or eventual death through the peeling of rotting flesh."
+	gain_text = "Rust, decay, it's all the same. All that remains is application."
 	cost = 2
+	sacs_needed = 3
 	spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/grasp_of_decay
 	next_knowledge = list(/datum/eldritch_knowledge/final/rust_final)
 	route = PATH_RUST
 
+/datum/eldritch_knowledge/spell/grasp_of_decay/on_gain(mob/user)
+	. = ..()
+	priority_announce("A foul wind is blowing... The floor creaks with rust as something sinister approaches!", sound = 'sound/misc/notice1.ogg')
+
 /datum/eldritch_knowledge/final/rust_final
 	name = "Rustbringer's Oath"
 	desc = "Bring three corpses onto a transmutation rune. After you finish the ritual, rust will now automatically spread from the rune. Your healing on rust is also tripled, while you become more resilient overall."
-	gain_text = "Champion of rust. Corruptor of steel. Fear the dark for Rustbringer has come!"
+	gain_text = "Champion of rust. Corruptor of steel. Fear the dark for the Rustbringer has come! Rusted Hills, CALL MY NAME!"
 	cost = 5
+	sacs_needed = 8
 	required_atoms = list(/mob/living/carbon/human)
 	route = PATH_RUST
 
@@ -169,7 +181,6 @@
 	var/mob/living/carbon/human/H = user
 	H.physiology.brute_mod *= 0.5
 	H.physiology.burn_mod *= 0.5
-	H.client?.give_award(/datum/award/achievement/misc/rust_ascension, H)
 	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
 	new /datum/rust_spread(loc)
 	var/datum/antagonist/heretic/ascension = H.mind.has_antag_datum(/datum/antagonist/heretic)

code/modules/antagonists/eldritch_cult/knowledge/void_lore.dm

@@ -0,0 +1,229 @@
+/datum/eldritch_knowledge/base_void
+	name = "Glimmer of Winter"
+	desc = "Opens up the path of void to you. Allows you to transmute a spear in a sub-zero temperature into a void blade."
+	gain_text = "I feel a shimmer in the air, atmosphere around me gets colder. I feel my body realizing the emptiness of existance. Something's watching me"
+	banned_knowledge = list(/datum/eldritch_knowledge/base_ash,/datum/eldritch_knowledge/base_flesh,/datum/eldritch_knowledge/final/ash_final,/datum/eldritch_knowledge/final/flesh_final,/datum/eldritch_knowledge/base_rust,/datum/eldritch_knowledge/final/rust_final)
+	next_knowledge = list(/datum/eldritch_knowledge/void_grasp)
+	required_atoms = list(/obj/item/spear)
+	result_atoms = list(/obj/item/melee/sickly_blade/void)
+	cost = 0
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/base_void/recipe_snowflake_check(list/atoms, loc)
+	. = ..()
+	var/turf/open/turfie = loc
+	if(turfie.GetTemperature() > T0C)
+		return FALSE
+
+/datum/eldritch_knowledge/void_grasp
+	name = "Grasp of Void"
+	desc = "Temporarily mutes your victim, also lowers their body temperature."
+	gain_text = "I found the cold watcher who observes me. The resonance of cold grows within me. This isn't the end of the mystery."
+	cost = 1
+	route = PATH_VOID
+	next_knowledge = list(/datum/eldritch_knowledge/cold_snap)
+
+/datum/eldritch_knowledge/void_grasp/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
+	. = ..()
+	if(!iscarbon(target))
+		return
+	var/mob/living/carbon/carbon_target = target
+	var/turf/open/turfie = get_turf(carbon_target)
+	turfie.TakeTemperature(-20)
+	carbon_target.adjust_bodytemperature(-40)
+	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)
+	. = ..()
+	if(!ishuman(target))
+		return
+	var/mob/living/carbon/human/H = target
+	var/datum/status_effect/eldritch/E = H.has_status_effect(/datum/status_effect/eldritch/rust) || H.has_status_effect(/datum/status_effect/eldritch/ash) || H.has_status_effect(/datum/status_effect/eldritch/flesh)  || H.has_status_effect(/datum/status_effect/eldritch/void)
+	if(!E)
+		return
+	E.on_effect()
+	H.silent = clamp(H.silent + 3, 0, 20)
+
+/datum/eldritch_knowledge/cold_snap
+	name = "Aristocrat's Way"
+	desc = "Makes you immune to cold temperatures, and you no longer need to breathe, you can still take damage from lack of pressure."
+	gain_text = "I found a thread of cold breath. It lead me to a strange shrine, all made of crystals. Translucent and white, a depiction of a nobleman stood before me."
+	cost = 1
+	route = PATH_VOID
+	next_knowledge = list(/datum/eldritch_knowledge/void_cloak,/datum/eldritch_knowledge/void_mark,/datum/eldritch_knowledge/armor)
+
+/datum/eldritch_knowledge/cold_snap/on_gain(mob/user)
+	. = ..()
+	ADD_TRAIT(user,TRAIT_RESISTCOLD,MAGIC_TRAIT)
+	ADD_TRAIT(user, TRAIT_NOBREATH, MAGIC_TRAIT)
+
+/datum/eldritch_knowledge/cold_snap/on_lose(mob/user)
+	. = ..()
+	REMOVE_TRAIT(user,TRAIT_RESISTCOLD,MAGIC_TRAIT)
+	ADD_TRAIT(user, TRAIT_NOBREATH, MAGIC_TRAIT)
+
+/datum/eldritch_knowledge/void_cloak
+	name = "Void Cloak"
+	desc = "A cloak that can become invisbile at will, hiding items you store in it. To create it transmute a glass shard, any item of clothing that you can fit over your uniform and any type of bedsheet."
+	gain_text = "Owl is the keeper of things that quite not are in practice, but in theory are."
+	cost = 1
+	next_knowledge = list(/datum/eldritch_knowledge/flesh_ghoul,/datum/eldritch_knowledge/cold_snap)
+	result_atoms = list(/obj/item/clothing/suit/hooded/cultrobes/void)
+	required_atoms = list(/obj/item/shard,/obj/item/clothing/suit,/obj/item/bedsheet)
+
+/datum/eldritch_knowledge/void_mark
+	name = "Mark of Void"
+	gain_text = "A gust of wind? Maybe a shimmer in the air. Presence is overwhelming, my senses betrayed me, my mind is my enemy."
+	desc = "Your mansus grasp now applies mark of void status effect. To proc the mark, use your sickly blade on the marked. Mark of void when procced lowers the victims body temperature significantly."
+	cost = 2
+	next_knowledge = list(/datum/eldritch_knowledge/spell/void_phase)
+	banned_knowledge = list(/datum/eldritch_knowledge/rust_mark,/datum/eldritch_knowledge/ash_mark,/datum/eldritch_knowledge/flesh_mark)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/void_mark/on_mansus_grasp(atom/target, mob/user, proximity_flag, click_parameters)
+	. = ..()
+	if(!isliving(target))
+		return
+	. = TRUE
+	var/mob/living/living_target = target
+	living_target.apply_status_effect(/datum/status_effect/eldritch/void)
+
+/datum/eldritch_knowledge/spell/void_phase
+	name = "Void Phase"
+	gain_text = "Reality bends under the power of memory, for all is fleeting, and what else stays?"
+	desc = "You gain a long range pointed blink that allows you to instantly teleport to your location, it causes aoe damage around you and your chosen location."
+	cost = 1
+	spell_to_add = /obj/effect/proc_holder/spell/pointed/void_blink
+	next_knowledge = list(/datum/eldritch_knowledge/rune_carver,/datum/eldritch_knowledge/crucible,/datum/eldritch_knowledge/void_blade_upgrade)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/rune_carver
+	name = "Carving Knife"
+	gain_text = "Etched, carved... eternal. I can carve the monolith and evoke their powers!"
+	desc = "You can create a carving knife, which allows you to create up to 3 carvings on the floor that have various effects on nonbelievers who walk over them. They make quite a handy throwing weapon. To create the carving knife transmute a knife with a glass shard and a piece of paper."
+	cost = 1
+	next_knowledge = list(/datum/eldritch_knowledge/spell/void_phase,/datum/eldritch_knowledge/summon/raw_prophet)
+	required_atoms = list(/obj/item/kitchen/knife,/obj/item/shard,/obj/item/paper)
+	result_atoms = list(/obj/item/melee/rune_knife)
+
+/datum/eldritch_knowledge/crucible
+	name = "Mawed Crucible"
+	gain_text = "This is pure agony, i wasn't able to summon the dereliction of the emperor, but i stumbled upon a diffrent recipe..."
+	desc = "Allows you to create a mawed crucible, eldritch structure that allows you to create potions of various effects, to do so transmute a table with a watertank"
+	cost = 1
+	next_knowledge = list(/datum/eldritch_knowledge/spell/void_phase,/datum/eldritch_knowledge/spell/area_conversion)
+	required_atoms = list(/obj/structure/reagent_dispensers/watertank,/obj/structure/table)
+	result_atoms = list(/obj/structure/eldritch_crucible)
+
+/datum/eldritch_knowledge/void_blade_upgrade
+	name = "Seeking blade"
+	gain_text = "Fleeting memories, fleeting feet. I can mark my way with the frozen blood upon the snow. Covered and forgotten."
+	desc = "You can now use your blade on a distant marked target to move to them and attack them."
+	cost = 2
+	next_knowledge = list(/datum/eldritch_knowledge/spell/voidpull)
+	banned_knowledge = list(/datum/eldritch_knowledge/ash_blade_upgrade,/datum/eldritch_knowledge/flesh_blade_upgrade,/datum/eldritch_knowledge/rust_blade_upgrade)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/void_blade_upgrade/on_ranged_attack_eldritch_blade(atom/target, mob/user, click_parameters)
+	. = ..()
+	var/mob/living/carbon/carbon_human = user
+	var/mob/living/carbon/human/human_target = target
+	var/datum/status_effect/eldritch/effect = human_target.has_status_effect(/datum/status_effect/eldritch/rust) || human_target.has_status_effect(/datum/status_effect/eldritch/ash) || human_target.has_status_effect(/datum/status_effect/eldritch/flesh) || human_target.has_status_effect(/datum/status_effect/eldritch/void)
+	if(!effect)
+		return
+	var/dir = angle2dir(dir2angle(get_dir(user,human_target))+180)
+	carbon_human.forceMove(get_step(human_target,dir))
+	var/obj/item/melee/sickly_blade/blade = carbon_human.get_active_held_item()
+	blade.melee_attack_chain(carbon_human,human_target,attackchain_flags = ATTACK_IGNORE_CLICKDELAY)
+
+/datum/eldritch_knowledge/spell/voidpull
+	name = "Void Pull"
+	gain_text = "This entity calls itself The Aristocrat, I'm close to finishing what was started."
+	desc = "You gain an ability that let's you pull people around you closer to you."
+	cost = 1
+	spell_to_add = /obj/effect/proc_holder/spell/targeted/void_pull
+	next_knowledge = list(/datum/eldritch_knowledge/spell/boogiewoogie,/datum/eldritch_knowledge/spell/blood_siphon,/datum/eldritch_knowledge/summon/rusty)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/spell/boogiewoogie
+	name = "Void's Applause"
+	gain_text = "The curtain is closing, and I'm certain that The Aristocrat is proud of me."
+	desc = "With the clap of your hands, you can swap your position with someone within your vision."
+	cost = 2
+	spell_to_add = /obj/effect/proc_holder/spell/pointed/boogie_woogie
+	next_knowledge = list(/datum/eldritch_knowledge/spell/domain_expansion)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/spell/domain_expansion
+	name = "Infinite Void"
+	gain_text = "This world will be my stage, and nothing will be out of my reach."
+	desc = "Gain the ability to mark a 7x7 area as your domain after a short delay. Creatures in your domain are slowed and branded with a void mark, allowing you to quickly teleport to them and slash them, further inhibiting their ability to move."
+	cost = 2
+	sacs_needed = 3
+	spell_to_add = /obj/effect/proc_holder/spell/aoe_turf/domain_expansion
+	next_knowledge = list(/datum/eldritch_knowledge/final/void_final)
+	route = PATH_VOID
+
+/datum/eldritch_knowledge/spell/domain_expansion/on_gain(mob/user)
+	. = ..()
+	priority_announce("Echos of the lost in space are heard... An ominous presence is being detected! ", sound = 'sound/misc/notice1.ogg')
+
+/datum/eldritch_knowledge/final/void_final
+	name = "Waltz at the End of Time"
+	desc = "Bring 3 corpses onto the transmutation rune. After you finish the ritual you will automatically silence people around you and will summon a snow storm around you."
+	gain_text = "The world falls into darkness. I stand in an empty plane, small flakes of ice fall from the sky. The Aristocrat stands before me, he motions to me. We will play a waltz to the whispers of dying reality, as the world is destroyed before our eyes."
+	cost = 5
+	sacs_needed = 8
+	required_atoms = list(/mob/living/carbon/human)
+	route = PATH_VOID
+	///soundloop for the void theme
+	var/datum/looping_sound/void_loop/sound_loop
+	///Reference to the ongoing voidstorm that surrounds the heretic
+	var/datum/weather/void_storm/storm
+
+/datum/eldritch_knowledge/final/void_final/on_finished_recipe(mob/living/user, list/atoms, loc)
+	var/mob/living/carbon/human/H = user
+	user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/repulse/eldritch)
+	H.physiology.brute_mod *= 0.5
+	H.physiology.burn_mod *= 0.5
+	ADD_TRAIT(H, TRAIT_RESISTLOWPRESSURE, MAGIC_TRAIT)
+	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# The nobleman of void [H.real_name] has arrived, step along the Waltz that ends worlds! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
+
+	sound_loop = new(list(user),TRUE,TRUE)
+	return ..()
+
+/datum/eldritch_knowledge/final/void_final/on_death()
+	if(sound_loop)
+		sound_loop.stop()
+	if(storm)
+		storm.end()
+		QDEL_NULL(storm)
+
+/datum/eldritch_knowledge/final/void_final/on_life(mob/user)
+	. = ..()
+	if(!finished)
+		return
+
+	for(var/mob/living/carbon/livies in spiral_range(7,user)-user)
+		if(IS_HERETIC_MONSTER(livies) || IS_HERETIC(livies))
+			return
+		livies.silent = clamp(livies.silent + 1, 0, 5)
+		livies.adjust_bodytemperature(-20)
+
+	var/turf/turfie = get_turf(user)
+	if(!isopenturf(turfie))
+		return
+	var/turf/open/open_turfie = turfie
+	open_turfie.TakeTemperature(-20)
+
+	var/area/user_area = get_area(user)
+	var/turf/user_turf = get_turf(user)
+
+	if(!storm)
+		storm = new /datum/weather/void_storm(list(user_turf.z))
+		storm.telegraph()
+
+	storm.area_type = user_area.type
+	storm.impacted_areas = list(user_area)
+	storm.update_areas()

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -633,7 +633,7 @@ This is here to make the tiles around the station mininuke change when it's arme
 	AddComponent(/datum/component/stationloving, !fake)
 
 /obj/item/disk/nuclear/process()
-	++process_tick
+	process_tick++
 	if(fake)
 		STOP_PROCESSING(SSobj, src)
 		CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck")
@@ -650,7 +650,7 @@ This is here to make the tiles around the station mininuke change when it's arme
 				disk_comfort_level++
 
 		if(disk_comfort_level >= 2) //Sleep tight, disky.
-			if(process_tick % 30)
+			if(!(process_tick % 30))
 				visible_message("<span class='notice'>[src] sleeps soundly. Sleep tight, disky.</span>")
 		if(last_disk_move < world.time - 5000 && prob((world.time - 5000 - last_disk_move)*0.0001))
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control

code/modules/antagonists/nukeop/equipment/pinpointer.dm

@@ -61,6 +61,7 @@
 	name = "syndicate pinpointer"
 	desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device."
 	icon_state = "pinpointer_syndicate"
+	item_state = "pinpointer_black"
 
 /obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative.
 	name = "cyborg syndicate pinpointer"

code/modules/antagonists/revenant/revenant.dm

@@ -1,6 +1,6 @@
 //Revenants: based off of wraiths from Goon
 //"Ghosts" that are invisible and move like ghosts, cannot take damage while invisible
-//Don't hear deadchat and are NOT normal ghosts
+//Can hear deadchat, but are NOT normal ghosts and do NOT have x-ray vision
 //Admin-spawn or random event
 
 #define INVISIBILITY_REVENANT 50
@@ -63,6 +63,7 @@
 	var/essence_regenerating = TRUE //If the revenant regenerates essence or not
 	var/essence_regen_amount = 5 //How much essence regenerates
 	var/essence_accumulated = 0 //How much essence the revenant has stolen
+	var/essence_excess = 0 //How much stolen essence available for unlocks
 	var/revealed = FALSE //If the revenant can take damage from normal sources.
 	var/unreveal_time = 0 //How long the revenant is revealed for, is about 2 seconds times this var.
 	var/unstun_time = 0 //How long the revenant is stunned for, is about 2 seconds times this var.
@@ -76,6 +77,7 @@
 
 /mob/living/simple_animal/revenant/Initialize(mapload)
 	. = ..()
+	ADD_TRAIT(src, TRAIT_SIXTHSENSE, INNATE_TRAIT)
 	AddSpell(new /obj/effect/proc_holder/spell/targeted/night_vision/revenant(null))
 	AddSpell(new /obj/effect/proc_holder/spell/targeted/telepathy/revenant(null))
 	AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/revenant/defile(null))
@@ -138,6 +140,7 @@
 	. = ..()
 	. += "Current essence: [essence]/[essence_regen_cap]E"
 	. += "Stolen essence: [essence_accumulated]E"
+	. += "Unused stolen essence: [essence_excess]E)"
 	. += "Stolen perfect souls: [perfectsouls]"
 
 /mob/living/simple_animal/revenant/update_health_hud()
@@ -174,6 +177,9 @@
 /mob/living/simple_animal/revenant/ex_act(severity, target)
 	return 1 //Immune to the effects of explosions.
 
+/mob/living/simple_animal/revenant/wave_ex_act(power, datum/wave_explosion/explosion, dir)
+	return power
+
 /mob/living/simple_animal/revenant/blob_act(obj/structure/blob/B)
 	return //blah blah blobs aren't in tune with the spirit world, or something.
 
@@ -304,16 +310,24 @@
 		return FALSE
 	return TRUE
 
+/mob/living/simple_animal/revenant/proc/unlock(essence_cost)
+	if(essence_excess < essence_cost)
+		return FALSE
+	essence_excess -= essence_cost
+	update_action_buttons_icon()
+	return TRUE
+
 /mob/living/simple_animal/revenant/proc/change_essence_amount(essence_amt, silent = FALSE, source = null)
 	if(!src)
 		return
-	if(essence + essence_amt <= 0)
+	if(essence + essence_amt < 0)
 		return
 	essence = max(0, essence+essence_amt)
-	update_action_buttons_icon()
 	update_health_hud()
 	if(essence_amt > 0)
 		essence_accumulated = max(0, essence_accumulated+essence_amt)
+		essence_excess = max(0, essence_excess+essence_amt)
+	update_action_buttons_icon()
 	if(!silent)
 		if(essence_amt > 0)
 			to_chat(src, "<span class='revennotice'>Gained [essence_amt]E[source ? " from [source]":""].</span>")
@@ -478,7 +492,7 @@
 	var/targetAmount = 100
 
 /datum/objective/revenant/New()
-	targetAmount = rand(350,600)
+	targetAmount = rand(150,300)
 	explanation_text = "Absorb [targetAmount] points of essence from humans."
 	..()
 

code/modules/antagonists/revenant/revenant_abilities.dm

@@ -61,6 +61,8 @@
 				to_chat(src, "<span class='revenminor'>You begin siphoning essence from [target]'s soul.</span>")
 				if(target.stat != DEAD)
 					to_chat(target, "<span class='warning'>You feel a horribly unpleasant draining sensation as your grip on life weakens...</span>")
+				if(target.stat == SOFT_CRIT)
+					target.Stun(46)
 				reveal(46)
 				stun(46)
 				target.visible_message("<span class='warning'>[target] suddenly rises slightly into the air, [target.p_their()] skin turning an ashy gray.</span>")
@@ -144,7 +146,7 @@
 	if(user.inhibited)
 		return FALSE
 	if(locked)
-		if(user.essence <= unlock_amount)
+		if(user.essence_excess <= unlock_amount)
 			return FALSE
 	if(user.essence <= cast_amount)
 		return FALSE
@@ -158,7 +160,7 @@
 			locked = FALSE
 		return TRUE
 	if(locked)
-		if(!user.castcheck(-unlock_amount))
+		if(!user.unlock(unlock_amount))
 			charge_counter = charge_max
 			return FALSE
 		name = "[initial(name)] ([cast_amount]E)"
@@ -185,6 +187,7 @@
 	range = 5
 	stun = 30
 	cast_amount = 40
+	unlock_amount = 25
 	var/shock_range = 2
 	var/shock_damage = 15
 	action_icon_state = "overload_lights"
@@ -197,7 +200,7 @@
 /obj/effect/proc_holder/spell/aoe_turf/revenant/overload/proc/overload(turf/T, mob/user)
 	for(var/obj/machinery/light/L in T)
 		if(!L.on)
-			return
+			continue
 		L.visible_message("<span class='warning'><b>\The [L] suddenly flares brightly and begins to spark!</span>")
 		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(4, 0, L)
@@ -226,7 +229,7 @@
 	range = 4
 	stun = 20
 	reveal = 40
-	unlock_amount = 75
+	unlock_amount = 10
 	cast_amount = 30
 	action_icon_state = "defile"
 
@@ -277,7 +280,7 @@
 	charge_max = 200
 	range = 4
 	cast_amount = 60
-	unlock_amount = 200
+	unlock_amount = 125
 	action_icon_state = "malfunction"
 
 //A note to future coders: do not replace this with an EMP because it will wreck malf AIs and everyone will hate you.
@@ -324,7 +327,7 @@
 	charge_max = 200
 	range = 3
 	cast_amount = 50
-	unlock_amount = 200
+	unlock_amount = 75
 	action_icon_state = "blight"
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant/blight/cast(list/targets, mob/living/simple_animal/revenant/user = usr)

code/modules/antagonists/slaughter/slaughter.dm

@@ -84,6 +84,9 @@
 	if(slam_cooldown + slam_cooldown_time > world.time)
 		to_chat(src, "<span class='warning'>Your slam ability is still on cooldown!</span>")
 		return
+	if(!isopenturf(loc))
+		to_chat(src, "<span class='warning'>You need to be on open flooring to do that!")
+		return
 
 	face_atom(A)
 	var/mob/living/victim = A

code/modules/antagonists/slaughter/slaughterevent.dm

@@ -7,7 +7,21 @@
 	earliest_start = 1 HOURS
 	min_players = 20
 
-
+/datum/round_event_control/slaughter/canSpawnEvent()
+	weight = initial(src.weight)
+	var/list/allowed_turf_typecache = typecacheof(/turf/open) - typecacheof(/turf/open/space)
+	var/list/allowed_z_cache = list()
+	for(var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
+		allowed_z_cache[num2text(z)] = TRUE
+	for(var/obj/effect/decal/cleanable/C in world)
+		if(!C.loc || QDELETED(C))
+			continue
+		if(!C.can_bloodcrawl_in())
+			continue
+		if(!SSpersistence.IsValidDebrisLocation(C.loc, allowed_turf_typecache, allowed_z_cache, C.type, FALSE))
+			continue
+		weight += 0.03
+	return ..()
 
 /datum/round_event/ghost_role/slaughter
 	minimum_required = 1

code/modules/antagonists/space_dragon/space_dragon.dm

@@ -0,0 +1,79 @@
+/datum/antagonist/space_dragon
+	name = "Space Dragon"
+	roundend_category = "space dragons"
+	antagpanel_category = "Space Dragon"
+	job_rank = ROLE_SPACE_DRAGON
+	show_in_antagpanel = TRUE
+	show_name_in_check_antagonists = TRUE
+	var/list/datum/mind/carp = list()
+	
+/datum/antagonist/space_dragon/greet()
+	to_chat(owner, "<b>Endless time and space we have moved through.  We do not remember from where we came, we do not know where we will go.  All space belongs to us.\n\
+					Space is an empty void, of which our kind is the apex predator, and there was little to rival our claim to this title.\n\
+					But now, we find intruders spread out amongst our claim, willing to fight our teeth with magics unimaginable, their dens like lights flicking in the depths of space.\n\
+					Today, we will snuff out one of those lights.</b>")
+	to_chat(owner, "<span class='boldwarning'>You have five minutes to find a safe location to place down the first rift.  If you take longer than five minutes to place a rift, you will be returned from whence you came.\n\
+					Alt click to cause a gust around you!</span>")
+	owner.announce_objectives()
+	SEND_SOUND(owner.current, sound('sound/magic/demon_attack1.ogg'))
+	
+/datum/antagonist/space_dragon/proc/forge_objectives()
+	var/datum/objective/summon_carp/summon = new()
+	summon.dragon = src
+	objectives += summon
+	
+/datum/antagonist/space_dragon/on_gain()
+	forge_objectives()
+	. = ..()
+
+/datum/objective/summon_carp
+	var/datum/antagonist/space_dragon/dragon
+	explanation_text = "Summon and protect the rifts to flood the station with carp."
+
+/datum/antagonist/space_dragon/roundend_report()
+	var/list/parts = list()
+	var/datum/objective/summon_carp/S = locate() in objectives
+	if(S.check_completion())
+		parts += "<span class='redtext big'>The [name] has succeeded!  Station space has been reclaimed by the space carp!</span>"
+	parts += printplayer(owner)
+	var/objectives_complete = TRUE
+	if(objectives.len)
+		parts += printobjectives(objectives)
+		for(var/datum/objective/objective in objectives)
+			if(!objective.check_completion())
+				objectives_complete = FALSE
+				break
+	if(objectives_complete)
+		parts += "<span class='greentext big'>The [name] was successful!</span>"
+	else
+		parts += "<span class='redtext big'>The [name] has failed!</span>"
+	parts += "<span class='header'>The [name] was assisted by:</span>"
+	parts += printplayerlist(carp)
+	return "<div class='panel redborder'>[parts.Join("<br>")]</div>"
+
+/datum/antagonist/space_dragon/admin_add(datum/mind/new_owner, mob/admin)
+	// pick the spawn loc
+	var/list/spawn_locs = list()
+	for(var/obj/effect/landmark/carpspawn/carp_spawn in GLOB.landmarks_list)
+		if(!isturf(carp_spawn.loc))
+			stack_trace("Carp spawn found not on a turf: [carp_spawn.type] on [isnull(carp_spawn.loc) ? "null" : carp_spawn.loc.type]")
+			continue
+		spawn_locs += carp_spawn.loc
+	if(!spawn_locs.len)
+		message_admins("No valid spawn locations found, aborting...")
+		return MAP_ERROR
+
+	// spawn our dragon
+	var/mob/living/simple_animal/hostile/space_dragon/S = new(pick(spawn_locs))
+	// gib or delete the old mob here
+	new_owner.current.gib()
+	// alternativelly, isntead of using the code above to pick a location, we can gib the mob, then spawn the dragon where it died for a goresome transformation
+
+	//mind transfer and role setup
+	new_owner.transfer_to(S)
+	new_owner.assigned_role = "Space Dragon"
+	new_owner.special_role = "Space Dragon"
+
+	playsound(S, 'sound/magic/ethereal_exit.ogg', 50, TRUE, -1)
+	. = ..()
+	return SUCCESSFUL_SPAWN

code/modules/antagonists/swarmer/swarmer.dm

@@ -261,19 +261,26 @@
 	S.DisIntegrate(src)
 	return TRUE
 
-/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(get_area(src), /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/obj/machinery/door/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(get_area(src), /area/shuttle)
+	for(var/turf/turf_in_range in range(1, src))
+		var/area/turf_area = get_area(turf_in_range)
+		//Check for dangerous pressure differences
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		//Check if breaking this door will expose the station to space/planetary atmos
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return FALSE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		//Check if this door is important in supermatter containment
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return FALSE
-	S.DisIntegrate(src)
+	actor.DisIntegrate(src)
 	return TRUE
 
 /obj/machinery/camera/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
@@ -342,31 +349,40 @@
 	to_chat(S, "<span class='warning'>This bluespace source will be important to us later. Aborting.</span>")
 	return FALSE
 
-/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(loc, /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/turf/closed/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(loc, /area/shuttle)
+	for(var/turf/turf_in_range in range(1, src))
+		var/area/turf_area = get_area(turf_in_range)
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return TRUE
 	return ..()
 
-/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)
-	var/isonshuttle = istype(get_area(src), /area/shuttle)
-	for(var/turf/T in range(1, src))
-		var/area/A = get_area(T)
-		if(isspaceturf(T) || (!isonshuttle && (istype(A, /area/shuttle) || istype(A, /area/space))) || (isonshuttle && !istype(A, /area/shuttle)))
-			to_chat(S, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
-			S.target = null
+/obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/actor)
+	var/is_on_shuttle = istype(get_area(src), /area/shuttle)
+	for(var/t in RANGE_TURFS(1, src))
+		var/turf/turf_in_range = t
+		var/area/turf_area = get_area(turf_in_range)
+		// if (turf_in_range.return_turf_delta_p() > DANGEROUS_DELTA_P)
+		// 	to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause an explosive pressure release. Aborting.</span>")
+		// 	actor.target = null
+		// 	return TRUE
+		if(isspaceturf(turf_in_range) || (!is_on_shuttle && (istype(turf_area, /area/shuttle) || istype(turf_area, /area/space))) || (is_on_shuttle && !istype(turf_area, /area/shuttle)))
+			to_chat(actor, "<span class='warning'>Destroying this object has the potential to cause a hull breach. Aborting.</span>")
+			actor.target = null
 			return TRUE
-		else if(istype(A, /area/engine/supermatter))
-			to_chat(S, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
-			S.target = null
+		else if(istype(turf_area, /area/engineering/supermatter))
+			to_chat(actor, "<span class='warning'>Disrupting the containment of a supermatter crystal would not be to our benefit. Aborting.</span>")
+			actor.target = null
 			return TRUE
 	return ..()
 

code/modules/antagonists/traitor/classes/assassin.dm

@@ -1,30 +1,7 @@
-/datum/traitor_class/human/assassin
+/datum/traitor_class/human/subterfuge/assassin
 	name = "Donk Co Operative"
 	employer = "Donk Corporation"
-	weight = 0
+	weight = 6
 	chaos = 1
 	threat  = 2
-
-/datum/traitor_class/human/assassin/forge_single_objective(datum/antagonist/traitor/T)
-	.=1
-	var/permakill_prob = 20
-	var/datum/game_mode/dynamic/mode
-	if(istype(SSticker.mode,/datum/game_mode/dynamic))
-		mode = SSticker.mode
-		permakill_prob = max(0,mode.threat_level-50)
-	var/list/active_ais = active_ais()
-	if(active_ais.len && prob(100/GLOB.joined_player_list.len))
-		var/datum/objective/destroy/destroy_objective = new
-		destroy_objective.owner = T.owner
-		destroy_objective.find_target()
-		T.add_objective(destroy_objective)
-	else if(prob(permakill_prob))
-		var/datum/objective/assassinate/kill_objective = new
-		kill_objective.owner = T.owner
-		kill_objective.find_target()
-		T.add_objective(kill_objective)
-	else
-		var/datum/objective/assassinate/once/kill_objective = new
-		kill_objective.owner = T.owner
-		kill_objective.find_target()
-		T.add_objective(kill_objective)
+	assassin_prob = 70

code/modules/antagonists/traitor/classes/freeform.dm

@@ -1,12 +1,12 @@
 /datum/traitor_class/human/freeform
 	name = "Waffle Co Agent"
 	employer = "Waffle Company"
-	weight = 0 // should not spawn in unless admins bus something in the traitor panel with setting traitor classes
+	weight = 5
 	chaos = 0
 
 /datum/traitor_class/human/freeform/forge_objectives(datum/antagonist/traitor/T)
-	var/datum/objective/escape/O = new
-	O.explanation_text = "You have no explicit goals! While we don't approve of mindless slaughter, you may antagonize nanotrasen any way you wish! Make sure to escape alive and not in custody, though!"
+	var/datum/objective/freedom/O = new
+	O.explanation_text = "You have no explicit goals! While we don't approve of mindless slaughter, you may antagonize nanotrasen any way you wish! Don't get captured or killed, but if you've done nothing, you'll be in trouble!"
 	O.owner = T.owner
 	T.add_objective(O)
 	return

code/modules/antagonists/traitor/classes/human.dm

@@ -13,8 +13,12 @@
 			T.assign_exchange_role(SSticker.mode.exchange_blue)
 		objective_count += 1					//Exchange counts towards number of objectives
 	var/toa = CONFIG_GET(number/traitor_objectives_amount)
+	var/attempts = 0
 	for(var/i = objective_count, i < toa, i++)
-		forge_single_objective(T)
+		var/success = FALSE
+		while(!success && attempts < max(toa*10, 100))
+			success = forge_single_objective(T)
+			attempts += 1
 	if(!(locate(/datum/objective/escape) in T.objectives))
 		var/datum/objective/escape/escape_objective = new
 		escape_objective.owner = T.owner

code/modules/antagonists/traitor/classes/subterfuge.dm

@@ -1,12 +1,11 @@
 /datum/traitor_class/human/subterfuge
 	name = "MI13 Operative"
 	employer = "MI13"
-	weight = 36
+	weight = 25
 	chaos = -5
+	var/assassin_prob = 25
 
 /datum/traitor_class/human/subterfuge/forge_single_objective(datum/antagonist/traitor/T)
-	.=1
-	var/assassin_prob = 30
 	var/datum/game_mode/dynamic/mode
 	if(istype(SSticker.mode,/datum/game_mode/dynamic))
 		mode = SSticker.mode
@@ -16,24 +15,31 @@
 		kill_objective.owner = T.owner
 		kill_objective.find_target()
 		T.add_objective(kill_objective)
+		return TRUE
 	else
 		var/list/weights = list()
-		weights["sabo"] = length(subtypesof(/datum/sabotage_objective))
-		weights["steal"] = length(subtypesof(/datum/objective_item/steal))
+		var/datum/objective/sabotage/sabotage_objective = new
+		sabotage_objective.owner = T.owner
+		if(sabotage_objective.find_target())
+			weights["sabo"] = length(subtypesof(/datum/objective_item/steal))
+		var/datum/objective/steal/steal_objective = new
+		steal_objective.owner = T.owner
+		if(steal_objective.find_target())
+			weights["steal"] = length(subtypesof(/datum/objective_item/steal))
 		weights["download"] = !(locate(/datum/objective/download) in T.objectives || (T.owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
 		switch(pickweight(weights))
 			if("sabo")
-				var/datum/objective/sabotage/sabotage_objective = new
-				sabotage_objective.owner = T.owner
-				sabotage_objective.find_target()
 				T.add_objective(sabotage_objective)
+				qdel(steal_objective)
+				return TRUE
 			if("steal")
-				var/datum/objective/steal/steal_objective = new
-				steal_objective.owner = T.owner
-				steal_objective.find_target()
 				T.add_objective(steal_objective)
+				qdel(sabotage_objective)
+				return TRUE
 			if("download")
 				var/datum/objective/download/download_objective = new
 				download_objective.owner = T.owner
 				download_objective.gen_amount_goal()
 				T.add_objective(download_objective)
+				return TRUE
+		return FALSE

code/modules/antagonists/traitor/classes/traitor_class.dm

@@ -7,7 +7,8 @@ GLOBAL_LIST_EMPTY(traitor_classes)
 	var/chaos = 0
 	var/threat = 0
 	var/TC = 20
-	/// Minimum players for this to randomly roll via get_random_traitor_class().
+	var/processing = FALSE
+	/// Minimum players for this to randomly roll via get_random_traitor_kind().
 	var/min_players = 0
 	var/list/uplink_filters
 
@@ -43,4 +44,6 @@ GLOBAL_LIST_EMPTY(traitor_classes)
 
 /datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T)
 	// Any effects that need to be cleaned up if traitor class is being swapped.
-	
+
+/datum/traitor_class/proc/on_process(/datum/antagonist/traitor/T)
+	// only for processing traitor classes; runs once an SSprocessing tick

code/modules/antagonists/traitor/datum_traitor.dm

@@ -26,6 +26,8 @@
 	if(traitor_kind)
 		traitor_kind.remove_innate_effects(owner.current)
 		traitor_kind.clean_up_traitor(src)
+		if(traitor_kind.processing)
+			STOP_PROCESSING(SSprocessing, src)
 		swap_from_old = TRUE
 	traitor_kind = GLOB.traitor_classes[kind]
 	traitor_kind.apply_innate_effects(owner.current)
@@ -33,11 +35,16 @@
 		for(var/O in objectives)
 			qdel(O)
 		traitor_kind.forge_objectives(src)
+	if(traitor_kind.processing)
+		START_PROCESSING(SSprocessing, src)
 	if(swap_from_old)
 		traitor_kind.finalize_traitor(src)
 		traitor_kind.greet(src)
 		owner.announce_objectives()
 
+/datum/antagonist/traitor/process()
+	traitor_kind.on_process(src)
+
 /proc/get_random_traitor_kind(var/list/blacklist = list())
 	var/chaos_weight = 0
 	if(istype(SSticker.mode,/datum/game_mode/dynamic))

code/modules/antagonists/traitor/equipment/Malf_Modules.dm

@@ -401,6 +401,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		next_announce += DOOMSDAY_ANNOUNCE_INTERVAL
 
 /obj/machinery/doomsday_device/proc/detonate()
+	set waitfor = FALSE
 	sound_to_playing_players('sound/machines/alarm.ogg')
 	sleep(100)
 	for(var/i in GLOB.mob_living_list)

code/modules/antagonists/traitor/equipment/contractor.dm

@@ -244,6 +244,7 @@
 	name = "contractor pinpointer"
 	desc = "A handheld tracking device that locks onto certain signals. Ignores suit sensors, but is much less accurate."
 	icon_state = "pinpointer_syndicate"
+	item_state = "pinpointer_black"
 	minimum_range = 25
 	has_owner = TRUE
 	ignore_suit_sensor_level = TRUE

code/modules/antagonists/wizard/equipment/artefact.dm

@@ -385,14 +385,10 @@
 /obj/item/warpwhistle/attack_self(mob/living/carbon/user)
 	if(!istype(user) || on_cooldown)
 		return
-	var/turf/T = get_turf(user)
-	var/area/A = get_area(user)
-	if(!T || !A || A.noteleport)
-		to_chat(user, "<span class='warning'>You play \the [src], yet no sound comes out of it... Looks like it won't work here.</span>")
-		return
 	on_cooldown = TRUE
 	last_user = user
-	playsound(T,'sound/magic/warpwhistle.ogg', 200, 1)
+	var/turf/T = get_turf(user)
+	playsound(T,'sound/magic/warpwhistle.ogg', 200, TRUE)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOMOVE, src)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOUSE, src)
 	ADD_TRAIT(user, TRAIT_MOBILITY_NOPICKUP, src)
@@ -400,6 +396,10 @@
 	new /obj/effect/temp_visual/tornado(T)
 	sleep(20)
 	if(interrupted(user))
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOMOVE, src)
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOUSE, src)
+		REMOVE_TRAIT(user, TRAIT_MOBILITY_NOPICKUP, src)
+		user.update_mobility()
 		return
 	user.invisibility = INVISIBILITY_MAXIMUM
 	user.status_flags |= GODMODE
@@ -427,8 +427,7 @@
 	if(interrupted(user))
 		return
 	on_cooldown = 2
-	sleep(40)
-	on_cooldown = 0
+	addtimer(VARSET_CALLBACK(src, on_cooldown, 0), 4 SECONDS)
 
 /obj/item/warpwhistle/Destroy()
 	if(on_cooldown == 1 && last_user) //Flute got dunked somewhere in the teleport

code/modules/antagonists/wizard/equipment/soulstone.dm

@@ -145,7 +145,7 @@
 		if("VICTIM")
 			var/mob/living/carbon/human/T = target
 			var/datum/antagonist/cult/C = user.mind.has_antag_datum(/datum/antagonist/cult,TRUE)
-			if(C?.cult_team.is_sacrifice_target(T.mind))
+			if(C && C.cult_team.is_sacrifice_target(T.mind))
 				if(iscultist(user))
 					to_chat(user, "<span class='cult'><b>\"This soul is mine.</b></span> <span class='cultlarge'>SACRIFICE THEM!\"</span>")
 				else

code/modules/antagonists/wizard/equipment/spellbook.dm

@@ -252,6 +252,10 @@
 	name = "Barnyard Curse"
 	spell_type = /obj/effect/proc_holder/spell/pointed/barnyardcurse
 
+/datum/spellbook_entry/cluwne
+	name = "Cluwne Curse"
+	spell_type = /obj/effect/proc_holder/spell/targeted/cluwnecurse
+
 /datum/spellbook_entry/charge
 	name = "Charge"
 	spell_type = /obj/effect/proc_holder/spell/targeted/charge