Merge branch 'master' into clockcultrework_v2

2021-01-14 19:51:15 -05:00
parent 6a7ec73889 93507cfb0a
commit 04d5721c4d
1152 changed files with 31093 additions and 24256 deletions
@@ -679,8 +679,8 @@
 	set category = "Server"
 	set desc="Respawn basically"
 	set name="Toggle Respawn"
-	var/new_nores = !CONFIG_GET(flag/norespawn)
-	CONFIG_SET(flag/norespawn, new_nores)
+	var/new_nores = CONFIG_GET(flag/respawns_enabled)
+	CONFIG_SET(flag/respawns_enabled, !new_nores)
 	if (!new_nores)
 		to_chat(world, "<B>You may now respawn.</B>", confidential = TRUE)
 	else
@@ -783,7 +783,8 @@
 	if(ispath(chosen, /turf))
 		T.ChangeTurf(chosen)
 	else
-		var/obj/structure/closet/supplypod/centcompod/pod = new()
+		var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+		var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets just have it in the pod bay for a moment instead of runtiming
 		var/atom/A = new chosen(pod)
 		A.flags_1 |= ADMIN_SPAWNED_1
 		new /obj/effect/pod_landingzone(T, pod)
@@ -44,6 +44,11 @@ GLOBAL_PROTECT(protected_ranks)
 /datum/admin_rank/vv_edit_var(var_name, var_value)
 	return FALSE

+/datum/admin_rank/CanProcCall(procname)
+	. = ..()
+	if(!check_rights(R_SENSITIVE))
+		return FALSE
+
 /proc/admin_keyword_to_flag(word, previous_rights=0)
 	var/flag = 0
 	switch(ckey(word))
@@ -79,6 +84,8 @@ GLOBAL_PROTECT(protected_ranks)
 			flag = R_AUTOLOGIN
 		if("dbranks")
 			flag = R_DBRANKS
+		if("sensitive")
+			flag = R_SENSITIVE
 		if("@","prev")
 			flag = previous_rights
 	return flag
@@ -78,8 +78,11 @@ GLOBAL_PROTECT(admin_verbs_admin)
 	/client/proc/mark_datum_mapview,
 	/client/proc/hide_verbs,			/*hides all our adminverbs*/
 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
-	/datum/admins/proc/open_borgopanel
+	/datum/admins/proc/open_borgopanel,
+	/client/proc/admin_cmd_respawn_return_to_lobby,
+	/client/proc/admin_cmd_remove_ghost_respawn_timer
 	)
+
 GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/DB_ban_panel, /client/proc/stickybanpanel))
 GLOBAL_PROTECT(admin_verbs_ban)
 GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound, /client/proc/play_sound, /client/proc/manual_play_web_sound, /client/proc/set_round_end_sound))
@@ -212,4 +212,4 @@
 	dat += build_antag_listing()

 	dat += "</body></html>"
-	usr << browse(dat.Join(), "window=roundstatus;size=500x500")
+	usr << browse(dat.Join(), "window=roundstatus;size=500x500")
@@ -28,6 +28,11 @@ GLOBAL_PROTECT(href_token)

 	var/deadmined

+/datum/admins/CanProcCall(procname)
+	. = ..()
+	if(!check_rights(R_SENSITIVE))
+		return FALSE
+
 /datum/admins/New(datum/admin_rank/R, ckey, force_active = FALSE, protected)
 	if(IsAdminAdvancedProcCall())
 		var/msg = " has tried to elevate permissions!"
@@ -147,6 +152,8 @@ GLOBAL_PROTECT(href_token)
 	return 0

 /datum/admins/vv_edit_var(var_name, var_value)
+	if(var_name == NAMEOF(src, fakekey))
+		return ..()
 	return FALSE //nice try trialmin

 /*
@@ -287,7 +287,7 @@
 	R = rank_names[new_rank]
 	if(!R) //rank with that name doesn't exist yet - make it
 		if(D)
-			R = new(new_rank, D.rank.rights) //duplicate our previous admin_rank but with a new name
+			R = new(new_rank, D.rank.rights, D.rank.exclude_rights, D.rank.can_edit_rights) //duplicate our previous admin_rank but with a new name
 		else
 			R = new(new_rank) //blank new admin_rank
 		GLOB.admin_ranks += R
@@ -131,7 +131,7 @@
 				for(var/mob/living/mob in thunderdome)
 					qdel(mob) //Clear mobs
 			for(var/obj/obj in thunderdome)
-				if(!istype(obj, /obj/machinery/camera))
+				if(!istype(obj, /obj/machinery/camera) && !istype(obj, /obj/effect/abstract/proximity_checker))
 					qdel(obj) //Clear objects

 			var/area/template = locate(/area/tdome/arena_source)
@@ -298,7 +298,9 @@
 		browse_messages(target_ckey = ckey(target_key), agegate = TRUE)
 	qdel(query_find_message_secret)

-/proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE)
+/proc/browse_messages(type, target_ckey, index, linkless = FALSE, filter, agegate = FALSE, override = FALSE)
+	if((!override || IsAdminAdvancedProcCall()) && !check_rights(R_SENSITIVE))
+		return
 	if(!SSdbcore.Connect())
 		to_chat(usr, "<span class='danger'>Failed to establish database connection.</span>")
 		return
@@ -936,6 +936,12 @@
 		else
 			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=[ROLE_MIND_TRANSFER];jobban4=[REF(M)]'>Mind Transfer Potion</a></td>"

+		//Respawns
+		if(jobban_isbanned(M, ROLE_RESPAWN))
+			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=[ROLE_RESPAWN];jobban4=[REF(M)]'><font color=red>Respawns</font></a></td>"
+		else
+			dat += "<td width='20%'><a href='?src=[REF(src)];[HrefToken()];jobban3=[ROLE_RESPAWN];jobban4=[REF(M)]'>Respawns</a></td>"
+
 		dat += "</tr></table>"
 		usr << browse(dat, "window=jobban2;size=800x450")
 		return
@@ -1799,12 +1805,15 @@
 		if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes")
 			return

-		log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby.")
-		message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby.")
+		log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby, removing their respawn restrictions if they existed.")
+		message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby, removing their respawn restrictions if they existed.")

 		var/mob/dead/new_player/NP = new()
 		NP.ckey = M.ckey
 		qdel(M)
+		if(GLOB.preferences_datums[NP.ckey])
+			var/datum/preferences/P = GLOB.preferences_datums[NP.ckey]
+			P.respawn_restrictions_active = FALSE

 	else if(href_list["tdome1"])
 		if(!check_rights(R_FUN))
@@ -8,4 +8,4 @@

 	var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic)
 	if(choice)
-		Cinematic(initial(choice.id),world,null)
+		Cinematic(initial(choice.id),world,null)
@@ -23,13 +23,6 @@

 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[uppertext(holder.rank)]([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[emoji_parse(msg)]\"</span></span>"

-	// var/rank_name = holder.rank
-	// var/admin_name = key
-	// if(holder.fakekey)
-	// 	rank_name = pick(strings("admin_nicknames.json", "ranks", "config")) please use this soon.
-	// 	admin_name = pick(strings("admin_nicknames.json", "names", "config"))
-	// var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[rank_name]([admin_name])</span> says, <span class='message'>\"[emoji_parse(msg)]\"</span></span>"
-
 	for (var/mob/M in GLOB.player_list)
 		if(isnewplayer(M))
 			continue
@@ -14,6 +14,8 @@
 	browseserverlogs("[GLOB.log_directory]/")

 /client/proc/browseserverlogs(path = "data/logs/")
+	if(!check_rights(R_SENSITIVE))
+		return
 	path = browse_files(path)
 	if(!path)
 		return
@@ -5,7 +5,7 @@
 	var/ntype = text2num(type)

 	//Add client links
-	var/dat = ""
+	var/list/dat = list()
 	if(M.client)
 		dat += "<center><p>Client</p></center>"
 		dat += "<center>"
@@ -46,22 +46,27 @@
 	var/log_source = M.logging;
 	if(source == LOGSRC_CLIENT && M.client) //if client doesn't exist just fall back to the mob log
 		log_source = M.client.player_details.logging //should exist, if it doesn't that's a bug, don't check for it not existing
-
+	var/list/concatenated_logs = list()
 	for(var/log_type in log_source)
 		var/nlog_type = text2num(log_type)
 		if(nlog_type & ntype)
-			var/list/reversed = log_source[log_type]
-			if(islist(reversed))
-				reversed = reverseRange(reversed.Copy())
-				for(var/entry in reversed)
-					dat += "<font size=2px><b>[entry]</b><br>[reversed[entry]]</font><br>"
-			dat += "<hr>"
+			var/list/all_the_entrys = log_source[log_type]
+			for(var/entry in all_the_entrys)
+				concatenated_logs += "<b>[entry]</b><br>[all_the_entrys[entry]]"
+	if(length(concatenated_logs))
+		sortTim(concatenated_logs, cmp = /proc/cmp_text_dsc) //Sort by timestamp.
+		dat += "<font size=2px>"
+		dat += concatenated_logs.Join("<br>")
+		dat += "</font>"

-	usr << browse(dat, "window=invidual_logging_[key_name(M)];size=600x480")
+	var/datum/browser/popup = new(usr, "invidual_logging_[key_name(M)]", "Individual Logs", 600, 600)
+	popup.set_content(dat.Join())
+	popup.open()

 /proc/individual_logging_panel_link(mob/M, log_type, log_src, label, selected_src, selected_type)
 	var/slabel = label
 	if(selected_type == log_type && selected_src == log_src)
 		slabel = "<b>\[[label]\]</b>"
-
-	return "<a href='?_src_=holder;[HrefToken()];individuallog=[REF(M)];log_type=[log_type];log_src=[log_src]'>[slabel]</a>"
+	//This is necessary because num2text drops digits and rounds on big numbers. If more defines get added in the future it could break again.
+	log_type = num2text(log_type, MAX_BITFLAG_DIGITS)
+	return "<a href='?_src_=holder;[HrefToken()];individuallog=[REF(M)];log_type=[log_type];log_src=[log_src]'>[slabel]</a>"
@@ -41,4 +41,4 @@
 	message_admins("[key_name_admin(usr)] is changing the map to [VM.map_name]")
 	log_admin("[key_name(usr)] is changing the map to [VM.map_name]")
 	if (SSmapping.changemap(VM) == 0)
-		message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]")
+		message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]")
@@ -28,4 +28,4 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	addtimer(CALLBACK(src, .proc/only_one), 420)

 /mob/living/carbon/human/proc/make_scottish()
-	mind.add_antag_datum(/datum/antagonist/highlander)
+	mind.add_antag_datum(/datum/antagonist/highlander)
@@ -48,6 +48,8 @@
 			if(C.prefs.toggles & SOUND_PRAYERS)
 				if(usr.job == "Chaplain")
 					SEND_SOUND(C, sound('sound/effects/pray.ogg'))
+				else
+					SEND_SOUND(C, sound('sound/effects/ding.ogg'))
 	to_chat(usr, "<span class='info'>You pray to the gods: \"[msg_tmp]\"</span>")

 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -1347,7 +1347,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			new /obj/effect/immovablerod(startT, endT,target)
 		if(ADMIN_PUNISHMENT_SUPPLYPOD_QUICK)
 			var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text
-			var/obj/structure/closet/supplypod/centcompod/pod = new()
+			var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+			var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime
 			pod.damage = 40
 			pod.explosionSize = list(0,0,0,2)
 			pod.effectStun = TRUE
@@ -27,4 +27,4 @@
 	if(!SSdbcore.Connect())
 		message_admins("Database connection failed: " + SSdbcore.ErrorMsg())
 	else
-		message_admins("Database connection re-established")
+		message_admins("Database connection re-established")
@@ -93,4 +93,4 @@

 	return "[header][item]</li>"

-#undef VV_HTML_ENCODE
+#undef VV_HTML_ENCODE
@@ -98,7 +98,7 @@
 					L.adjustFireLoss(amount)
 					newamt = L.getFireLoss()
 				if("toxin")
-					L.adjustToxLoss(amount)
+					L.adjustToxLoss(amount, toxins_type = TOX_OMNI, forced = TRUE)
 					newamt = L.getToxLoss()
 				if("oxygen")
 					L.adjustOxyLoss(amount)
@@ -16,4 +16,4 @@
 			continue
 		var/datum/team/T = A.get_team()
 		if(!team_type || istype(T,team_type))
-			. |= T
+			. |= T
@@ -50,4 +50,4 @@
 /datum/mind/proc/leave_all_antag_huds()
 	for(var/datum/atom_hud/antag/hud in GLOB.huds)
 		if(hud.hudusers[current])
-			hud.leave_hud(current)
+			hud.leave_hud(current)
@@ -38,7 +38,7 @@
 		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_ROBELESS]'>Robeless</A><BR>"
 		dat += "<I>Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.</I><BR>"
 		dat += "<A href='byond://?src=[REF(src)];school=[APPRENTICE_MARTIAL]'>Martial Artist</a><BR>"
-		dat += "<I>Your apprentice is training in ancient martial arts. They know the Plasmafist and Nuclear Fist.</I><BR>"
+		dat += "<I>Your apprentice is training in ancient martial arts. They know an Inner Mantra and the Nuclear Fist technique.</I><BR>"
 	user << browse(dat, "window=radio")
 	onclose(user, "radio")
 	return
@@ -2,22 +2,27 @@
 	name = "experimental organ replacement"
 	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/extract_organ, /datum/surgery_step/gland_insert)
 	possible_locs = list(BODY_ZONE_CHEST)
-	ignore_clothes = 1
+	ignore_clothes = TRUE

 /datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target)
 	if(!ishuman(user))
-		return 0
+		return FALSE
 	var/mob/living/carbon/human/H = user
 	if(H.dna.species.id == "abductor")
-		return 1
+		return TRUE
 	for(var/obj/item/implant/abductor/A in H.implants)
-		return 1
-	return 0
+		return TRUE
+	return FALSE
+
+/datum/surgery/organ_extraction/mechanic
+	name = "Prosthesis experimental organ replacement"
+	requires_bodypart_type = BODYPART_ROBOTIC
+	steps = list(/datum/surgery_step/mechanic_open, /datum/surgery_step/open_hatch, /datum/surgery_step/mechanic_unwrench, /datum/surgery_step/prepare_electronics, /datum/surgery_step/extract_organ, /datum/surgery_step/gland_insert)


 /datum/surgery_step/extract_organ
 	name = "remove heart"
-	accept_hand = 1
+	accept_hand = TRUE
 	time = 32
 	var/obj/item/organ/IC = null
 	var/list/organ_types = list(/obj/item/organ/heart)
@@ -34,10 +39,10 @@
 		user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "<span class='notice'>You pull [IC] out of [target]'s [target_zone].</span>")
 		user.put_in_hands(IC)
 		IC.Remove()
-		return 1
+		return TRUE
 	else
 		to_chat(user, "<span class='warning'>You don't find anything in [target]'s [target_zone]!</span>")
-		return 1
+		return TRUE

 /datum/surgery_step/gland_insert
 	name = "insert gland"
@@ -52,4 +57,4 @@
 	user.temporarilyRemoveItemFromInventory(tool, TRUE)
 	var/obj/item/organ/heart/gland/gland = tool
 	gland.Insert(target, 2)
-	return 1
+	return TRUE
@@ -110,4 +110,4 @@
 		active = 0

 /obj/item/organ/heart/gland/proc/activate()
-	return
+	return
@@ -17,4 +17,4 @@
 /obj/item/organ/heart/gland/access/Remove(special = FALSE)
 	if(!QDELETED(owner))
 		UnregisterSignal(owner, COMSIG_MOB_ALLOWED)
-	return ..()
+	return ..()
@@ -15,4 +15,4 @@
 	var/mob/living/carbon/human/H = owner
 	var/datum/species/species = H.dna.species
 	to_chat(H, "<span class='warning'>You feel your blood heat up for a moment.</span>")
-	species.exotic_blood = get_random_reagent_id()
+	species.exotic_blood = get_random_reagent_id()
@@ -17,4 +17,4 @@
 	var/chem_to_add = pick(possible_reagents)
 	owner.reagents.add_reagent(chem_to_add, 2)
 	owner.adjustToxLoss(-5, TRUE, TRUE)
-	..()
+	..()
@@ -12,4 +12,4 @@
 /obj/item/organ/heart/gland/egg/activate()
 	owner.visible_message("<span class='alertalien'>[owner] [pick(EGG_LAYING_MESSAGES)]</span>")
 	var/turf/T = owner.drop_location()
-	new /obj/item/reagent_containers/food/snacks/egg/gland(T)
+	new /obj/item/reagent_containers/food/snacks/egg/gland(T)
@@ -24,4 +24,4 @@

 /obj/item/organ/heart/gland/electric/proc/zap()
 	tesla_zap(owner, 4, 8000, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN)
-	playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE)
+	playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE)
@@ -175,4 +175,4 @@

 	var/obj/item/bodypart/chest/new_chest = new(null)
 	new_chest.replace_limb(owner, TRUE)
-	qdel(chest)
+	qdel(chest)
@@ -61,4 +61,4 @@
 		to_chat(H, "<span class='userdanger'>You feel the compulsion fade, and you <i>completely forget</i> about your previous orders.</span>")
 		H.clear_alert("mind_control")
 	active_mind_control = FALSE
-	return TRUE
+	return TRUE
@@ -19,4 +19,4 @@
 	var/turf/open/T = get_turf(owner)
 	if(istype(T))
 		T.atmos_spawn_air("plasma=50;TEMP=[T20C]")
-	owner.vomit()
+	owner.vomit()
@@ -44,4 +44,4 @@
 	if(active_mind_control)
 		to_chat(entangled_mob, "<span class='userdanger'>You feel the compulsion fade, and you completely forget about your previous orders.</span>")
 		entangled_mob.clear_alert("mind_control")
-	..()
+	..()
@@ -23,4 +23,4 @@

 	var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey")
 	Slime.Friends = list(owner)
-	Slime.Leader = owner
+	Slime.Leader = owner
@@ -11,4 +11,4 @@
 	to_chat(owner, "<span class='warning'>You feel something crawling in your skin.</span>")
 	owner.faction |= "spiders"
 	var/obj/structure/spider/spiderling/S = new(owner.drop_location())
-	S.directive = "Protect your nest inside [owner.real_name]."
+	S.directive = "Protect your nest inside [owner.real_name]."
@@ -12,4 +12,4 @@
 	to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
 	randomize_human(owner)
 	var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly))
-	owner.set_species(species)
+	owner.set_species(species)
@@ -9,4 +9,4 @@

 /obj/item/organ/heart/gland/ventcrawling/activate()
 	to_chat(owner, "<span class='notice'>You feel very stretchy.</span>")
-	owner.ventcrawler = VENTCRAWLER_ALWAYS
+	owner.ventcrawler = VENTCRAWLER_ALWAYS
@@ -31,4 +31,4 @@
 			var/datum/symptom/S = new chosen_symptom
 			A.symptoms += S
 	A.Refresh() //just in case someone already made and named the same disease
-	return A
+	return A
@@ -9,4 +9,4 @@
 /obj/structure/fluff/iced_abductor/Destroy()
 	var/turf/T = get_turf(src)
 	new /obj/effect/mob_spawn/human/abductor(T)
-	. = ..() 
+	. = ..() 
@@ -26,7 +26,7 @@
 		return
 	flick("blob_resource_glow", src)
 	if(overmind)
-		overmind.add_points(1)
+		overmind.add_points(2)
 		resource_delay = world.time + 40 + overmind.resource_blobs.len * 2.5 //4 seconds plus a quarter second for each resource blob the overmind has
 	else
 		resource_delay = world.time + 40
@@ -45,8 +45,12 @@
 	desc = "A solid wall of slightly twitching tendrils with a reflective glow."
 	damaged_desc = "A wall of twitching tendrils with a reflective glow."
 	icon_state = "blob_glow"
+	flags_1 = DEFAULT_RICOCHET_1
 	flags_ricochet = RICOCHET_SHINY
 	point_return = 8
 	max_integrity = 100
 	brute_resist = 1
 	explosion_block = 2
+
+/obj/structure/blob/shield/reflective/check_projectile_ricochet(obj/item/projectile/P)
+	return PROJECTILE_RICOCHET_FORCE
@@ -147,7 +147,7 @@
 	set category = "Blob"
 	set name = "Create Factory Blob (60)"
 	set desc = "Create a spore tower that will spawn spores to harass your enemies."
-	createSpecial(60, /obj/structure/blob/factory, 7, 1)
+	createSpecial(60, /obj/structure/blob/factory, 5, 1)

 /mob/camera/blob/verb/create_blobbernaut()
 	set category = "Blob"
@@ -195,6 +195,7 @@
 		to_chat(blobber, "The <b><font color=\"[blobstrain.color]\">[blobstrain.name]</b></font> reagent [blobstrain.shortdesc ? "[blobstrain.shortdesc]" : "[blobstrain.description]"]")
 	else
 		to_chat(src, "<span class='warning'>You could not conjure a sentience for your blobbernaut. Your points have been refunded. Try again later.</span>")
+		B.naut = FALSE
 		add_points(40)

 /mob/camera/blob/verb/relocate_core()
@@ -81,4 +81,4 @@


 /datum/antagonist/bloodsucker/proc/AssignRandomBane()
-	return
+	return
@@ -120,9 +120,14 @@
 		if(bruteheal + fireheal + toxinheal > 0) 	// Just a check? Don't heal/spend, and return.
 			if(mult == 0)
 				return TRUE
+
 			// We have damage. Let's heal (one time)
-			C.adjustBruteLoss(-bruteheal * mult, forced = TRUE)// Heal BRUTE / BURN in random portions throughout the body.
-			C.adjustFireLoss(-fireheal * mult, forced = TRUE)
+			var/list/damaged_parts = C.get_damaged_bodyparts(TRUE,TRUE, status = list(BODYPART_ORGANIC, BODYPART_HYBRID, BODYPART_NANITES))
+			if(damaged_parts.len)
+				for(var/obj/item/bodypart/part in damaged_parts)	// Heal BRUTE / BURN equally distibuted over all damaged bodyparts.
+					part.heal_damage((bruteheal * mult)/damaged_parts.len, (fireheal * mult)/damaged_parts.len, only_organic = FALSE, updating_health = FALSE)
+				C.updatehealth()
+				C.update_damage_overlays()
 			C.adjustToxLoss(-toxinheal * mult * 2, forced = TRUE) //Toxin healing because vamps arent immune
 			//C.heal_overall_damage(bruteheal * mult, fireheal * mult)				 // REMOVED: We need to FORCE this, because otherwise, vamps won't heal EVER. Swapped to above.
 			AddBloodVolume((bruteheal * -0.5 + fireheal * -1 + toxinheal * -0.2) / mult * costMult)	// Costs blood to heal
@@ -276,7 +281,7 @@
 /datum/antagonist/bloodsucker/proc/FinalDeath()
 		//Dont bother if we are already supposed to be dead
 	if(FinalDeath)
-		return 
+		return
 	FinalDeath = TRUE //We are now supposed to die. Lets not spam it.
 	if(!iscarbon(owner.current)) //Check for non carbons.
 		owner.current.gib()
@@ -30,6 +30,7 @@
 	var/can_be_staked = FALSE			// Only Feed can happen with a stake in you.
 	var/cooldown_static = FALSE			// Feed, Masquerade, and One-Shot powers don't improve their cooldown.
 	//var/not_bloodsucker = FALSE		// This goes to Vassals or Hunters, but NOT bloodsuckers.
+	var/must_be_concious = TRUE			//Can't use this ability while unconcious.

 /datum/action/bloodsucker/New()
 	if(bloodcost > 0)
@@ -101,6 +102,11 @@
 		if(display_error)
 			to_chat(owner, "<span class='warning'>Garlic in your blood is interfering with your powers!</span>")
 		return FALSE
+	if(must_be_concious)
+		if(owner.stat != CONSCIOUS)
+			if(display_error)
+				to_chat(owner, "<span class='warning'>You can't do this while you are unconcious!</span>")
+			return FALSE
 	// Incap?
 	if(must_be_capacitated)
 		var/mob/living/L = owner
@@ -113,4 +113,4 @@
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
 	popup.open()
-*/
+*/
@@ -16,6 +16,7 @@
 	can_use_in_torpor = TRUE
 	must_be_capacitated = TRUE
 	can_be_immobilized = TRUE
+	must_be_concious = FALSE

 /datum/action/bloodsucker/gohome/CheckCanUse(display_error)
 	. = ..()
@@ -27,6 +27,7 @@
 	warn_constant_cost = TRUE
 	can_use_in_torpor = TRUE // Masquerade is maybe the only one that can do this. It stops your healing.
 	cooldown_static = TRUE
+	must_be_concious = FALSE

 // NOTE: Firing off vulgar powers disables your Masquerade!

@@ -18,7 +18,6 @@

 	var/list/stored_profiles = list() //list of datum/changelingprofile
 	var/datum/changelingprofile/first_prof = null
-	var/dna_max = 6 //How many extra DNA strands the changeling can store for transformation.
 	var/absorbedcount = 0
 	/// did we get succed by another changeling
 	var/hostile_absorbed = FALSE
@@ -252,12 +251,6 @@
 	var/mob/living/carbon/user = owner.current
 	if(!istype(user))
 		return
-	if(stored_profiles.len)
-		var/datum/changelingprofile/prof = stored_profiles[1]
-		if(prof.dna == user.dna && stored_profiles.len >= dna_max)//If our current DNA is the stalest, we gotta ditch it.
-			if(verbose)
-				to_chat(user, "<span class='warning'>We have reached our capacity to store genetic information! We must transform before absorbing more.</span>")
-			return
 	if(!target)
 		return
 	if(NO_DNA_COPY in target.dna.species.species_traits)
@@ -317,9 +310,6 @@
 	return prof

 /datum/antagonist/changeling/proc/add_profile(datum/changelingprofile/prof)
-	if(stored_profiles.len > dna_max)
-		if(!push_out_profile())
-			return

 	if(!first_prof)
 		first_prof = prof
@@ -340,19 +330,6 @@
 			stored_profiles -= prof
 			qdel(prof)

-/datum/antagonist/changeling/proc/get_profile_to_remove()
-	for(var/datum/changelingprofile/prof in stored_profiles)
-		if(!prof.protected)
-			return prof
-
-/datum/antagonist/changeling/proc/push_out_profile()
-	var/datum/changelingprofile/removeprofile = get_profile_to_remove()
-	if(removeprofile)
-		stored_profiles -= removeprofile
-		return 1
-	return 0
-
-
 /datum/antagonist/changeling/proc/create_initial_profile()
 	var/mob/living/carbon/C = owner.current	//only carbons have dna now, so we have to typecaste
 	if(ishuman(C))
@@ -24,4 +24,4 @@
 /obj/effect/proc_holder/changeling/digitalcamo/on_refund(mob/user)
 	action.Remove(user)
 	user.digitalcamo = 0
-	user.digitalinvis = 0
+	user.digitalinvis = 0
@@ -16,7 +16,7 @@
 	if(user.stat != DEAD)
 		user.emote("deathgasp")
 		user.tod = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
-	user.fakedeath("changeling") //play dead
+	user.fakedeath("changeling", TRUE) //play dead
 	user.update_stat()

 	addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE)
@@ -21,6 +21,7 @@
 	chemical_cost = 1000
 	dna_cost = -1

+	var/recharge_slowdown = 0
 	var/silent = FALSE
 	var/weapon_type
 	var/weapon_name_simple
@@ -37,6 +38,8 @@
 		if(!silent)
 			playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
 			user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms [user.p_their()] [weapon_name_simple] into an arm!</span>", "<span class='notice'>We assimilate the [weapon_name_simple] back into our body.</span>", "<span class='italics>You hear organic matter ripping and tearing!</span>")
+		var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+		changeling.chem_recharge_slowdown -= recharge_slowdown
 		user.update_inv_hands()
 		return 1

@@ -57,6 +60,8 @@
 	user.put_in_hands(W)
 	if(!silent)
 		playsound(user, 'sound/effects/blobattack.ogg', 30, 1)
+	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
+	changeling.chem_recharge_slowdown += recharge_slowdown
 	return W

 /obj/effect/proc_holder/changeling/weapon/on_refund(mob/user)
@@ -141,10 +146,11 @@
 	name = "Arm Blade"
 	desc = "We reform one of our arms into a deadly blade."
 	helptext = "We may retract our armblade in the same manner as we form it. Cannot be used while in lesser form. This ability is loud, and might cause our blood to react violently to heat."
-	chemical_cost = 10
+	chemical_cost = 5
 	dna_cost = 2
 	loudness = 2
 	req_human = 1
+	recharge_slowdown = 0.6
 	weapon_type = /obj/item/melee/arm_blade
 	weapon_name_simple = "blade"
 	action_icon = 'icons/mob/actions/actions_changeling.dmi'
@@ -487,7 +493,7 @@
 	helmet_type = /obj/item/clothing/head/helmet/space/changeling
 	suit_name_simple = "flesh shell"
 	helmet_name_simple = "space helmet"
-	recharge_slowdown = 0.5
+	recharge_slowdown = 0.6
 	blood_on_castoff = 1

 /obj/item/clothing/suit/space/changeling
@@ -532,11 +538,11 @@
 	name = "Chitinous Armor"
 	desc = "We turn our skin into tough chitin to protect us from damage."
 	helptext = "Upkeep of the armor requires a constant expenditure of chemicals, resulting in a reduced chemical generation. The armor is strong against brute force, but does not provide much protection from lasers. Cannot be used in lesser form. This ability is loud, and might cause our blood to react violently to heat."
-	chemical_cost = 20
+	chemical_cost = 10
 	dna_cost = 1
 	loudness = 2
 	req_human = 1
-	recharge_slowdown = 0.5
+	recharge_slowdown = 0.6
 	action_icon = 'icons/mob/actions/actions_changeling.dmi'
 	action_icon_state = "ling_armor"
 	action_background_icon_state = "bg_ling"
@@ -662,10 +668,11 @@
 	name = "Bone Gauntlets"
 	desc = "We turn our hands into solid bone and chitin, sacrificing dexterity for raw strength."
 	helptext = "These grotesque, bone-and-chitin gauntlets are remarkably good at beating victims senseless, and cannot be used in lesser form. This ability is loud, and might cause our blood to react violently to heat."
-	chemical_cost = 10 // same cost as armblade because its a sidegrade (sacrifice utility for punching people violently)
+	chemical_cost = 5 // same cost as armblade because its a sidegrade (sacrifice utility for punching people violently)
 	dna_cost = 2
 	loudness = 2
 	req_human = 1
+	recharge_slowdown = 0.6
 	action_icon = 'icons/mob/actions/actions_changeling.dmi'
 	action_icon_state = "ling_gauntlets"
 	action_background_icon_state = "bg_ling"
@@ -679,6 +686,7 @@
 	item_state = "ling_gauntlets"
 	desc = "Rough bone and chitin, pulsing with an abomination barely called \"life\". Good for punching people, not so much for firearms."
 	transfer_prints = TRUE
+	item_flags = DROPDEL // whoops
 	body_parts_covered = ARMS|HANDS
 	cold_protection = ARMS|HANDS
 	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
@@ -688,16 +696,16 @@
 	wound_enhancement = 6
 	var/fast_enhancement = 6
 	var/fast_wound_enhancement = 6
-	var/slow_enhancement = 20
-	var/slow_wound_enhancement = 20
+	var/slow_enhancement = 12
+	var/slow_wound_enhancement = 15
 	silent = TRUE
-	inherited_trait = TRAIT_CHUNKYFINGERS // dummy thicc bone hands
-	secondary_trait = TRAIT_MAULER // its only violence from here, bucko
+	inherited_trait = TRAIT_CHUNKYFINGERS // how do you expect to shoot anyone with bone covered hands
+	secondary_trait = TRAIT_MAULER // just punch them idiot
 	var/fasthands = TRUE

 /obj/item/clothing/gloves/fingerless/pugilist/cling/examine(mob/user)
 	. = ..()
-	. += "[src] are formed to allow for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"]."
+	. += "[src] are shaped for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"]."
 	. += "Alt-click them to change between rapid strikes and strong blows."

 /obj/item/clothing/gloves/fingerless/pugilist/cling/AltClick(mob/user)
@@ -57,4 +57,4 @@

 /obj/screen/alert/status_effect/agent_pinpointer/changeling
 	name = "Pheromone Scent"
-	desc = "The nose always knows."
+	desc = "The nose always knows."
@@ -22,4 +22,4 @@
 	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
 	. = ..()
-	desc = initial(desc)
+	desc = initial(desc)
@@ -48,4 +48,4 @@
 	plane = FLOOR_PLANE

 /obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path...
-	icon_state = "cult"
+	icon_state = "cult"
@@ -348,9 +348,9 @@
 				L.dust()
 			else if(L.health > min_drain_health)
 				if(!GLOB.ratvar_awakens && L.stat == CONSCIOUS)
-					vitality_drained = L.adjustToxLoss(1, forced = TRUE)
+					vitality_drained = L.adjustToxLoss(1, forced = TRUE, toxins_type = TOX_OMNI)
 				else
-					vitality_drained = L.adjustToxLoss(1.5, forced = TRUE)
+					vitality_drained = L.adjustToxLoss(1.5, forced = TRUE, toxins_type = TOX_OMNI)
 			if(vitality_drained)
 				GLOB.clockwork_vitality += vitality_drained
 			else
@@ -416,7 +416,7 @@

 /obj/effect/clockwork/sigil/rite
 	name = "radiant sigil"
-	desc = "A glowing sigil glowing with barely-contained power."
+	desc = "A sigil glowing with barely-contained power."
 	clockwork_desc = "A sigil that will allow you to perform certain rites on it, provided you have access to sufficient power and materials."
 	icon_state = "sigiltransmission" //am big lazy - recolored transmission sigil
 	sigil_name = "Sigil of Rites"
@@ -440,7 +440,8 @@
 		return
 	var/list/possible_rites = list()
 	for(var/datum/clockwork_rite/R in GLOB.all_clockwork_rites)
-		possible_rites[R] = R
+		if(is_servant_of_ratvar(user, require_full_power = TRUE) || !R.requires_full_power)
+			possible_rites[R] = R
 	var/input_key = input(user, "Choose a rite", "Choosing a rite") as null|anything in possible_rites
 	if(!input_key)
 		return
@@ -287,4 +287,4 @@
 		linked_gateway.visible_message("<span class='warning'>[linked_gateway] begins to destabilise!</span>")

 /obj/effect/clockwork/spatial_gateway/stable/pass_through_gateway(atom/movable/A, no_cost = TRUE)
-	return ..()
+	return ..()
@@ -6,12 +6,13 @@
 //The base clockwork rite. This should never be visible
 /datum/clockwork_rite
 	var/name = "Rite of THE frog" //The name of the rite
-	var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to cultists if they choose 'Show Info' after selecting the rite.
+	var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to servants if they choose 'Show Info' after selecting the rite.
 	var/list/required_ingredients = list(/obj/item/clockwork) //What does this rite require?
 	var/power_cost = 0 //How much power does this rite cost.. or does it even add power?
-	var/requires_human = FALSE	//Does the rite require a ../carbon/human on the rune?
+	var/requires_human = FALSE	//Does the rite require a ../carbon/human on the sigil?
 	var/must_be_servant = TRUE //If the above is true, does the human need to be a servant?
 	var/target_can_be_invoker = TRUE //Does this rite work if the invoker is also the target?
+	var/requires_full_power = FALSE //Does the invoker need to be an actual full-on servant, or is this available to neutered ones aswell?
 	var/cast_time = 0 //How long does the rite take to cast?
 	var/limit = INFINITE //How often can this rite be used per round? Set this to INFINITE for unlimited, 0 for disallowed, anything above 0 for a limit
 	var/times_used = 0 //How often has the rite already been used this shift?
@@ -115,7 +115,7 @@
 		if(totaldamage)
 			L.heal_overall_damage(brutedamage, burndamage, only_organic = FALSE) //Maybe a machine god shouldn't murder augmented followers instead of healing them
 			L.adjustOxyLoss(-oxydamage)
-			L.adjustToxLoss(totaldamage * 0.5, TRUE, TRUE)
+			L.adjustToxLoss(totaldamage * 0.5, TRUE, TRUE, toxins_type = TOX_OMNI)
 			clockwork_say(ranged_ability_user, text2ratvar("[has_holy_water ? "Heal tainted" : "Mend wounded"] flesh!"))
 			log_combat(ranged_ability_user, L, "healed with Sentinel's Compromise")
 			L.visible_message("<span class='warning'>A blue light washes over [L], [has_holy_water ? "causing [L.p_them()] to briefly glow as it mends" : " mending"] [L.p_their()] bruises and burns!</span>", \
@@ -99,7 +99,7 @@
 	else
 		..()

-/obj/item/clockwork/slab/cyborg/ratvar_act()
+/obj/item/clockwork/slab/cyborg/ui_act()
 	..()
 	if(!GLOB.ratvar_awakens)
 		SStgui.close_uis(src)
@@ -349,4 +349,4 @@
 	if(GLOB.ratvar_awakens)
 		portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned
 		duration = max(duration, 100)
-	return slab.procure_gateway(invoker, duration, portal_uses)
+	return slab.procure_gateway(invoker, duration, portal_uses)
@@ -29,6 +29,7 @@
 	sound_to_playing_players('sound/effects/ratvar_reveal.ogg')
 	var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert")
 	notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [get_area_name(src)] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
+	SSpersistence.station_was_destroyed = TRUE
 	sleep(600)
 	INVOKE_ASYNC(src, .proc/purge_the_heresy)

@@ -83,4 +83,4 @@
 	anchored = !anchored
 	to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] \the [src].</span>")
 	I.play_tool_sound(src)
-	return TRUE
+	return TRUE
@@ -17,4 +17,4 @@
 		return
 	audible_message("<i>*click*</i>")
 	playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)
-	activate()
+	activate()
@@ -445,7 +445,7 @@
 					if(L.move_resist < MOVE_FORCE_STRONG)
 						var/atom/throw_target = get_edge_target_turf(L, user.dir)
 						L.throw_at(throw_target, 7, 1, user)
-			else if(!iscultist(L))
+			else if(!is_servant_of_ratvar(L))
 				L.DefaultCombatKnockdown(160)
 				L.adjustStaminaLoss(140) //Ensures hard stamcrit
 				L.flash_act(1,1)
@@ -465,7 +465,7 @@
 					C.drowsyness = max(10, C.drowsyness)
 					C.confused += clamp(20 - C.confused, 0, 10)
 				L.adjustBruteLoss(15)
-			to_chat(user, "<span class='cultitalic'>In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]</span>")
+			to_chat(user, "<span class='cultitalic'>In an brilliant flash of red, [L] [is_servant_of_ratvar(L) ? "writhes in pain!" : "falls to the ground!"]</span>")
 		uses--
 	..()

@@ -717,9 +717,9 @@
 						uses = 0
 					ratio *= -1
 					H.adjustOxyLoss((overall_damage*ratio) * (H.getOxyLoss() / overall_damage), 0)
-					H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0)
-					H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0)
-					H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0)
+					H.adjustToxLoss((overall_damage*ratio) * (H.getToxLoss() / overall_damage), 0, toxins_type = TOX_OMNI)
+					H.adjustFireLoss((overall_damage*ratio) * (H.getFireLoss() / overall_damage), 0, only_organic = FALSE)
+					H.adjustBruteLoss((overall_damage*ratio) * (H.getBruteLoss() / overall_damage), 0, only_organic = FALSE)
 					H.updatehealth()
 					playsound(get_turf(H), 'sound/magic/staff_healing.ogg', 25)
 					new /obj/effect/temp_visual/cult/sparks(get_turf(H))
@@ -214,8 +214,8 @@
 				if(L.health != L.maxHealth)
 					new /obj/effect/temp_visual/heal(get_turf(src), "#960000")
 					if(ishuman(L))
-						L.adjustBruteLoss(-1, 0)
-						L.adjustFireLoss(-1, 0)
+						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
@@ -115,4 +115,4 @@
 	rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune1
 	rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/inner
 	rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/center
-	rune_color = RUNE_COLOR_MEDIUMRED
+	rune_color = RUNE_COLOR_MEDIUMRED
@@ -35,4 +35,4 @@
 				DefaultCombatKnockdown(40)
 				qdel(weapon)
 				return 2
-	return 1
+	return 1
@@ -20,4 +20,4 @@
 	explanation_text = "You are the BEST thing on the station.  Make sure everyone knows it."

 /datum/objective/sintouched/acedia
-	explanation_text = "Angels, devils, good, evil... who cares?  Just ignore any hellish threats and do your job."
+	explanation_text = "Angels, devils, good, evil... who cares?  Just ignore any hellish threats and do your job."
@@ -105,7 +105,7 @@
 /mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
 	return 666

-/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
+/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash, override_protection = 0)
 	if(mind && has_bane(BANE_LIGHT))
 		mind.disrupt_spells(-500)
 		return ..() //flashes don't stop devils UNLESS it's their bane.
@@ -31,6 +31,7 @@
 /datum/antagonist/heretic/on_gain()
 	var/mob/living/current = owner.current
 	owner.teach_crafting_recipe(/datum/crafting_recipe/heretic/codex)
+	owner.special_role = ROLE_HERETIC
 	if(ishuman(current))
 		forge_primary_objectives()
 		gain_knowledge(/datum/eldritch_knowledge/spell/basic)
@@ -49,7 +50,7 @@
 	for(var/X in researched_knowledge)
 		var/datum/eldritch_knowledge/EK = researched_knowledge[X]
 		EK.on_lose(owner.current)
-
+	owner.special_role = null
 	if(!silent)
 		to_chat(owner.current, "<span class='userdanger'>Your mind begins to flare as the otherwordly knowledge escapes your grasp!</span>")
 		owner.current.log_message("has renounced the cult of the old ones!", LOG_ATTACK, color="#960000")
@@ -98,7 +99,7 @@
 		var/pck = pick("assasinate","protect")
 		switch(pck)
 			if("assasinate")
-				var/datum/objective/assassinate/A = new
+				var/datum/objective/assassinate/once/A = new
 				A.owner = owner
 				var/list/owners = A.get_owners()
 				A.find_target(owners,protection)
@@ -2,8 +2,10 @@
 	name = "Codex Cicatrix"
 	desc = "Book describing the secrets of the veil."
 	icon = 'icons/obj/eldritch.dmi'
-	icon_state = "book"
-	item_state = "book"
+	icon_state = "codex"
+	item_state = "codex"
+	lefthand_file = 'icons/mob/inhands/misc/books_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
 	///Last person that touched this
 	var/mob/living/last_user
@@ -40,7 +42,7 @@
 ///Gives you a charge and destroys a corresponding influence
 /obj/item/forbidden_book/proc/get_power_from_influence(atom/target, mob/user)
 	var/obj/effect/reality_smash/RS = target
-	to_chat(target, "<span class='danger'>You start drawing power from influence...</span>")
+	to_chat(user, "<span class='danger'>You start drawing power from influence...</span>")
 	if(do_after(user,10 SECONDS,TRUE,RS))
 		qdel(RS)
 		charge += 1
@@ -50,7 +52,7 @@

 	for(var/turf/T in range(1,target))
 		if(is_type_in_typecache(T, blacklisted_turfs))
-			to_chat(target, "<span class='warning'>The terrain doesn't support runes!</span>")
+			to_chat(user, "<span class='warning'>The terrain doesn't support runes!</span>")
 			return
 	var/A = get_turf(target)
 	to_chat(user, "<span class='danger'>You start drawing a rune...</span>")
@@ -8,6 +8,12 @@
 	///Used mainly for summoning ritual to prevent spamming the rune to create millions of monsters.
 	var/is_in_use = FALSE

+/obj/effect/eldritch/Initialize()
+	. = ..()
+	var/image/I = image(icon = 'icons/effects/eldritch.dmi', icon_state = null, loc = src)
+	I.override = TRUE
+	add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "heretic_rune", I)
+
 /obj/effect/eldritch/attack_hand(mob/living/user)
 	. = ..()
 	if(.)
@@ -69,6 +75,7 @@
 				if(is_type_in_list(local_atom_in_range,local_required_atom_list))
 					selected_atoms |= local_atom_in_range
 					local_required_atoms -= list(local_required_atom_list)
+					break

 		if(length(local_required_atoms) > 0)
 			continue
@@ -190,6 +197,19 @@
 	icon_state = "pierced_illusion"
 	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)
+	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/attack_hand(mob/living/user)
 	if(!ishuman(user))
@@ -228,17 +248,19 @@
 		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,30)
-	. = ..()
+		human_user.adjustOrganLoss(ORGAN_SLOT_BRAIN,20,190)
+		SEND_SIGNAL(human_user, COMSIG_ADD_MOOD_EVENT, "gates_of_mansus", /datum/mood_event/gates_of_mansus)

 /obj/effect/reality_smash
 	name = "/improper reality smash"
 	icon = 'icons/effects/eldritch.dmi'
 	anchored = TRUE
 	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	invisibility = INVISIBILITY_OBSERVER
 	///We cannot use icon_state since this is invisible, functions the same way but with custom behaviour.
 	var/image_state = "reality_smash"
 	///Who can see us?
@@ -16,9 +16,9 @@
 		return
 	var/dist = get_dist(user.loc,target.loc)
 	var/dir = get_dir(user.loc,target.loc)
-	
+
 	if(user.z != target.z)
-		to_chat(user,"<span class='warning'>[target.real_name] is beyond our reach.</span>")
+		to_chat(user,"<span class='warning'>[target.real_name] is on another plane of existance!</span>")
 	else
 		switch(dist)
 			if(0 to 15)
@@ -33,6 +33,34 @@
 	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 = 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 TRUE
+	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"
 	desc = "A sickly green crescent blade, decorated with an ornamental eye. You feel like you're being watched..."
@@ -50,15 +78,28 @@
 	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))
+	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
 	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/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
 	. = ..()
 	var/datum/antagonist/heretic/cultie = user.mind.has_antag_datum(/datum/antagonist/heretic)
@@ -103,7 +144,7 @@

 /obj/item/clothing/neck/eldritch_amulet/equipped(mob/user, slot)
 	. = ..()
-	if(ishuman(user) && user.mind && slot == SLOT_NECK && IS_HERETIC(user))
+	if(ishuman(user) && user.mind && slot == SLOT_NECK && (IS_HERETIC(user) || IS_HERETIC_MONSTER(user)))
 		ADD_TRAIT(user, trait, CLOTHING_TRAIT)
 		user.update_sight()

@@ -136,6 +177,7 @@
 	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)
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON

 /obj/item/reagent_containers/glass/beaker/eldritch
 	name = "flask of eldritch essence"
@@ -264,12 +264,19 @@
 		if(!LH.target)
 			var/datum/objective/A = new
 			A.owner = user.mind
-			var/datum/mind/targeted =  A.find_target()//easy way, i dont feel like copy pasting that entire block of code
-			LH.target = targeted.current
+			var/list/targets = list()
+			for(var/i in 0 to 3)
+				var/datum/mind/targeted =  A.find_target()//easy way, i dont feel like copy pasting that entire block of code
+				if(!targeted)
+					break
+				targets[targeted.current.real_name] = targeted.current
+			LH.target = targets[input(user,"Choose your next target","Target") in targets]
+
+			if(!LH.target && targets.len)
+				LH.target = pick(targets)	//Tsk tsk, you can and will get another target if you want it or not.
 			qdel(A)
 			if(LH.target)
 				to_chat(user,"<span class='warning'>Your new target has been selected, go and sacrifice [LH.target.real_name]!</span>")
-
 			else
 				to_chat(user,"<span class='warning'>target could not be found for living heart.</span>")

@@ -34,7 +34,7 @@
 	desc = "Touch spell that allows you to channel the power of the Old Gods through you."
 	hand_path = /obj/item/melee/touch_attack/mansus_fist
 	school = "evocation"
-	charge_max = 150
+	charge_max = 100
 	clothes_req = FALSE
 	action_icon = 'icons/mob/actions/actions_ecult.dmi'
 	action_icon_state = "mansus_grasp"
@@ -104,57 +104,61 @@
 	desc = "Spreads rust onto nearby turfs."
 	range = 2

-/obj/effect/proc_holder/spell/targeted/touch/blood_siphon
+/obj/effect/proc_holder/spell/pointed/blood_siphon
 	name = "Blood Siphon"
-	desc = "Touch spell that heals you while damaging the enemy, has a chance to transfer wounds between you and your enemy."
-	hand_path = /obj/item/melee/touch_attack/blood_siphon
+	desc = "A touch spell that heals your wounds while damaging the enemy. It has a chance to transfer wounds between you and your enemy."
 	school = "evocation"
 	charge_max = 150
 	clothes_req = FALSE
-	invocation_type = "none"
+	invocation = "FL'MS O'ET'RN'ITY"
+	invocation_type = "whisper"
 	action_icon = 'icons/mob/actions/actions_ecult.dmi'
 	action_icon_state = "blood_siphon"
 	action_background_icon_state = "bg_ecult"
+	range = 9

-/obj/item/melee/touch_attack/blood_siphon
-	name = "Blood Siphon"
-	desc = "A sinister looking aura that distorts the flow of reality around it."
-	color = RUNE_COLOR_RED
-	icon_state = "disintegrate"
-	item_state = "disintegrate"
-	catchphrase = "SUN'AI'KINI'MAS"
-
-/obj/item/melee/touch_attack/blood_siphon/afterattack(atom/target, mob/user, proximity_flag, proximity)
-	if(!proximity_flag)
-		return
-	playsound(user, 'sound/effects/curseattack.ogg', 75, TRUE)
+/obj/effect/proc_holder/spell/pointed/blood_siphon/cast(list/targets, mob/user)
+	. = ..()
+	var/target = targets[1]
+	playsound(user, 'sound/magic/demon_attack1.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/mob/living/carbon/C2 = user
+	var/mob/living/carbon/carbon_user = user
 	if(isliving(target))
-		var/mob/living/L = target
-		L.adjustBruteLoss(20)
-		C2.adjustBruteLoss(-20)
+		var/mob/living/living_target = target
+		living_target.adjustBruteLoss(20)
+		carbon_user.adjustBruteLoss(-20)
 	if(iscarbon(target))
-		var/mob/living/carbon/C1 = target
-		for(var/obj/item/bodypart/bodypart in C2.bodyparts)
+		var/mob/living/carbon/carbon_target = target
+		for(var/bp in carbon_user.bodyparts)
+			var/obj/item/bodypart/bodypart = bp
 			for(var/i in bodypart.wounds)
 				var/datum/wound/iter_wound = i
 				if(prob(50))
 					continue
-				var/obj/item/bodypart/target_bodypart = locate(bodypart.type) in C1.bodyparts
+				var/obj/item/bodypart/target_bodypart = locate(bodypart.type) in carbon_target.bodyparts
 				if(!target_bodypart)
 					continue
 				iter_wound.remove_wound()
 				iter_wound.apply_wound(target_bodypart)

-		C1.blood_volume -= 20
-		if(C2.blood_volume < BLOOD_VOLUME_MAXIMUM) //we dont want to explode after all
-			C2.blood_volume += 20
-		return ..()
+		carbon_target.blood_volume -= 20
+		if(carbon_user.blood_volume < BLOOD_VOLUME_MAXIMUM) //we dont want to explode after all
+			carbon_user.blood_volume += 20
+		return
+
+/obj/effect/proc_holder/spell/pointed/blood_siphon/can_target(atom/target, mob/user, silent)
+	. = ..()
+	if(!.)
+		return FALSE
+	if(!istype(target,/mob/living))
+		if(!silent)
+			to_chat(user, "<span class='warning'>You are unable to siphon [target]!</span>")
+		return FALSE
+	return TRUE

 /obj/effect/proc_holder/spell/aimed/rust_wave
 	name = "Patron's Reach"
@@ -451,7 +455,7 @@
 			new /obj/effect/hotspot(T)
 			T.hotspot_expose(700,50,1)
 			for(var/mob/living/livies in T.contents - centre)
-				livies.adjustFireLoss(10)
+				livies.adjustFireLoss(5)
 		_range++
 		sleep(3)

@@ -500,7 +504,7 @@
 		new /obj/effect/hotspot(T)
 		T.hotspot_expose(700,50,1)
 		for(var/mob/living/livies in T.contents - current_user)
-			livies.adjustFireLoss(5)
+			livies.adjustFireLoss(2.5)


 /obj/effect/proc_holder/spell/targeted/worm_contract
@@ -519,6 +523,7 @@
 	. = ..()
 	if(!istype(user,/mob/living/simple_animal/hostile/eldritch/armsy))
 		to_chat(user, "<span class='userdanger'>You try to contract your muscles but nothing happens...</span>")
+		return
 	var/mob/living/simple_animal/hostile/eldritch/armsy/armsy = user
 	armsy.contract_next_chain_into_single_tile()

@@ -727,7 +732,7 @@

 /obj/effect/proc_holder/spell/cone/staggered/entropic_plume/do_mob_cone_effect(mob/living/victim, level)
 	. = ..()
-	if(victim.anti_magic_check() || IS_HERETIC(victim) || victim.mind?.has_antag_datum(/datum/antagonist/heretic_monster))
+	if(victim.anti_magic_check() || IS_HERETIC(victim) || IS_HERETIC_MONSTER(victim))
 		return
 	victim.apply_status_effect(STATUS_EFFECT_AMOK)
 	victim.apply_status_effect(STATUS_EFFECT_CLOUDSTRUCK, (level*10))
@@ -190,7 +190,7 @@
 	required_atoms = list(/mob/living/carbon/human)
 	cost = 5
 	route = PATH_ASH
-	var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_GENELESS,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_BOMBIMMUNE)
+	var/list/trait_list = list(TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE)

 /datum/eldritch_knowledge/final/ash_final/on_finished_recipe(mob/living/user, list/atoms, loc)
 	priority_announce("$^@&#*$^@(#&$(@&#^$&#^@# Fear the blaze, for Ashbringer [user.real_name] has come! $^@&#*$^@(#&$(@&#^$&#^@#","#$^@&#*$^@(#&$(@&#^$&#^@#", 'sound/announcer/classic/spanomalies.ogg')
@@ -173,9 +173,9 @@
 /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 flower, 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."
+	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."
 	cost = 1
-	required_atoms = list(/obj/item/kitchen/knife,/obj/item/reagent_containers/food/snacks/grown/poppy,/obj/item/pen,/obj/item/paper)
+	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
 	next_knowledge = list(/datum/eldritch_knowledge/summon/ashy,/datum/eldritch_knowledge/summon/rusty,/datum/eldritch_knowledge/flesh_blade_upgrade_2)
 	route = PATH_FLESH
@@ -203,7 +203,7 @@
 	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."
 	cost = 1
-	spell_to_add = /obj/effect/proc_holder/spell/targeted/touch/blood_siphon
+	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)

 /datum/eldritch_knowledge/final/flesh_final
@@ -69,7 +69,7 @@
 	var/mob/living/living_user = user
 	living_user.adjustBruteLoss(-3, FALSE)
 	living_user.adjustFireLoss(-3, FALSE)
-	living_user.adjustToxLoss(-3, FALSE)
+	living_user.adjustToxLoss(-3, FALSE, TRUE)
 	living_user.adjustOxyLoss(-1, FALSE)
 	living_user.adjustStaminaLoss(-6)

@@ -6,4 +6,4 @@
 /datum/antagonist/magic_servant/proc/setup_master(mob/M)
 	var/datum/objective/O = new("Serve [M.real_name].")
 	O.owner = owner
-	objectives |= O
+	objectives |= O
@@ -42,7 +42,9 @@
 	/obj/screen,
 	/obj/singularity,
 	/mob/living/simple_animal/hostile/morph,
-	/obj/effect))
+	/obj/effect,
+	/mob/camera
+	))

 	var/playstyle_string = "<span class='big bold'>You are a morph,</span></b> an abomination of science created primarily with changeling cells. \
 							You may take the form of anything nearby by shift-clicking it. This process will alert any nearby \
@@ -178,4 +178,4 @@
 /obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/user)
 	if(active)
 		to_chat(user, "<span class='danger'>Your chameleon field deactivates.</span>")
-		deactivate(user)
+		deactivate(user)
@@ -617,9 +617,12 @@ This is here to make the tiles around the station mininuke change when it's arme
 	var/fake = FALSE
 	var/turf/lastlocation
 	var/last_disk_move
+	var/process_tick = 0

 /obj/item/disk/nuclear/Initialize()
 	. = ..()
+	AddElement(/datum/element/bed_tuckable, 6, -6, 0)
+
 	if(!fake)
 		GLOB.poi_list |= src
 		last_disk_move = world.time
@@ -630,11 +633,25 @@ 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
 	if(fake)
 		STOP_PROCESSING(SSobj, src)
 		CRASH("A fake nuke disk tried to call process(). Who the fuck and how the fuck")
 	var/turf/newturf = get_turf(src)
+
 	if(newturf && lastlocation == newturf)
+
+	// How comfy is disky?
+		var/disk_comfort_level = 0
+
+		// Checking for items that make disky comfy
+		for(var/obj/comfort_item in loc)
+			if(istype(comfort_item, /obj/item/bedsheet) || istype(comfort_item, /obj/structure/bed))
+				disk_comfort_level++
+
+		if(disk_comfort_level >= 2) //Sleep tight, disky.
+			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
 			if(istype(loneop) && loneop.occurrences < loneop.max_occurrences)
@@ -28,4 +28,4 @@
 	santa_objective.explanation_text = "Bring joy and presents to the station!"
 	santa_objective.completed = 1 //lets cut our santas some slack.
 	santa_objective.owner = owner
-	objectives |= santa_objective
+	objectives |= santa_objective
@@ -16,4 +16,4 @@
 	return nation

 /datum/antagonist/separatist/greet()
-	to_chat(owner, "<B>You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
+	to_chat(owner, "<B>You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
@@ -9,7 +9,7 @@
 		objective_count += forge_single_objective()

 	for(var/i = objective_count, i < CONFIG_GET(number/traitor_objectives_amount), i++)
-		var/datum/objective/assassinate/kill_objective = new
+		var/datum/objective/assassinate/once/kill_objective = new
 		kill_objective.owner = T.owner
 		kill_objective.find_target()
 		T.add_objective(kill_objective)
@@ -261,6 +261,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 		return //prevent the AI from activating an already active doomsday
 	if (owner_AI.shunted)
 		return //prevent AI from activating doomsday while shunted.
+	if (istype(owner.loc, /obj/item/aicard))
+		return //prevent AI from activating doomsday while carded. If the AI gets carded after doomsdaying, there's already code to stop it then.
 	active = TRUE
 	set_us_up_the_bomb(owner)

@@ -327,6 +329,10 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	sleep(30)
 	if(QDELETED(owner) || owner.stat == DEAD)
 		return
+	if(istype(owner.loc, /obj/item/aicard))
+		to_chat(owner, "<span class='boldnotice'>Error: Signal transmission failed. Reason: Lost connection to network.</span>")
+		to_chat(owner, "<span class='warning'>You can't activate the doomsday device while inside an intelliCard!</span>")
+		return
 	priority_announce("Hostile runtimes detected in all station systems, please deactivate your AI to prevent possible damage to its morality core.", "Anomaly Alert", "aimalf")
 	set_security_level("delta")
 	var/obj/machinery/doomsday_device/DOOM = new(owner_AI)
@@ -187,8 +187,8 @@

 	partner_outfit.equip(partner)

-	var/obj/structure/closet/supplypod/arrival_pod = new()
-
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+	var/obj/structure/closet/supplypod/arrival_pod = new(pick(get_area_turfs(pod_storage_area)))
 	arrival_pod.style = STYLE_SYNDICATE
 	arrival_pod.explosionSize = list(0,0,0,1)
 	arrival_pod.bluespace = TRUE
@@ -59,7 +59,8 @@

 // Launch the pod to collect our victim.
 /datum/syndicate_contract/proc/launch_extraction_pod(turf/empty_pod_turf)
-	var/obj/structure/closet/supplypod/extractionpod/empty_pod = new()
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+	var/obj/structure/closet/supplypod/extractionpod/empty_pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime

 	RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, .proc/enter_check)

@@ -180,8 +181,8 @@

 	if(possible_drop_loc.len > 0)
 		var/pod_rand_loc = rand(1, possible_drop_loc.len)
-
-		var/obj/structure/closet/supplypod/return_pod = new()
+		var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+		var/obj/structure/closet/supplypod/return_pod = new(pick(get_area_turfs(pod_storage_area)))
 		return_pod.bluespace = TRUE
 		return_pod.explosionSize = list(0,0,0,0)
 		return_pod.style = STYLE_SYNDICATE
@@ -16,4 +16,4 @@

 /datum/antagonist/heartbreaker/greet()
 	to_chat(owner, "<span class='warning'><B>You didn't get a date! They're all having fun without you! you'll show them though...</B></span>")
-	owner.announce_objectives()
+	owner.announce_objectives()
@@ -249,7 +249,7 @@
 	S.name = "Shade of [T.real_name]"
 	S.real_name = "Shade of [T.real_name]"
 	T.transfer_ckey(S)
-	S.original_mind = T.mind.current
+	S.original_mind = T.mind
 	S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder.
 	S.update_atom_languages()
 	grant_all_languages(FALSE, FALSE, TRUE)	//Grants omnitongue
@@ -189,6 +189,10 @@
 	name = "Mutate"
 	spell_type = /obj/effect/proc_holder/spell/targeted/genetic/mutate

+/datum/spellbook_entry/mantra
+	name = "Inner Mantra"
+	spell_type = /obj/effect/proc_holder/spell/self/mantra
+
 /datum/spellbook_entry/jaunt
 	name = "Ethereal Jaunt"
 	spell_type = /obj/effect/proc_holder/spell/targeted/ethereal_jaunt
@@ -181,8 +181,8 @@
 			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.")
 		if(APPRENTICE_MARTIAL)
 			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist(null))
-			H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H))
-			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are also able to use the Nuclear Fist at will.")
+			owner.AddSpell(new /obj/effect/proc_holder/spell/self/mantra(null))
+			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned to control your Inner Mantra. You are also able to use the Nuclear Fist at will.")

 /datum/antagonist/wizard/apprentice/create_objectives()
 	var/datum/objective/protect/new_objective = new /datum/objective/protect
@@ -17,16 +17,16 @@
 	threat = 3

 /datum/antagonist/xeno/threat()
-	. = 1
+	. = 3
 	if(isalienhunter(owner))
-		. = 2
+		. = 6
 	else if(isaliensentinel(owner))
-		. = 4
+		. = 12
 	else if(isalienroyal(owner))
 		if(isalienqueen(owner))
-			. = 8
+			. = 24
 		else
-			. = 6
+			. = 18

 /datum/antagonist/xeno/create_team(datum/team/xeno/new_team)
 	if(!new_team)
@@ -88,7 +88,6 @@
 			to_chat(owner, "<span class='warning'>You feel your breasts shrinking away from your body as your chest flattens out.</span>")
 		QDEL_IN(src, 1)
 		return
-	var/enlargement = FALSE
 	switch(rounded_cached)
 		if(0) //flatchested
 			size = "flat"
@@ -96,16 +95,8 @@
 			size = breast_values[rounded_cached]
 		if(9 to 15) //massive
 			size = breast_values[rounded_cached]
-			enlargement = TRUE
 		if(16 to INFINITY) //rediculous
 			size = "huge"
-			enlargement = TRUE
-	if(owner)
-		var/status_effect = owner.has_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)
-		if(enlargement && !status_effect)
-			owner.apply_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)
-		else if(!enlargement && status_effect)
-			owner.remove_status_effect(STATUS_EFFECT_BREASTS_ENLARGEMENT)

 	if(rounded_cached < 16 && owner)//Because byond doesn't count from 0, I have to do this.
 		var/mob/living/carbon/human/H = owner
@@ -134,4 +125,4 @@
 	toggle_visibility(D.features["breasts_visibility"], FALSE)

 #undef BREASTS_ICON_MIN_SIZE
-#undef BREASTS_ICON_MAX_SIZE
+#undef BREASTS_ICON_MAX_SIZE
@@ -39,26 +39,16 @@
 		return
 	var/rounded_length = round(length)
 	var/new_size
-	var/enlargement = FALSE
 	switch(rounded_length)
 		if(0 to 6) //If modest size
 			new_size = 1
 		if(7 to 11) //If large
 			new_size = 2
-		if(12 to 20) //If massive
+		if(12 to 36) //If massive
 			new_size = 3
-		if(21 to 34) //If massive and due for large effects
-			new_size = 3
-			enlargement = TRUE
-		if(35 to INFINITY) //If comical
+		if(37 to INFINITY) //If comical
 			new_size = 4 //no new sprites for anything larger yet
-			enlargement = TRUE
-	if(owner)
-		var/status_effect = owner.has_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
-		if(enlargement && !status_effect)
-			owner.apply_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
-		else if(!enlargement && status_effect)
-			owner.remove_status_effect(STATUS_EFFECT_PENIS_ENLARGEMENT)
+
 	if(linked_organ)
 		linked_organ.size = clamp(size + new_size, BALLS_SIZE_MIN, BALLS_SIZE_MAX)
 		linked_organ.update()
@@ -106,4 +96,4 @@
 	diameter_ratio = D.features["cock_diameter_ratio"]
 	shape = D.features["cock_shape"]
 	prev_length = length
-	toggle_visibility(D.features["cock_visibility"], FALSE)
+	toggle_visibility(D.features["cock_visibility"], FALSE)
@@ -13,4 +13,4 @@ Name:	IsAssemblyHolder
 Desc:	If true is an object that can hold an assemblyholder object
 */
 /obj/proc/IsAssemblyHolder()
-	return FALSE
+	return FALSE
@@ -48,4 +48,4 @@

 /obj/item/assembly/playback/toggle_secure()
 	. = ..()
-	listening = FALSE
+	listening = FALSE
@@ -336,4 +336,4 @@
 	return TRUE

 /obj/machinery/atmospherics/proc/update_layer()
-	layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE
+	layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE
--- a/Show More
+++ b/Show More