Merge branch 'master' into Superbases-goodbye

2019-12-07 17:37:05 +00:00
parent a0539c79e9 cece6dd43d
commit 60c555c7e1
2384 changed files with 58043 additions and 154090 deletions
@@ -686,6 +686,20 @@
 			log_admin("[key_name(usr)] set the pre-game delay to [DisplayTimeText(newtime)].")
 		SSblackbox.record_feedback("tally", "admin_verb", 1, "Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

+/datum/admins/proc/toggledynamicvote()
+	set category = "Server"
+	set desc="Switches between secret/extended and dynamic voting"
+	set name="Toggle Dynamic Vote"
+	var/prev_dynamic_voting = CONFIG_GET(flag/dynamic_voting)
+	CONFIG_SET(flag/dynamic_voting,!prev_dynamic_voting)
+	if (!prev_dynamic_voting)
+		to_chat(world, "<B>Vote is now between extended and dynamic chaos.</B>")
+	else
+		to_chat(world, "<B>Vote is now between extended and secret.</B>")
+	log_admin("[key_name(usr)] [prev_dynamic_voting ? "disabled" : "enabled"] dynamic voting.")
+	message_admins("<span class='adminnotice'>[key_name_admin(usr)] toggled dynamic voting.</span>")
+	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dynamic Voting", "[prev_dynamic_voting ? "Disabled" : "Enabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/unprison(mob/M in GLOB.mob_list)
 	set category = "Admin"
 	set name = "Unprison"
@@ -706,20 +720,44 @@

 	if(!check_rights(R_SPAWN))
 		return
+	var/turf/T = get_turf(usr)

 	var/chosen = pick_closest_path(object)
 	if(!chosen)
 		return
 	if(ispath(chosen, /turf))
-		var/turf/T = get_turf(usr.loc)
 		T.ChangeTurf(chosen)
 	else
-		var/atom/A = new chosen(usr.loc)
+		var/atom/A = new chosen(T)
 		A.flags_1 |= ADMIN_SPAWNED_1

 	log_admin("[key_name(usr)] spawned [chosen] at [AREACOORD(usr)]")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

+/datum/admins/proc/podspawn_atom(object as text)
+	set category = "Debug"
+	set desc = "(atom path) Spawn an atom via supply drop"
+	set name = "Podspawn"
+
+	if(!check_rights(R_SPAWN))
+		return
+
+	var/chosen = pick_closest_path(object)
+	if(!chosen)
+		return
+	var/turf/T = get_turf(usr)
+
+	if(ispath(chosen, /turf))
+		T.ChangeTurf(chosen)
+	else
+		var/obj/structure/closet/supplypod/centcompod/pod = new()
+		var/atom/A = new chosen(pod)
+		A.flags_1 |= ADMIN_SPAWNED_1
+		new /obj/effect/abstract/DPtarget(T, pod)
+
+	log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]")
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/spawn_cargo(object as text)
 	set category = "Debug"
 	set desc = "(atom path) Spawn a cargo crate"
@@ -861,7 +899,7 @@
 /datum/admins/proc/dynamic_mode_options(mob/user)
 	var/dat = {"
 		<center><B><h2>Dynamic Mode Options</h2></B></center><hr>
-		<br/> 
+		<br/>
 		<h3>Common options</h3>
 		<i>All these options can be changed midround.</i> <br/>
 		<br/>
@@ -1,7 +1,7 @@
 //admin verb groups - They can overlap if you so wish. Only one of each verb will exist in the verbs list regardless
 //the procs are cause you can't put the comments in the GLOB var define
-GLOBAL_PROTECT(admin_verbs_default)
 GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
+GLOBAL_PROTECT(admin_verbs_default)
 /world/proc/AVerbsDefault()
 	return list(
 	/client/proc/deadmin,				/*destroys our own admin datum so we can play as a regular player*/
@@ -13,8 +13,8 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
 	/client/proc/toggleprayers,
 	/client/proc/toggleadminhelpsound
 	)
-GLOBAL_PROTECT(admin_verbs_admin)
 GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
+GLOBAL_PROTECT(admin_verbs_admin)
 /world/proc/AVerbsAdmin()
 	return list(
 	/client/proc/invisimin,				/*allows our mob to go invisible/visible*/
@@ -78,11 +78,10 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/hide_most_verbs,		/*hides all our hideable adminverbs*/
 	/datum/admins/proc/open_borgopanel
 	)
-GLOBAL_PROTECT(admin_verbs_ban)
 GLOBAL_LIST_INIT(admin_verbs_ban, list(/client/proc/unban_panel, /client/proc/DB_ban_panel, /client/proc/stickybanpanel))
-GLOBAL_PROTECT(admin_verbs_sounds)
+GLOBAL_PROTECT(admin_verbs_ban)
 GLOBAL_LIST_INIT(admin_verbs_sounds, list(/client/proc/play_local_sound, /client/proc/play_sound, /client/proc/set_round_end_sound))
-GLOBAL_PROTECT(admin_verbs_fun)
+GLOBAL_PROTECT(admin_verbs_sounds)
 GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/cmd_admin_dress,
 	/client/proc/cmd_admin_gib_self,
@@ -108,9 +107,9 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/admin_away,
 	/client/proc/roll_dices					//CIT CHANGE - Adds dice verb
 	))
+GLOBAL_PROTECT(admin_verbs_fun)
+GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/podspawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character))
 GLOBAL_PROTECT(admin_verbs_spawn)
-GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character))
-GLOBAL_PROTECT(admin_verbs_server)
 GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 /world/proc/AVerbsServer()
 	return list(
@@ -122,6 +121,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/client/proc/everyone_random,
 	/datum/admins/proc/toggleAI,
 	/datum/admins/proc/toggleMulticam,
+	/datum/admins/proc/toggledynamicvote,
 	/client/proc/cmd_admin_delete,		/*delete an instance/object/mob/etc*/
 	/client/proc/cmd_debug_del_all,
 	/client/proc/toggle_random_events,
@@ -129,7 +129,7 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/client/proc/adminchangemap,
 	/client/proc/toggle_hub
 	)
-GLOBAL_PROTECT(admin_verbs_debug)
+GLOBAL_PROTECT(admin_verbs_server)
 GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
 /world/proc/AVerbsDebug()
 	return list(
@@ -171,15 +171,15 @@ GLOBAL_LIST_INIT(admin_verbs_debug, world.AVerbsDebug())
 	/datum/admins/proc/create_or_modify_area,
 	/client/proc/generate_wikichem_list //DO NOT PRESS UNLESS YOU WANT SUPERLAG
 	)
-GLOBAL_PROTECT(admin_verbs_possess)
+GLOBAL_PROTECT(admin_verbs_debug)
 GLOBAL_LIST_INIT(admin_verbs_possess, list(/proc/possess, /proc/release))
-GLOBAL_PROTECT(admin_verbs_permissions)
+GLOBAL_PROTECT(admin_verbs_possess)
 GLOBAL_LIST_INIT(admin_verbs_permissions, list(/client/proc/edit_admin_permissions))
-GLOBAL_PROTECT(admin_verbs_poll)
+GLOBAL_PROTECT(admin_verbs_permissions)
 GLOBAL_LIST_INIT(admin_verbs_poll, list(/client/proc/create_poll))

 //verbs which can be hidden - needs work
-GLOBAL_PROTECT(admin_verbs_hideable)
+GLOBAL_PROTECT(admin_verbs_poll)
 GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/set_ooc,
 	/client/proc/reset_ooc,
@@ -247,6 +247,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	/client/proc/cmd_admin_man_up, //CIT CHANGE - adds man up verb
 	/client/proc/cmd_admin_man_up_global //CIT CHANGE - ditto
 	))
+GLOBAL_PROTECT(admin_verbs_hideable)

 /client/proc/add_admin_verbs()
 	if(holder)
@@ -34,15 +34,15 @@
 	return

 /obj/effect/sound_emitter/examine(mob/user)
-	..()
+	. = ..()
 	if(!isobserver(user))
 		return
-	to_chat(user, "<span class='boldnotice'>Sound File:</span> [sound_file ? sound_file : "None chosen"]")
-	to_chat(user, "<span class='boldnotice'>Mode:</span> [motus_operandi]</span>")
-	to_chat(user, "<span class='boldnotice'>Range:</span> [emitter_range]</span>")
-	to_chat(user, "<b>Sound is playing at [sound_volume]% volume.</b>")
+	. += "<span class='boldnotice'>Sound File:</span> [sound_file ? sound_file : "None chosen"]"
+	. += "<span class='boldnotice'>Mode:</span> [motus_operandi]</span>"
+	. += "<span class='boldnotice'>Range:</span> [emitter_range]</span>"
+	. += "<b>Sound is playing at [sound_volume]% volume.</b>"
 	if(user.client.holder)
-		to_chat(user, "<b>Alt-click it to quickly activate it!</b>")
+		. += "<b>Alt-click it to quickly activate it!</b>"

 //ATTACK GHOST IGNORING PARENT RETURN VALUE
 /obj/effect/sound_emitter/attack_ghost(mob/user)
@@ -504,7 +504,7 @@
 		output += ruler
 	var/datum/browser/browser = new(usr, "Note panel", "Manage player notes", 1000, 500)
 	var/datum/asset/notes_assets = get_asset_datum(/datum/asset/simple/notes)
-	notes_assets.send(src)
+	notes_assets.send(usr.client)
 	browser.set_content(jointext(output, ""))
 	browser.open()

@@ -556,7 +556,7 @@
 /proc/convert_notes_sql(ckey)
 	if(!fexists(NOTESFILE))
 		return
-		
+
 	var/savefile/notesfile = new(NOTESFILE)
 	if(!notesfile)
 		log_game("Error: Cannot access [NOTESFILE]")
@@ -1347,7 +1347,7 @@

 	else if(href_list["f_secret"])
 		return HandleFSecret()
-		
+
 	else if(href_list["f_dynamic_roundstart"])
 		if(!check_rights(R_ADMIN))
 			return
@@ -1449,9 +1449,7 @@
 		if(GLOB.master_mode != "dynamic")
 			return alert(usr, "The game mode has to be dynamic mode!", null, null, null, null)

-		var/new_centre = input(usr,"Change the centre of the dynamic mode threat curve. A negative value will give a more peaceful round ; a positive value, a round with higher threat. Any number between -5 and +5 is allowed.", "Change curve centre", null) as num
-		if (new_centre < -5 || new_centre > 5)
-			return alert(usr, "Only values between -5 and +5 are allowed.", null, null, null, null)
+		var/new_centre = input(usr,"Change the centre of the dynamic mode threat curve. A negative value will give a more peaceful round ; a positive value, a round with higher threat. Any number is allowed. This is adjusted by dynamic voting.", "Change curve centre", null) as num

 		log_admin("[key_name(usr)] changed the distribution curve center to [new_centre].")
 		message_admins("[key_name(usr)] changed the distribution curve center to [new_centre]", 1)
@@ -1593,7 +1591,7 @@
 		GLOB.dynamic_stacking_limit = input(usr,"Change the threat limit at which round-endings rulesets will start to stack.", "Change stacking limit", null) as num
 		log_admin("[key_name(usr)] set 'stacking_limit' to [GLOB.dynamic_stacking_limit].")
 		message_admins("[key_name(usr)] set 'stacking_limit' to [GLOB.dynamic_stacking_limit].")
-		dynamic_mode_options(usr)	
+		dynamic_mode_options(usr)

 	else if(href_list["f_dynamic_high_pop_limit"])
 		if(!check_rights(R_ADMIN))
@@ -1612,7 +1610,7 @@

 		log_admin("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
 		message_admins("[key_name(usr)] set 'high_pop_limit' to [GLOB.dynamic_high_pop_limit].")
-		dynamic_mode_options(usr)		
+		dynamic_mode_options(usr)

 	else if(href_list["f_dynamic_forced_threat"])
 		if(!check_rights(R_ADMIN))
@@ -1631,7 +1629,7 @@

 		log_admin("[key_name(usr)] set 'forced_threat_level' to [GLOB.dynamic_forced_threat_level].")
 		message_admins("[key_name(usr)] set 'forced_threat_level' to [GLOB.dynamic_forced_threat_level].")
-		dynamic_mode_options(usr)	
+		dynamic_mode_options(usr)

 	else if(href_list["c_mode2"])
 		if(!check_rights(R_ADMIN|R_SERVER))
@@ -2357,7 +2355,7 @@

 		var/atom/target //Where the object will be spawned
 		var/where = href_list["object_where"]
-		if (!( where in list("onfloor","inhand","inmarked") ))
+		if (!( where in list("onfloor","frompod","inhand","inmarked") ))
 			where = "onfloor"


@@ -2368,7 +2366,7 @@
 					where = "onfloor"
 				target = usr

-			if("onfloor")
+			if("onfloor", "frompod")
 				switch(href_list["offset_type"])
 					if ("absolute")
 						target = locate(0 + X,0 + Y,0 + Z)
@@ -2384,7 +2382,10 @@
 				else
 					target = marked_datum

+		var/obj/structure/closet/supplypod/centcompod/pod
 		if(target)
+			if(where == "frompod")
+				pod = new()
 			for (var/path in paths)
 				for (var/i = 0; i < number; i++)
 					if(path in typesof(/turf))
@@ -2393,7 +2394,11 @@
 						if(N && obj_name)
 							N.name = obj_name
 					else
-						var/atom/O = new path(target)
+						var/atom/O
+						if(where == "frompod")
+							O = new path(pod)
+						else
+							O = new path(target)
 						if(!QDELETED(O))
 							O.flags_1 |= ADMIN_SPAWNED_1
 							if(obj_dir)
@@ -2413,6 +2418,8 @@
 										R.module.add_module(I, TRUE, TRUE)
 										R.activate_module(I)

+		if(pod)
+			new /obj/effect/abstract/DPtarget(target, pod)

 		if (number == 1)
 			log_admin("[key_name(usr)] created a [english_list(paths)]")
@@ -2442,7 +2449,7 @@
 			return
 		src.admincaster_feed_channel.channel_name = stripped_input(usr, "Provide a Feed Channel Name.", "Network Channel Handler", "")
 		while (findtext(src.admincaster_feed_channel.channel_name," ") == 1)
-			src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,lentext(src.admincaster_feed_channel.channel_name)+1)
+			src.admincaster_feed_channel.channel_name = copytext(src.admincaster_feed_channel.channel_name,2,length(src.admincaster_feed_channel.channel_name)+1)
 		src.access_news_network()

 	else if(href_list["ac_set_channel_lock"])
@@ -2484,7 +2491,7 @@
 			return
 		src.admincaster_feed_message.body = adminscrub(input(usr, "Write your Feed story.", "Network Channel Handler", ""))
 		while (findtext(src.admincaster_feed_message.returnBody(-1)," ") == 1)
-			src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.returnBody(-1),2,lentext(src.admincaster_feed_message.returnBody(-1))+1)
+			src.admincaster_feed_message.body = copytext(src.admincaster_feed_message.returnBody(-1),2,length(src.admincaster_feed_message.returnBody(-1))+1)
 		src.access_news_network()

 	else if(href_list["ac_submit_new_message"])
@@ -2545,7 +2552,7 @@
 			return
 		src.admincaster_wanted_message.criminal = adminscrub(input(usr, "Provide the name of the Wanted person.", "Network Security Handler", ""))
 		while(findtext(src.admincaster_wanted_message.criminal," ") == 1)
-			src.admincaster_wanted_message.criminal = copytext(admincaster_wanted_message.criminal,2,lentext(admincaster_wanted_message.criminal)+1)
+			src.admincaster_wanted_message.criminal = copytext(admincaster_wanted_message.criminal,2,length(admincaster_wanted_message.criminal)+1)
 		src.access_news_network()

 	else if(href_list["ac_set_wanted_desc"])
@@ -2553,7 +2560,7 @@
 			return
 		src.admincaster_wanted_message.body = adminscrub(input(usr, "Provide the a description of the Wanted person and any other details you deem important.", "Network Security Handler", ""))
 		while (findtext(src.admincaster_wanted_message.body," ") == 1)
-			src.admincaster_wanted_message.body = copytext(src.admincaster_wanted_message.body,2,lentext(src.admincaster_wanted_message.body)+1)
+			src.admincaster_wanted_message.body = copytext(src.admincaster_wanted_message.body,2,length(src.admincaster_wanted_message.body)+1)
 		src.access_news_network()

 	else if(href_list["ac_submit_wanted"])
@@ -61,7 +61,7 @@
 	var/output = "<b>Radio Report</b><hr>"
 	for (var/fq in SSradio.frequencies)
 		output += "<b>Freq: [fq]</b><br>"
-		var/list/datum/radio_frequency/fqs = SSradio.frequencies[fq]
+		var/datum/radio_frequency/fqs = SSradio.frequencies[fq]
 		if (!fqs)
 			output += "&nbsp;&nbsp;<b>ERROR</b><br>"
 			continue
@@ -19,7 +19,6 @@
 //- Identify how hard it is to break into the area and where the weak points are
 //- Check if the area has too much empty space. If so, make it smaller and replace the rest with maintenance tunnels.

-GLOBAL_PROTECT(admin_verbs_debug_mapping)
 GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/camera_view, 				//-errorage
 	/client/proc/sec_camera_report, 		//-errorage
@@ -50,6 +49,7 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/debug_z_levels,
 	/client/proc/place_ruin
 ))
+GLOBAL_PROTECT(admin_verbs_debug_mapping)

 /obj/effect/debugging/mapfix_marker
 	name = "map fix marker"
@@ -307,11 +307,11 @@ GLOBAL_PROTECT(VVpixelmovement)
 		//	the type with the base type removed from the begaining
 		var/fancytype = types[D.type]
 		if (findtext(fancytype, types[type]))
-			fancytype = copytext(fancytype, lentext(types[type])+1)
-		var/shorttype = copytext("[D.type]", lentext("[type]")+1)
-		if (lentext(shorttype) > lentext(fancytype))
+			fancytype = copytext(fancytype, length(types[type])+1)
+		var/shorttype = copytext("[D.type]", length("[type]")+1)
+		if (length(shorttype) > length(fancytype))
 			shorttype = fancytype
-		if (!lentext(shorttype))
+		if (!length(shorttype))
 			shorttype = "/"

 		.["[D]([shorttype])[REF(D)]#[i]"] = D
@@ -949,7 +949,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 		<tr>
 			<th>Uniform:</th>
 			<td>
-			   [uniform_select]
+				[uniform_select]
 			</td>
 		</tr>
 		<tr>
@@ -1249,7 +1249,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return

-	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD)
+	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD)

 	var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list

@@ -1277,6 +1277,22 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			var/turf/startT = spaceDebrisStartLoc(startside, T.z)
 			var/turf/endT = spaceDebrisFinishLoc(startside, T.z)
 			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()
+			pod.damage = 40
+			pod.explosionSize = list(0,0,0,2)
+			pod.effectStun = TRUE
+			if (isnull(target_path)) //The user pressed "Cancel"
+				return
+			if (target_path != "empty")//if you didn't type empty, we want to load the pod with a delivery
+				var/delivery = text2path(target_path)
+				if(!ispath(delivery))
+					delivery = pick_closest_path(target_path)
+					if(!delivery)
+						alert("ERROR: Incorrect / improper path given.")
+				new delivery(pod)
+			new /obj/effect/abstract/DPtarget(get_turf(target), pod)
 		if(ADMIN_PUNISHMENT_SUPPLYPOD)
 			var/datum/centcom_podlauncher/plaunch  = new(usr)
 			if(!holder)
@@ -1289,6 +1305,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			plaunch.temp_pod.explosionSize = list(0,0,0,2)
 			plaunch.temp_pod.effectStun = TRUE
 			plaunch.ui_interact(usr)
+			return //We return here because punish_log() is handled by the centcom_podlauncher datum

 		if(ADMIN_PUNISHMENT_MAZING)
 			if(!puzzle_imprison(target))
@@ -1298,11 +1315,13 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target))
 			creamy.splat(target)

-	var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
-	message_admins(msg)
-	admin_ticket_log(target, msg)
-	log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")
+	punish_log(target, punishment)

+/client/proc/punish_log(var/whom, var/punishment)
+	var/msg = "[key_name_admin(usr)] punished [key_name_admin(whom)] with [punishment]."
+	message_admins(msg)
+	admin_ticket_log(whom, msg)
+	log_admin("[key_name(usr)] punished [key_name(whom)] with [punishment].")

 /client/proc/trigger_centcom_recall()
 	if(!check_rights(R_ADMIN))
@@ -16,10 +16,10 @@
 	var/obj/chosen_obj = text2path(chosen)

 	var/list/settings = list(
-    "mainsettings" = list(
-      "name" = list("desc" = "Name", "type" = "string", "value" = "Bob"),
+		"mainsettings" = list(
+			"name" = list("desc" = "Name", "type" = "string", "value" = "Bob"),
 			"maxhealth" = list("desc" = "Max. health", "type" = "number", "value" = 100),
-      "access" = list("desc" = "Access ID", "type" = "datum", "path" = "/obj/item/card/id", "value" = "Default"),
+			"access" = list("desc" = "Access ID", "type" = "datum", "path" = "/obj/item/card/id", "value" = "Default"),
 			"objtype" = list("desc" = "Base obj type", "type" = "datum", "path" = "/obj", "value" = "[chosen]"),
 			"googlyeyes" = list("desc" = "Googly eyes", "type" = "boolean", "value" = "No"),
 			"disableai" = list("desc" = "Disable AI", "type" = "boolean", "value" = "Yes"),
@@ -27,7 +27,7 @@
 			"dropitem" = list("desc" = "Drop obj on death", "type" = "boolean", "value" = "Yes"),
 			"mobtype" = list("desc" = "Base mob type", "type" = "datum", "path" = "/mob/living/simple_animal/hostile/mimic/copy", "value" = "/mob/living/simple_animal/hostile/mimic/copy"),
 			"ckey" = list("desc" = "ckey", "type" = "ckey", "value" = "none"),
-    )
+	)
 	)

 	var/list/prefreturn = presentpreflikepicker(usr,"Customize mob", "Customize mob", Button1="Ok", width = 450, StealFocus = 1,Timeout = 0, settings=settings)
@@ -96,7 +96,6 @@ GLOBAL_LIST_EMPTY(antagonists)
 		LAZYREMOVE(owner.antag_datums, src)
 		if(!silent && owner.current)
 			farewell()
-		owner.objectives -= objectives
 	var/datum/team/team = get_team()
 	if(team)
 		team.remove_member(owner)
@@ -132,14 +131,14 @@ GLOBAL_LIST_EMPTY(antagonists)
 	report += printplayer(owner)

 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		report += printobjectives(owner)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		report += printobjectives(objectives)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break

-	if(owner.objectives.len == 0 || objectives_complete)
+	if(objectives.len == 0 || objectives_complete)
 		report += "<span class='greentext big'>The [name] was successful!</span>"
 	else
 		report += "<span class='redtext big'>The [name] has failed!</span>"
@@ -216,25 +215,6 @@ GLOBAL_LIST_EMPTY(antagonists)
 		return
 	antag_memory = new_memo

-//This datum will autofill the name with special_role
-//Used as placeholder for minor antagonists, please create proper datums for these
-/datum/antagonist/auto_custom
-	show_in_antagpanel = FALSE
-	antagpanel_category = "Other"
-	show_name_in_check_antagonists = TRUE
-
-/datum/antagonist/auto_custom/on_gain()
-	..()
-	name = owner.special_role
-	//Add all objectives not already owned by other datums to this one.
-	var/list/already_registered_objectives = list()
-	for(var/datum/antagonist/A in owner.antag_datums)
-		if(A == src)
-			continue
-		else
-			already_registered_objectives |= A.objectives
-	objectives = owner.objectives - already_registered_objectives
-
 //This one is created by admin tools for custom objectives
 /datum/antagonist/custom
 	antagpanel_category = "Custom"
@@ -56,7 +56,7 @@
 			if(used)
 				to_chat(H, "You already used this contract!")
 				return
-			var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src)
+			var/list/candidates = pollCandidatesForMob("Do you want to play as a wizard's [href_list["school"]] apprentice?", ROLE_WIZARD, null, ROLE_WIZARD, 150, src, ignore_category = POLL_IGNORE_WIZARD)
 			if(LAZYLEN(candidates))
 				if(QDELETED(src))
 					return
@@ -182,6 +182,10 @@
 	name = "syndicate medical teleporter"
 	borg_to_spawn = "Medical"

+/obj/item/antag_spawner/nuke_ops/borg_tele/saboteur
+	name = "syndicate saboteur teleporter"
+	borg_to_spawn = "Saboteur"
+
 /obj/item/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T, kind, datum/mind/user)
 	var/mob/living/silicon/robot/R
 	var/datum/antagonist/nukeop/creator_op = user.has_antag_datum(/datum/antagonist/nukeop,TRUE)
@@ -191,6 +195,8 @@
 	switch(borg_to_spawn)
 		if("Medical")
 			R = new /mob/living/silicon/robot/modules/syndicate/medical(T)
+		if("Saboteur")
+			R = new /mob/living/silicon/robot/modules/syndicate/saboteur(T)
 		else
 			R = new /mob/living/silicon/robot/modules/syndicate(T) //Assault borg by default

@@ -235,7 +241,7 @@
 		return
 	if(used)
 		return
-	var/list/candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", ROLE_ALIEN, null, ROLE_ALIEN, 50, src)
+	var/list/candidates = pollCandidatesForMob("Do you want to play as a [initial(demon_type.name)]?", ROLE_ALIEN, null, ROLE_ALIEN, 50, src, ignore_category = POLL_IGNORE_DEMON)
 	if(LAZYLEN(candidates))
 		if(used || QDELETED(src))
 			return
@@ -393,23 +393,22 @@
 	name = "Dissection Guide"
 	icon_state = "alienpaper_words"
 	info = {"<b>Dissection for Dummies</b><br>
-
-<br>
- 1.Acquire fresh specimen.<br>
- 2.Put the specimen on operating table.<br>
- 3.Apply surgical drapes, preparing for experimental dissection.<br>
- 4.Apply scalpel to specimen's torso.<br>
- 5.Clamp bleeders on specimen's torso with a hemostat.<br>
- 6.Retract skin of specimen's torso with a retractor.<br>
- 7.Apply scalpel again to specimen's torso.<br>
- 8.Search through the specimen's torso with your hands to remove any superfluous organs.<br>
- 9.Insert replacement gland (Retrieve one from gland storage).<br>
- 10.Consider dressing the specimen back to not disturb the habitat. <br>
- 11.Put the specimen in the experiment machinery.<br>
- 12.Choose one of the machine options. The target will be analyzed and teleported to the selected drop-off point.<br>
- 13.You will receive one supply credit, and the subject will be counted towards your quota.<br>
-<br>
-Congratulations! You are now trained for invasive xenobiology research!"}
+		<br>
+		1.Acquire fresh specimen.<br>
+		2.Put the specimen on operating table.<br>
+		3.Apply surgical drapes, preparing for experimental dissection.<br>
+		4.Apply scalpel to specimen's torso.<br>
+		5.Clamp bleeders on specimen's torso with a hemostat.<br>
+		6.Retract skin of specimen's torso with a retractor.<br>
+		7.Apply scalpel again to specimen's torso.<br>
+		8.Search through the specimen's torso with your hands to remove any superfluous organs.<br>
+		9.Insert replacement gland (Retrieve one from gland storage).<br>
+		10.Consider dressing the specimen back to not disturb the habitat. <br>
+		11.Put the specimen in the experiment machinery.<br>
+		12.Choose one of the machine options. The target will be analyzed and teleported to the selected drop-off point.<br>
+		13.You will receive one supply credit, and the subject will be counted towards your quota.<br>
+		<br>
+		Congratulations! You are now trained for invasive xenobiology research!"}

 /obj/item/paper/guides/antag/abductor/update_icon()
 	return
@@ -612,16 +611,16 @@ Congratulations! You are now trained for invasive xenobiology research!"}
 	. = ..()

 /obj/item/abductor_baton/examine(mob/user)
-	..()
+	. = ..()
 	switch(mode)
 		if(BATON_STUN)
-			to_chat(user, "<span class='warning'>The baton is in stun mode.</span>")
+			. += "<span class='warning'>The baton is in stun mode.</span>"
 		if(BATON_SLEEP)
-			to_chat(user, "<span class='warning'>The baton is in sleep inducement mode.</span>")
+			. += "<span class='warning'>The baton is in sleep inducement mode.</span>"
 		if(BATON_CUFF)
-			to_chat(user, "<span class='warning'>The baton is in restraining mode.</span>")
+			. += "<span class='warning'>The baton is in restraining mode.</span>"
 		if(BATON_PROBE)
-			to_chat(user, "<span class='warning'>The baton is in probing mode.</span>")
+			. += "<span class='warning'>The baton is in probing mode.</span>"

 /obj/item/radio/headset/abductor
 	name = "alien headset"
@@ -24,7 +24,7 @@
 			for(var/obj/item/abductor/gizmo/G in B.contents)
 				console.AddGizmo(G)

-/datum/outfit/abductor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/abductor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
 	..()
 	if(!visualsOnly)
 		link_to_console(H)
@@ -49,7 +49,7 @@
 		/obj/item/abductor/gizmo = 1
 		)

-/datum/outfit/abductor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+/datum/outfit/abductor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
 	..()
 	if(!visualsOnly)
 		var/obj/item/implant/abductor/beamplant = new
@@ -20,7 +20,7 @@
 /obj/item/organ/heart/gland/examine(mob/user)
 	. = ..()
 	if((user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_SCIENTIST_TRAINING)) || isobserver(user))
-		to_chat(user, "<span class='notice'>It is \a [true_name].</span>")
+		. += "<span class='notice'>It is \a [true_name].</span>"

 /obj/item/organ/heart/gland/proc/ownerCheck()
 	if(ishuman(owner))
@@ -73,7 +73,7 @@
 	clear_mind_control()
 	..()

-/obj/item/organ/heart/gland/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	if(special != 2 && uses) // Special 2 means abductor surgery
 		Start()
@@ -124,7 +124,7 @@
 	mind_control_uses = 1
 	mind_control_duration = 2400

-/obj/item/organ/heart/gland/slime/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/slime/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	owner.faction |= "slime"
 	owner.grant_language(/datum/language/slime)
@@ -286,7 +286,7 @@
 	mind_control_uses = 2
 	mind_control_duration = 900

-/obj/item/organ/heart/gland/electric/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/gland/electric/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, ORGAN_TRAIT)

@@ -17,9 +17,9 @@

 /obj/machinery/computer/camera_advanced/abductor/CreateEye()
 	..()
-	eyeobj.visible_icon = 1
-	eyeobj.icon = 'icons/obj/abductor.dmi'
-	eyeobj.icon_state = "camera_target"
+	eyeobj.visible_icon = TRUE
+	eyeobj.icon = 'icons/mob/cameramob.dmi'
+	eyeobj.icon_state = "generic_camera"

 /obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user)
 	..()
@@ -30,7 +30,6 @@
 	var/datum/objective/blob_takeover/main = new
 	main.owner = owner
 	objectives += main
-	owner.objectives |= objectives

 /datum/antagonist/blob/apply_innate_effects(mob/living/mob_override)
 	if(!isovermind(owner.current))
@@ -9,7 +9,7 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	name = "Blob Overmind"
 	real_name = "Blob Overmind"
 	desc = "The overmind. It controls the blob."
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/mob/cameramob.dmi'
 	icon_state = "marker"
 	mouse_opacity = MOUSE_OPACITY_ICON
 	move_on_shuttle = 1
@@ -170,9 +170,9 @@ GLOBAL_LIST_EMPTY(blob_nodes)
 	add_points(0)

 /mob/camera/blob/examine(mob/user)
-	..()
+	. = ..()
 	if(blob_reagent_datum)
-		to_chat(user, "Its chemical is <font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</font>.")
+		. += "Its chemical is <font color=\"[blob_reagent_datum.color]\">[blob_reagent_datum.name]</font>."

 /mob/camera/blob/update_health_hud()
 	if(blob_core)
@@ -243,18 +243,21 @@
 	else
 		return ..()

-/obj/structure/blob/proc/chemeffectreport(mob/user)
+/obj/structure/blob/proc/chemeffectreport()
+	RETURN_TYPE(/list)
+	. = list()
 	if(overmind)
-		to_chat(user, "<b>Material: <font color=\"[overmind.blob_reagent_datum.color]\">[overmind.blob_reagent_datum.name]</font><span class='notice'>.</span></b>")
-		to_chat(user, "<b>Material Effects:</b> <span class='notice'>[overmind.blob_reagent_datum.analyzerdescdamage]</span>")
-		to_chat(user, "<b>Material Properties:</b> <span class='notice'>[overmind.blob_reagent_datum.analyzerdesceffect]</span><br>")
+		. += "<b>Material: <font color=\"[overmind.blob_reagent_datum.color]\">[overmind.blob_reagent_datum.name]</font><span class='notice'>.</span></b>"
+		. += "<b>Material Effects:</b> <span class='notice'>[overmind.blob_reagent_datum.analyzerdescdamage]</span>"
+		. += "<b>Material Properties:</b> <span class='notice'>[overmind.blob_reagent_datum.analyzerdesceffect]</span><br>"
 	else
-		to_chat(user, "<b>No Material Detected!</b><br>")
+		. += "<b>No Material Detected!</b><br>"

-/obj/structure/blob/proc/typereport(mob/user)
-	to_chat(user, "<b>Blob Type:</b> <span class='notice'>[uppertext(initial(name))]</span>")
-	to_chat(user, "<b>Health:</b> <span class='notice'>[obj_integrity]/[max_integrity]</span>")
-	to_chat(user, "<b>Effects:</b> <span class='notice'>[scannerreport()]</span>")
+/obj/structure/blob/proc/typereport()
+	RETURN_TYPE(/list)
+	. = list("<b>Blob Type:</b> <span class='notice'>[uppertext(initial(name))]</span>")
+	. += "<b>Health:</b> <span class='notice'>[obj_integrity]/[max_integrity]</span>"
+	. += "<b>Effects:</b> <span class='notice'>[scannerreport()]</span>"

 /obj/structure/blob/attack_animal(mob/living/simple_animal/M)
 	if(ROLE_BLOB in M.faction) //sorry, but you can't kill the blob as a blobbernaut
@@ -310,20 +313,20 @@
 	return B

 /obj/structure/blob/examine(mob/user)
-	..()
+	. = ..()
 	var/datum/atom_hud/hud_to_check = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 	if(user.research_scanner || hud_to_check.hudusers[user])
-		to_chat(user, "<b>Your HUD displays an extensive report...</b><br>")
+		. += "<b>Your HUD displays an extensive report...</b><br>"
 		if(overmind)
-			to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
+			. += "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>"
 		else
-			to_chat(user, "<b>Core neutralized. Critical mass no longer attainable.</b>")
-		chemeffectreport(user)
-		typereport(user)
+			. += "<b>Core neutralized. Critical mass no longer attainable.</b>"
+		. += chemeffectreport()
+		. += typereport()
 	else
 		if(isobserver(user) && overmind)
-			to_chat(user, "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>")
-		to_chat(user, "It seems to be made of [get_chem_name()].")
+			. += "<b>Progress to Critical Mass:</b> <span class='notice'>[overmind.blobs_legit.len]/[overmind.blobwincount].</span>"
+		. += "It seems to be made of [get_chem_name()]."

 /obj/structure/blob/proc/scannerreport()
 	return "A generic blob. Looks like someone forgot to override this proc, adminhelp this."
@@ -0,0 +1,33 @@
+
+/datum/antagonist/blood_contract
+	name = "Blood Contract Target"
+	show_in_roundend = FALSE
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/blood_contract/on_gain()
+	. = ..()
+	give_objective()
+	start_the_hunt()
+
+/datum/antagonist/blood_contract/proc/give_objective()
+	var/datum/objective/survive/survive = new
+	survive.owner = owner
+	objectives += survive
+
+/datum/antagonist/blood_contract/greet()
+	. = ..()
+	to_chat(owner, "<span class='userdanger'>You've been marked for death! Don't let the demons get you! KILL THEM ALL!</span>")
+
+/datum/antagonist/blood_contract/proc/start_the_hunt()
+	var/mob/living/carbon/human/H = owner.current
+	if(!istype(H))
+		return
+	H.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
+	var/obj/effect/mine/pickup/bloodbath/B = new(H)
+	INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine
+
+	for(var/mob/living/carbon/human/P in GLOB.player_list)
+		if(P == H)
+			continue
+		to_chat(P, "<span class='userdanger'>You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!</span>")
+		P.put_in_hands(new /obj/item/kitchen/knife/butcher(P), TRUE)
@@ -9,7 +9,6 @@
 		for(var/O in directives)
 			var/datum/objective/brainwashing/objective = new(O)
 			B.objectives += objective
-			M.objectives += objective
 		B.greet()
 	else
 		B = new()
@@ -32,10 +31,6 @@
 	antagpanel_category = "Other"
 	show_name_in_check_antagonists = TRUE

-/datum/antagonist/brainwashed/on_gain()
-	owner.objectives |= objectives
-	. = ..()
-
 /datum/antagonist/brainwashed/greet()
 	to_chat(owner, "<span class='warning'>Your mind reels as it begins focusing on a single purpose...</span>")
 	to_chat(owner, "<big><span class='warning'><b>Follow the Directives, at any cost!</b></span></big>")
@@ -20,7 +20,6 @@
 /datum/antagonist/brother/on_gain()
 	SSticker.mode.brothers += owner
 	objectives += team.objectives
-	owner.objectives += objectives
 	owner.special_role = special_role
 	finalize_brother()
 	return ..()
@@ -459,8 +459,6 @@
 			objectives += identity_theft
 		escape_objective_possible = FALSE

-	owner.objectives |= objectives
-
 /datum/antagonist/changeling/proc/update_changeling_icons_added()
 	var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_CHANGELING]
 	hud.join_hud(owner.current)
@@ -334,7 +334,7 @@
 /obj/item/projectile/tentacle/proc/tentacle_stab(mob/living/carbon/human/H, mob/living/carbon/C)
 	if(H.Adjacent(C))
 		for(var/obj/item/I in H.held_items)
-			if(I.is_sharp())
+			if(I.get_sharpness())
 				C.visible_message("<span class='danger'>[H] impales [C] with [H.p_their()] [I.name]!</span>", "<span class='userdanger'>[H] impales you with [H.p_their()] [I.name]!</span>")
 				C.apply_damage(I.force, BRUTE, BODY_ZONE_CHEST)
 				H.do_item_attack_animation(C, used_item = I)
@@ -21,5 +21,5 @@
 /obj/effect/clockwork/examine(mob/user)
 	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
-	..()
+	. = ..()
 	desc = initial(desc)
@@ -6,6 +6,7 @@
 /obj/effect/clockwork/overlay/examine(mob/user)
 	if(linked)
 		linked.examine(user)
+	return ..()

 /obj/effect/clockwork/overlay/ex_act()
 	return FALSE
@@ -147,6 +147,11 @@
 		if(iscarbon(L))
 			var/mob/living/carbon/M = L
 			M.uncuff()
+		var/brutedamage = L.getBruteLoss()
+		var/burndamage = L.getFireLoss()
+		if(brutedamage || burndamage)
+			L.adjustBruteLoss(-(brutedamage * 0.25))
+			L.adjustFireLoss(-(burndamage * 0.25))
 	L.Knockdown(50) //Completely defenseless for five seconds - mainly to give them time to read over the information they've just been presented with
 	if(iscarbon(L))
 		var/mob/living/carbon/C = L
@@ -191,15 +196,15 @@
 		..()

 /obj/effect/clockwork/sigil/transmission/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		var/structure_number = 0
 		for(var/obj/structure/destructible/clockwork/powered/P in range(SIGIL_ACCESS_RANGE, src))
 			structure_number++
-		to_chat(user, "<span class='[get_clockwork_power() ? "brass":"alloy"]'>It is storing <b>[DisplayPower(get_clockwork_power())]</b> of shared power, \
-		and <b>[structure_number]</b> clockwork structure[structure_number == 1 ? " is":"s are"] in range.</span>")
+		. += "<span class='[get_clockwork_power() ? "brass":"alloy"]'>It is storing <b>[DisplayPower(get_clockwork_power())]</b> of shared power, \
+		and <b>[structure_number]</b> clockwork structure[structure_number == 1 ? " is":"s are"] in range.</span>"
 		if(iscyborg(user))
-			to_chat(user, "<span class='brass'>You can recharge from the [sigil_name] by crossing it.</span>")
+			. += "<span class='brass'>You can recharge from the [sigil_name] by crossing it.</span>"

 /obj/effect/clockwork/sigil/transmission/sigil_effects(mob/living/L)
 	if(is_servant_of_ratvar(L))
@@ -262,7 +267,7 @@
 	clockwork_desc = "A sigil that will drain non-Servants that remain on it. Servants that remain on it will be healed if it has any vitality drained."
 	icon_state = "sigilvitality"
 	layer = SIGIL_LAYER
-	alpha = 75
+	alpha = 125
 	color = "#123456"
 	affects_servants = TRUE
 	stat_affected = DEAD
@@ -274,13 +279,13 @@
 	var/static/list/damage_heal_order = list(CLONE, TOX, BURN, BRUTE, OXY) //we heal damage in this order

 /obj/effect/clockwork/sigil/vitality/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='[GLOB.clockwork_vitality ? "inathneq_small":"alloy"]'>It has access to <b>[GLOB.ratvar_awakens ? "INFINITE":GLOB.clockwork_vitality]</b> units of vitality.</span>")
+		. += "<span class='[GLOB.clockwork_vitality ? "inathneq_small":"alloy"]'>It has access to <b>[GLOB.ratvar_awakens ? "INFINITE":GLOB.clockwork_vitality]</b> units of vitality.</span>"
 		if(GLOB.ratvar_awakens)
-			to_chat(user, "<span class='inathneq_small'>It can revive Servants at no cost!</span>")
+			. += "<span class='inathneq_small'>It can revive Servants at no cost!</span>"
 		else
-			to_chat(user, "<span class='inathneq_small'>It can revive Servants at a cost of <b>[revive_cost]</b> vitality.</span>")
+			. += "<span class='inathneq_small'>It can revive Servants at a cost of <b>[revive_cost]</b> vitality.</span>"

 /obj/effect/clockwork/sigil/vitality/sigil_effects(mob/living/L)
 	if((is_servant_of_ratvar(L) && L.suiciding) || sigil_active)
@@ -53,9 +53,9 @@
 	return TRUE

 /obj/effect/clockwork/spatial_gateway/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='brass'>It has [uses] use\s remaining.</span>")
+		. += "<span class='brass'>It has [uses] use\s remaining.</span>"

 //ATTACK GHOST IGNORING PARENT RETURN VALUE
 /obj/effect/clockwork/spatial_gateway/attack_ghost(mob/user)
@@ -20,5 +20,5 @@
 /obj/item/clockwork/examine(mob/user)
 	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
-	..()
+	. = ..()
 	desc = initial(desc)
@@ -12,7 +12,7 @@
 /obj/item/clockwork/component/examine(mob/user)
 	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='[get_component_span(component_id)]'>You can activate this in your hand to break it down for power.</span>")
+		. += "<span class='[get_component_span(component_id)]'>You can activate this in your hand to break it down for power.</span>"

 /obj/item/clockwork/component/attack_self(mob/living/user)
 	if(is_servant_of_ratvar(user))
@@ -181,9 +181,9 @@
 		pixel_y = rand(-sprite_shift, sprite_shift)

 /obj/item/clockwork/alloy_shards/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='brass'>Can be consumed by a replica fabricator as a source of power.</span>")
+		. += "<span class='brass'>Can be consumed by a replica fabricator as a source of power.</span>"

 /obj/item/clockwork/alloy_shards/proc/replace_name_desc()
 	name = "replicant alloy shard"
@@ -27,11 +27,11 @@
 		armour_penetration = initial(armour_penetration)

 /obj/item/clockwork/weapon/ratvarian_spear/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='inathneq_small'>Attacks on living non-Servants will generate <b>[bonus_burn]</b> units of vitality.</span>")
+		. += "<span class='inathneq_small'>Attacks on living non-Servants will generate <b>[bonus_burn]</b> units of vitality.</span>"
 		if(!iscyborg(user))
-			to_chat(user, "<span class='brass'>Throwing the spear will do massive damage, break the spear, and knock down the target.</span>")
+			. += "<span class='brass'>Throwing the spear will do massive damage, break the spear, and knock down the target.</span>"

 /obj/item/clockwork/weapon/ratvarian_spear/attack(mob/living/target, mob/living/carbon/human/user)
 	. = ..()
@@ -64,7 +64,7 @@

 /obj/item/clockwork/slab/cyborg/janitor //six scriptures, plus a fabricator
 	quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/create_object/replicant, /datum/clockwork_scripture/create_object/sigil_of_transgression, \
-	 /datum/clockwork_scripture/create_object/stargazer, /datum/clockwork_scripture/create_object/ocular_warden, /datum/clockwork_scripture/create_object/mania_motor)
+	/datum/clockwork_scripture/create_object/stargazer, /datum/clockwork_scripture/create_object/ocular_warden, /datum/clockwork_scripture/create_object/mania_motor)

 /obj/item/clockwork/slab/cyborg/service //six scriptures, plus xray vision
 	quickbound = list(/datum/clockwork_scripture/abscond, /datum/clockwork_scripture/create_object/replicant,/datum/clockwork_scripture/create_object/stargazer, \
@@ -121,15 +121,15 @@
 	adjust_clockwork_power(0.1) //Slabs serve as very weak power generators on their own (no, not enough to justify spamming them)

 /obj/item/clockwork/slab/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		if(LAZYLEN(quickbound))
 			for(var/i in 1 to quickbound.len)
 				if(!quickbound[i])
 					continue
 				var/datum/clockwork_scripture/quickbind_slot = quickbound[i]
-				to_chat(user, "<b>Quickbind</b> button: <span class='[get_component_span(initial(quickbind_slot.primary_component))]'>[initial(quickbind_slot.name)]</span>.")
-		to_chat(user, "<b>Available power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())].</span>")
+				. += "<b>Quickbind</b> button: <span class='[get_component_span(initial(quickbind_slot.primary_component))]'>[initial(quickbind_slot.name)]</span>."
+		. += "<b>Available power:</b> <span class='bold brass'>[DisplayPower(get_clockwork_power())].</span>"

 //Slab actions; Hierophant, Quickbind
 /obj/item/clockwork/slab/ui_action_click(mob/user, action)
@@ -15,7 +15,7 @@
 	. = ..()
 	var/area/A = get_area(src)
 	if(A && construct_type)
-		notify_ghosts("A [construct_name] chassis has been created in [A.name]!", 'sound/magic/clockwork/fellowship_armory.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_CONSTRUCT)
+		notify_ghosts("A [construct_name] chassis has been created in [A.name]!", 'sound/magic/clockwork/fellowship_armory.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_CONSTRUCT, ignore_dnr_observers = TRUE)
 	GLOB.poi_list += src
 	LAZYADD(GLOB.mob_spawners[name], src)

@@ -28,7 +28,7 @@

 /obj/item/clockwork/construct_chassis/examine(mob/user)
 	clockwork_desc = "[clockwork_desc]<br>[construct_desc]"
-	..()
+	. = ..()
 	clockwork_desc = initial(clockwork_desc)

 //ATTACK HAND IGNORING PARENT RETURN VALUE
@@ -39,7 +39,9 @@
 	. = ..()

 //ATTACK GHOST IGNORING PARENT RETURN VALUE
-/obj/item/clockwork/construct_chassis/attack_ghost(mob/user)
+/obj/item/clockwork/construct_chassis/attack_ghost(mob/dead/observer/user)
+	if(!user.can_reenter_round())
+		return FALSE
 	if(!SSticker.mode)
 		to_chat(user, "<span class='danger'>You cannot use that before the game has started.</span>")
 		return
@@ -44,16 +44,16 @@
 		speed_multiplier = initial(speed_multiplier)

 /obj/item/clockwork/replica_fabricator/examine(mob/living/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='brass'>Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.</span>")
-		to_chat(user, "<span class='brass'>Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.</span>")
+		. += "<span class='brass'>Can be used to replace walls, floors, tables, windows, windoors, and airlocks with Clockwork variants.</span>"
+		. += "<span class='brass'>Can construct Clockwork Walls on Clockwork Floors and deconstruct Clockwork Walls to Clockwork Floors.</span>"
 		if(uses_power)
-			to_chat(user, "<span class='alloy'>It can consume floor tiles, rods, metal, and plasteel for power at rates of <b>2:[DisplayPower(POWER_ROD)]</b>, <b>1:[DisplayPower(POWER_ROD)]</b>, <b>1:[DisplayPower(POWER_METAL)]</b>, \
-			and <b>1:[DisplayPower(POWER_PLASTEEL)]</b>, respectively.</span>")
-			to_chat(user, "<span class='alloy'>It can also consume brass sheets for power at a rate of <b>1:[DisplayPower(POWER_FLOOR)]</b>.</span>")
-			to_chat(user, "<span class='alloy'>Use it in-hand to produce <b>5</b> brass sheets at a cost of <b>[DisplayPower(POWER_WALL_TOTAL)]</b> power.</span>")
-			to_chat(user, "<span class='alloy'>It has access to <b>[DisplayPower(get_clockwork_power())]</b> of power.</span>")
+			. += "<span class='alloy'>It can consume floor tiles, rods, metal, and plasteel for power at rates of <b>2:[DisplayPower(POWER_ROD)]</b>, <b>1:[DisplayPower(POWER_ROD)]</b>, <b>1:[DisplayPower(POWER_METAL)]</b>, \
+			and <b>1:[DisplayPower(POWER_PLASTEEL)]</b>, respectively.</span>"
+			. += "<span class='alloy'>It can also consume brass sheets for power at a rate of <b>1:[DisplayPower(POWER_FLOOR)]</b>.</span>"
+			. += "<span class='alloy'>Use it in-hand to produce <b>5</b> brass sheets at a cost of <b>[DisplayPower(POWER_WALL_TOTAL)]</b> power.</span>"
+			. += "<span class='alloy'>It has access to <b>[DisplayPower(get_clockwork_power())]</b> of power.</span>"

 /obj/item/clockwork/replica_fabricator/attack_self(mob/living/user)
 	if(is_servant_of_ratvar(user))
@@ -39,7 +39,7 @@
 /obj/item/mmi/posibrain/soul_vessel/examine(mob/user)
 	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
-	..()
+	. = ..()
 	desc = initial(desc)

 /obj/item/mmi/posibrain/soul_vessel/transfer_personality(mob/candidate)
@@ -57,7 +57,7 @@
 		msg += "[addendum]\n"
 	msg += "*---------*</span>"

-	to_chat(user, msg)
+	return list(msg)

 /mob/living/simple_animal/hostile/clockwork/proc/examine_info() //Override this on a by-mob basis to have unique examine info
 	return
@@ -80,7 +80,7 @@
 	power_cost = 125
 	whispered = TRUE
 	object_path = /obj/effect/clockwork/sigil/submission
-	creator_message = "<span class='brass'>A luminous sigil appears below you. Any non-Servants to cross it will be converted after 8 seconds if they do not move.</span>"
+	creator_message = "<span class='brass'>A luminous sigil appears below you. Any non-Servants to cross it will be converted and healed of some of their wounds after 8 seconds if they do not move.</span>"
 	usage_tip = "This is the primary conversion method, though it will not penetrate mindshield implants."
 	tier = SCRIPTURE_DRIVER
 	one_per_tile = TRUE
@@ -43,10 +43,10 @@
 	var/can_see_clockwork = is_servant_of_ratvar(user) || isobserver(user)
 	if(can_see_clockwork && clockwork_desc)
 		desc = clockwork_desc
-	..()
+	. = ..()
 	desc = initial(desc)
 	if(unanchored_icon)
-		to_chat(user, "<span class='notice'>[src] is [anchored ? "":"not "]secured to the floor.</span>")
+		. += "<span class='notice'>[src] is [anchored ? "":"not "]secured to the floor.</span>"

 /obj/structure/destructible/clockwork/examine_status(mob/user)
 	if(is_servant_of_ratvar(user) || isobserver(user))
@@ -155,12 +155,12 @@
 	var/inactive_icon = null //icon_state while process() isn't being called

 /obj/structure/destructible/clockwork/powered/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		if(!can_access_clockwork_power(src))
-			to_chat(user, "<span class='alloy'>It has no access to the power network! Create a sigil of transmission nearby.</span>")
+			. += "<span class='alloy'>It has no access to the power network! Create a sigil of transmission nearby.</span>"
 		else
-			to_chat(user, "<span class='brass'>It has access to <b>[DisplayPower(get_clockwork_power())]</b> of power.</span>")
+			. += "<span class='brass'>It has access to <b>[DisplayPower(get_clockwork_power())]</b> of power.</span>"

 /obj/structure/destructible/clockwork/powered/Destroy()
 	SSfastprocess.processing -= src
@@ -16,16 +16,16 @@
 	return ..()

 /obj/structure/destructible/clockwork/trap/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "It's wired to:")
+		. += "It's wired to:"
 		if(!wired_to.len)
-			to_chat(user, "Nothing.")
+			. += "Nothing."
 		else
 			for(var/V in wired_to)
 				var/obj/O = V
 				var/distance = get_dist(src, O)
-				to_chat(user, "[O] ([distance == 0 ? "same tile" : "[distance] tiles [dir2text(get_dir(src, O))]"])")
+				. += "[O] ([distance == 0 ? "same tile" : "[distance] tiles [dir2text(get_dir(src, O))]"])"

 /obj/structure/destructible/clockwork/trap/wrench_act(mob/living/user, obj/item/I)
 	if(!is_servant_of_ratvar(user))
@@ -71,6 +71,7 @@
 	return TRUE

 /obj/structure/destructible/clockwork/trap/proc/activate()
+	return

 //These objects send signals to normal traps to activate
 /obj/structure/destructible/clockwork/trap/trigger
@@ -79,6 +80,14 @@
 	break_message = "<span class='warning'>The trigger breaks apart!</span>"
 	density = FALSE

+/obj/structure/destructible/clockwork/trap/trigger/Initialize()
+	. = ..()
+	for(var/obj/structure/destructible/clockwork/trap/T in get_turf(src))
+		if(!istype(T, /obj/structure/destructible/clockwork/trap/trigger))
+			wired_to += T
+			T.wired_to += src
+			to_chat(usr, "<span class='alloy'>[src] automatically links with [T] beneath it.</span>")
+
 /obj/structure/destructible/clockwork/trap/trigger/activate()
 	for(var/obj/structure/destructible/clockwork/trap/T in wired_to)
 		if(istype(T, /obj/structure/destructible/clockwork/trap/trigger)) //Triggers don't go off multiple times
@@ -223,34 +223,34 @@

 /obj/structure/destructible/clockwork/massive/celestial_gateway/examine(mob/user)
 	icon_state = "spatial_gateway" //cheat wildly by pretending to have an icon
-	..()
+	. = ..()
 	icon_state = initial(icon_state)
 	if(is_servant_of_ratvar(user) || isobserver(user))
 		if(!active)
-			to_chat(user, "<span class='big'><b>Time until the Ark's activation:</b> [DisplayTimeText(get_arrival_time())]</span>")
+			. += "<span class='big'><b>Time until the Ark's activation:</b> [DisplayTimeText(get_arrival_time())]</span>"
 		else
 			if(grace_period)
-				to_chat(user, "<span class='big'><b>Crew grace period time remaining:</b> [DisplayTimeText(get_arrival_time())]</span>")
+				. += "<span class='big'><b>Crew grace period time remaining:</b> [DisplayTimeText(get_arrival_time())]</span>"
 			else
-				to_chat(user, "<span class='big'><b>Time until Ratvar's arrival:</b> [DisplayTimeText(get_arrival_time())]</span>")
+				. += "<span class='big'><b>Time until Ratvar's arrival:</b> [DisplayTimeText(get_arrival_time())]</span>"
 				switch(progress_in_seconds)
 					if(-INFINITY to GATEWAY_REEBE_FOUND)
-						to_chat(user, "<span class='heavy_brass'>The Ark is feeding power into the bluespace field.</span>")
+						. += "<span class='heavy_brass'>The Ark is feeding power into the bluespace field.</span>"
 					if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING)
-						to_chat(user, "<span class='heavy_brass'>The field is ripping open a copy of itself in Ratvar's prison.</span>")
+						. += "<span class='heavy_brass'>The field is ripping open a copy of itself in Ratvar's prison.</span>"
 					if(GATEWAY_RATVAR_COMING to INFINITY)
-						to_chat(user, "<span class='heavy_brass'>With the bluespace field established, Ratvar is preparing to come through!</span>")
+						. += "<span class='heavy_brass'>With the bluespace field established, Ratvar is preparing to come through!</span>"
 	else
 		if(!active)
-			to_chat(user, "<span class='warning'>Whatever it is, it doesn't seem to be active.</span>")
+			. += "<span class='warning'>Whatever it is, it doesn't seem to be active.</span>"
 		else
 			switch(progress_in_seconds)
 				if(-INFINITY to GATEWAY_REEBE_FOUND)
-					to_chat(user, "<span class='warning'>You see a swirling bluespace anomaly steadily growing in intensity.</span>")
+					. += "<span class='warning'>You see a swirling bluespace anomaly steadily growing in intensity.</span>"
 				if(GATEWAY_REEBE_FOUND to GATEWAY_RATVAR_COMING)
-					to_chat(user, "<span class='warning'>The anomaly is stable, and you can see flashes of something from it.</span>")
+					. += "<span class='warning'>The anomaly is stable, and you can see flashes of something from it.</span>"
 				if(GATEWAY_RATVAR_COMING to INFINITY)
-					to_chat(user, "<span class='boldwarning'>The anomaly is stable! Something is coming through!</span>")
+					. += "<span class='boldwarning'>The anomaly is stable! Something is coming through!</span>"

 /obj/structure/destructible/clockwork/massive/celestial_gateway/process()
 	if(seconds_until_activation == -1) //we never do anything
@@ -21,9 +21,9 @@
 	toggle(1)

 /obj/structure/destructible/clockwork/powered/clockwork_obelisk/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='nzcrentr_small'>It requires <b>[DisplayPower(hierophant_cost)]</b> to broadcast over the Hierophant Network, and <b>[DisplayPower(gateway_cost)]</b> to open a Spatial Gateway.</span>")
+		. += "<span class='nzcrentr_small'>It requires <b>[DisplayPower(hierophant_cost)]</b> to broadcast over the Hierophant Network, and <b>[DisplayPower(gateway_cost)]</b> to open a Spatial Gateway.</span>"

 /obj/structure/destructible/clockwork/powered/clockwork_obelisk/can_be_unfasten_wrench(mob/user, silent)
 	if(active)
@@ -47,16 +47,16 @@
 		STOP_PROCESSING(SSprocessing, src)

 /obj/structure/destructible/clockwork/heralds_beacon/examine(mob/user)
-	..()
+	. = ..()
 	if(isobserver(user) || is_servant_of_ratvar(user))
 		if(!available)
 			if(!GLOB.ratvar_approaches)
-				to_chat(user, "<span class='bold alloy'>It can no longer be activated.</span>")
+				. += "<span class='bold alloy'>It can no longer be activated.</span>"
 			else
-				to_chat(user, "<span class='bold neovgre_small'>It has been activated!</span>")
+				. += "<span class='bold neovgre_small'>It has been activated!</span>"
 		else
-			to_chat(user, "<span class='brass'>There are <b>[time_remaining]</b> second[time_remaining != 1 ? "s" : ""] remaining to vote.</span>")
-			to_chat(user, "<span class='big brass'>There are <b>[voters.len]/[votes_needed]</b> votes to activate the beacon!</span>")
+			. += "<span class='brass'>There are <b>[time_remaining]</b> second[time_remaining != 1 ? "s" : ""] remaining to vote.</span>"
+			. += "<span class='big brass'>There are <b>[voters.len]/[votes_needed]</b> votes to activate the beacon!</span>"

 /obj/structure/destructible/clockwork/heralds_beacon/attack_hand(mob/living/user)
 	. = ..()
@@ -17,9 +17,9 @@
 	var/mania_cost = 150

 /obj/structure/destructible/clockwork/powered/mania_motor/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user) || isobserver(user))
-		to_chat(user, "<span class='sevtug_small'>It requires <b>[DisplayPower(mania_cost)]</b> to run.</span>")
+		. += "<span class='sevtug_small'>It requires <b>[DisplayPower(mania_cost)]</b> to run.</span>"

 /obj/structure/destructible/clockwork/powered/mania_motor/forced_disable(bad_effects)
 	if(active)
@@ -25,8 +25,8 @@
 	return ..()

 /obj/structure/destructible/clockwork/ocular_warden/examine(mob/user)
-	..()
-	to_chat(user, "<span class='brass'>[target ? "<b>It's fixated on [target]!</b>" : "Its gaze is wandering aimlessly."]</span>")
+	. = ..()
+	. += "<span class='brass'>[target ? "<b>It's fixated on [target]!</b>" : "Its gaze is wandering aimlessly."]</span>"

 /obj/structure/destructible/clockwork/ocular_warden/hulk_damage()
 	return 25
@@ -110,9 +110,7 @@
 				if(!(BI.resistance_flags & ON_FIRE))
 					BI.fire_act()
 			continue
-		if(is_servant_of_ratvar(L) || (HAS_TRAIT(L, TRAIT_BLIND)) || L.anti_magic_check(TRUE, TRUE))
-			continue
-		if(L.stat || L.lying)
+		if(is_servant_of_ratvar(L) || (HAS_TRAIT(L, TRAIT_BLIND)) || L.anti_magic_check(TRUE, TRUE) || L.incapacitated(TRUE))
 			continue
 		if (iscarbon(L))
 			var/mob/living/carbon/c = L
@@ -25,11 +25,11 @@
 	. = ..()

 /obj/structure/destructible/clockwork/stargazer/examine(mob/user)
-	..()
+	. = ..()
 	if(is_servant_of_ratvar(user))
-		to_chat(user, "<span class='nzcrentr_small'>Generates <b>[DisplayPower(STARGAZER_POWER)]</b> per second while viewing starlight within [STARGAZER_RANGE] tiles.</span>")
+		. += "<span class='nzcrentr_small'>Generates <b>[DisplayPower(STARGAZER_POWER)]</b> per second while viewing starlight within [STARGAZER_RANGE] tiles.</span>"
 	if(star_light_star_bright)
-		to_chat(user, "[is_servant_of_ratvar(user) ? "<span class='nzcrentr_small'>It can see starlight!</span>" : "It's shining brilliantly!"]")
+		. += "[is_servant_of_ratvar(user) ? "<span class='nzcrentr_small'>It can see starlight!</span>" : "It's shining brilliantly!"]"

 /obj/structure/destructible/clockwork/stargazer/process()
 	star_light_star_bright = check_starlight()
@@ -7,18 +7,10 @@
 	icon_state = "pressure_sensor"
 	alpha = 50

-/obj/structure/destructible/clockwork/trap/trigger/Initialize()
-	. = ..()
-	for(var/obj/structure/destructible/clockwork/trap/T in get_turf(src))
-		if(!istype(T, /obj/structure/destructible/clockwork/trap/trigger))
-			wired_to += T
-			T.wired_to += src
-			to_chat(usr, "<span class='alloy'>[src] automatically links with [T] beneath it.</span>")
-
 /obj/structure/destructible/clockwork/trap/trigger/pressure_sensor/Crossed(atom/movable/AM)
 	if(isliving(AM) && !is_servant_of_ratvar(AM))
 		var/mob/living/L = AM
-		if(L.stat || L.m_intent == MOVE_INTENT_WALK || L.lying)
+		if(L.stat || L.m_intent == MOVE_INTENT_WALK || L.movement_type & (FLYING|FLOATING))
 			return
 		audible_message("<i>*click*</i>")
 		playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)
@@ -113,7 +113,7 @@
 		"<span class='danger'>You start tenderly lifting [skewee] off of [src]...</span>")
 		if(!do_after(user, 60, target = skewee))
 			skewee.visible_message("<span class='warning'>[skewee] painfully slides back down [src].</span>")
-			skewee.emote("moan")
+			skewee.say("Oof, ouch owwie!!", forced = "fail brass skewer removal")
 			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>")
@@ -651,7 +651,7 @@
 /obj/item/melee/blood_magic/manipulator/examine(mob/user)
 	. = ..()
 	if(iscultist(user))
-		to_chat(user, "<span class='cultitalic'>The [name] currently has <b>[uses]</b> blood charges left.</span>")
+		. += "<span class='cultitalic'>The [name] currently has <b>[uses]</b> blood charges left.</span>"

 /obj/item/melee/blood_magic/manipulator/afterattack(atom/target, mob/living/carbon/human/user, proximity)
 	if(proximity)
@@ -35,7 +35,6 @@

 /datum/antagonist/cult/proc/add_objectives()
 	objectives |= cult_team.objectives
-	owner.objectives |= objectives

 /datum/antagonist/cult/Destroy()
 	QDEL_NULL(communion)
@@ -119,10 +119,11 @@
 	AddComponent(/datum/component/butchering, 50, 80)

 /obj/item/twohanded/required/cult_bastard/examine(mob/user)
+	. = ..()
 	if(contents.len)
-		desc+="<br><b>There are [contents.len] souls trapped within the sword's core.</b>"
+		. += "<br><b>There are [contents.len] souls trapped within the sword's core.</b>"
 	else
-		desc+="<br>The sword appears to be quite lifeless."
+		. += "<br>The sword appears to be quite lifeless."

 /obj/item/twohanded/required/cult_bastard/can_be_pulled(user)
 	return FALSE
@@ -493,7 +494,7 @@
 	desc = "You peer within this smokey orb and glimpse terrible fates befalling the escape shuttle."
 	icon = 'icons/obj/cult.dmi'
 	icon_state ="shuttlecurse"
-	var/global/curselimit = 0
+	var/static/curselimit = 0

 /obj/item/shuttle_curse/attack_self(mob/living/user)
 	if(!iscultist(user))
@@ -530,7 +531,7 @@
 		playsound(user.loc, 'sound/effects/glassbr1.ogg', 50, 1)
 		qdel(src)
 		sleep(20)
-		var/global/list/curses
+		var/static/list/curses
 		if(!curses)
 			curses = list("A fuel technician just slit his own throat and begged for death.",
 			"The shuttle's navigation programming was replaced by a file containing just two words: IT COMES.",
@@ -557,11 +558,11 @@
 	var/uses = 4

 /obj/item/cult_shift/examine(mob/user)
-	..()
+	. = ..()
 	if(uses)
-		to_chat(user, "<span class='cult'>It has [uses] use\s remaining.</span>")
+		. += "<span class='cult'>It has [uses] use\s remaining.</span>"
 	else
-		to_chat(user, "<span class='cult'>It seems drained.</span>")
+		. += "<span class='cult'>It seems drained.</span>"

 /obj/item/cult_shift/proc/handle_teleport_grab(turf/T, mob/user)
 	var/mob/living/carbon/C = user
@@ -29,10 +29,10 @@


 /obj/structure/destructible/cult/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>\The [src] is [anchored ? "":"not "]secured to the floor.</span>")
+	. = ..()
+	. += "<span class='notice'>\The [src] is [anchored ? "":"not "]secured to the floor.</span>"
 	if((iscultist(user) || isobserver(user)) && cooldowntime > world.time)
-		to_chat(user, "<span class='cult italic'>The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>")
+		. += "<span class='cult italic'>The magic in [src] is too weak, [p_they()] will be ready to use again in [DisplayTimeText(cooldowntime - world.time)].</span>"

 /obj/structure/destructible/cult/examine_status(mob/user)
 	if(iscultist(user) || isobserver(user))
@@ -15,12 +15,12 @@ This file contains the cult dagger and rune list code
 			GLOB.rune_types[initial(R.cultist_name)] = R //Uses the cultist name for displaying purposes

 /obj/item/melee/cultblade/dagger/examine(mob/user)
-	..()
+	. = ..()
 	if(iscultist(user) || isobserver(user))
-		to_chat(user, "<span class='cult'>The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar'Sie.</span>")
-		to_chat(user, "<span class='cult'>Striking a cult structure will unanchor or reanchor it.</span>")
-		to_chat(user, "<span class='cult'>Striking another cultist with it will purge holy water from them.</span>")
-		to_chat(user, "<span class='cult'>Striking a noncultist, however, will tear their flesh.</span>")
+		. += "<span class='cult'>The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar'Sie.</span>"
+		. += "<span class='cult'>Striking a cult structure will unanchor or reanchor it.</span>"
+		. += "<span class='cult'>Striking another cultist with it will purge holy water from them.</span>"
+		. += "<span class='cult'>Striking a noncultist, however, will tear their flesh.</span>"

 /obj/item/melee/cultblade/dagger/attack(mob/living/M, mob/living/user)
 	if(iscultist(M))
@@ -47,13 +47,13 @@ Runes can either be invoked by one's self or with many different cultists. Each
 	add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "cult_runes", I)

 /obj/effect/rune/examine(mob/user)
-	..()
+	. = ..()
 	if(iscultist(user) || user.stat == DEAD) //If they're a cultist or a ghost, tell them the effects
-		to_chat(user, "<b>Name:</b> [cultist_name]")
-		to_chat(user, "<b>Effects:</b> [capitalize(cultist_desc)]")
-		to_chat(user, "<b>Required Acolytes:</b> [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]")
+		. += "<b>Name:</b> [cultist_name]"
+		. += "<b>Effects:</b> [capitalize(cultist_desc)]"
+		. += "<b>Required Acolytes:</b> [req_cultists_text ? "[req_cultists_text]":"[req_cultists]"]"
 		if(req_keyword && keyword)
-			to_chat(user, "<b>Keyword:</b> [keyword]")
+			. += "<b>Keyword:</b> [keyword]"

 /obj/effect/rune/attackby(obj/I, mob/user, params)
 	if(istype(I, /obj/item/melee/cultblade/dagger) && iscultist(user))
@@ -249,7 +249,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		convertee.adjustFireLoss(-(burndamage * 0.75))
 	convertee.visible_message("<span class='warning'>[convertee] writhes in pain \
 	[brutedamage || burndamage ? "even as [convertee.p_their()] wounds heal and close" : "as the markings below [convertee.p_them()] glow a bloody red"]!</span>", \
- 	"<span class='cultlarge'><i>AAAAAAAAAAAAAA-</i></span>")
+	"<span class='cultlarge'><i>AAAAAAAAAAAAAA-</i></span>")
 	SSticker.mode.add_cultist(convertee.mind, 1)
 	new /obj/item/melee/cultblade/dagger(get_turf(src))
 	convertee.mind.special_role = ROLE_CULTIST
@@ -525,10 +525,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/static/revives_used = -SOULS_TO_REVIVE // Cultists get one "free" revive

 /obj/effect/rune/raise_dead/examine(mob/user)
-	..()
+	. = ..()
 	if(iscultist(user) || user.stat == DEAD)
 		var/revive_number = LAZYLEN(GLOB.sacrificed) - revives_used
-		to_chat(user, "<b>Revives Remaining:</b> [revive_number]")
+		. += "<b>Revives Remaining:</b> [revive_number]"

 /obj/effect/rune/raise_dead/invoke(var/list/invokers)
 	var/turf/T = get_turf(src)
@@ -622,11 +622,11 @@ structure_check() searches for nearby cultist structures required for the invoca
 	GLOB.wall_runes += src

 /obj/effect/rune/wall/examine(mob/user)
-	..()
+	. = ..()
 	if(density && iscultist(user))
 		var/datum/timedevent/TMR = active_timers[1]
 		if(TMR)
-			to_chat(user, "<span class='cultitalic'>The air above this rune has hardened into a barrier that will last [DisplayTimeText(TMR.timeToRun - world.time)].</span>")
+			. += "<span class='cultitalic'>The air above this rune has hardened into a barrier that will last [DisplayTimeText(TMR.timeToRun - world.time)].</span>"

 /obj/effect/rune/wall/Destroy()
 	GLOB.wall_runes -= src
@@ -848,10 +848,10 @@ structure_check() searches for nearby cultist structures required for the invoca
 			fail_invoke()
 			log_game("Manifest rune failed - too many summoned ghosts")
 			return list()
-		notify_ghosts("Manifest rune invoked in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src)
+		notify_ghosts("Manifest rune invoked in [get_area(src)].", 'sound/effects/ghost2.ogg', source = src, ignore_dnr_observers = TRUE)
 		var/list/ghosts_on_rune = list()
 		for(var/mob/dead/observer/O in T)
-			if(O.client && !jobban_isbanned(O, ROLE_CULTIST) && !QDELETED(src) && !QDELETED(O))
+			if(!QDELETED(O) && O.client && !jobban_isbanned(O, ROLE_CULTIST) && !QDELETED(src) && O.can_reenter_round())
 				ghosts_on_rune += O
 		if(!ghosts_on_rune.len)
 			to_chat(user, "<span class='cultitalic'>There are no spirits near [src]!</span>")
@@ -549,7 +549,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
 	var/list/parts = list()
 	parts += printplayer(owner)
 	parts += printdevilinfo()
-	parts += printobjectives(owner)
+	parts += printobjectives(objectives)
 	return parts.Join("<br>")

 //A simple super light weight datum for the codex gigas.
@@ -57,3 +57,18 @@
 	visible_message("<span class='danger'>[src] screams in agony as it sublimates into a sulfurous smoke.</span>")
 	ghostize()
 	qdel(src)
+
+/datum/antagonist/imp
+	name = "Imp"
+	antagpanel_category = "Devil"
+	show_in_roundend = FALSE
+
+/datum/antagonist/imp/on_gain()
+	. = ..()
+	give_objectives()
+
+/datum/antagonist/imp/proc/give_objectives()
+	var/datum/objective/newobjective = new
+	newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
+	newobjective.owner = owner
+	objectives += newobjective
@@ -64,26 +64,25 @@


 /mob/living/carbon/true_devil/examine(mob/user)
-	var/msg = "<span class='info'>*---------*\nThis is [icon2html(src, user)] <b>[src]</b>!\n"
+	. = list("<span class='info'>*---------*\nThis is [icon2html(src, user)] <b>[src]</b>!")

 	//Left hand items
 	for(var/obj/item/I in held_items)
 		if(!(I.item_flags & ABSTRACT))
-			msg += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))].\n"
+			. += "It is holding [I.get_examine_string(user)] in its [get_held_index_name(get_held_index_of_item(I))]."

 	//Braindead
 	if(!client && stat != DEAD)
-		msg += "The devil seems to be in deep contemplation.\n"
+		. += "The devil seems to be in deep contemplation."

 	//Damaged
 	if(stat == DEAD)
-		msg += "<span class='deadsay'>The hellfire seems to have been extinguished, for now at least.</span>\n"
+		. += "<span class='deadsay'>The hellfire seems to have been extinguished, for now at least.</span>"
 	else if(health < (maxHealth/10))
-		msg += "<span class='warning'>You can see hellfire inside its gaping wounds.</span>\n"
+		. += "<span class='warning'>You can see hellfire inside its gaping wounds.</span>"
 	else if(health < (maxHealth/2))
-		msg += "<span class='warning'>You can see hellfire inside its wounds.</span>\n"
-	msg += "*---------*</span>"
-	to_chat(user, msg)
+		. += "<span class='warning'>You can see hellfire inside its wounds.</span>"
+	. += "*---------*</span>"

 /mob/living/carbon/true_devil/IsAdvancedToolUser()
 	return 1
@@ -106,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)
+/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
 	if(mind && has_bane(BANE_LIGHT))
 		mind.disrupt_spells(-500)
 		return ..() //flashes don't stop devils UNLESS it's their bane.
@@ -147,13 +146,8 @@
 	if(ascended || user.mind.soulOwner == src.mind)
 		var/mob/living/simple_animal/imp/S = new(get_turf(loc))
 		user.transfer_ckey(S, FALSE)
-		S.mind.assigned_role = "Imp"
-		S.mind.special_role = "Imp"
-		var/datum/objective/newobjective = new
-		newobjective.explanation_text = "Try to get a promotion to a higher devilic rank."
-		S.mind.objectives += newobjective
-		to_chat(S, S.playstyle_string)
-		to_chat(S, "<B>Objective #[1]</B>: [newobjective.explanation_text]")
+		var/datum/antagonist/imp/A = new()
+		S.mind.add_antag_datum(A)
 	else
 		return ..()

@@ -10,12 +10,10 @@
 	var/datum/objective/O = new /datum/objective/disease_infect()
 	O.owner = owner
 	objectives += O
-	owner.objectives += O

 	O = new /datum/objective/disease_infect_centcom()
 	O.owner = owner
 	objectives += O
-	owner.objectives += O

 	. = ..()

@@ -3,6 +3,7 @@
 	name = "Spawn Sentient Disease"
 	typepath = /datum/round_event/ghost_role/sentient_disease
 	weight = 7
+	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5

@@ -9,7 +9,7 @@ the new instance inside the host to be updated to the template's stats.
 	name = "Sentient Disease"
 	real_name = "Sentient Disease"
 	desc = ""
-	icon = 'icons/mob/blob.dmi'
+	icon = 'icons/mob/cameramob.dmi'
 	icon_state = "marker"
 	mouse_opacity = MOUSE_OPACITY_ICON
 	move_on_shuttle = FALSE
@@ -97,14 +97,14 @@ the new instance inside the host to be updated to the template's stats.


 /mob/camera/disease/examine(mob/user)
-	..()
+	. = ..()
 	if(isobserver(user))
-		to_chat(user, "<span class='notice'>[src] has [points]/[total_points] adaptation points.</span>")
-		to_chat(user, "<span class='notice'>[src] has the following unlocked:</span>")
+		. += "<span class='notice'>[src] has [points]/[total_points] adaptation points.</span>"
+		. += "<span class='notice'>[src] has the following unlocked:</span>"
 		for(var/A in purchased_abilities)
 			var/datum/disease_ability/B = A
 			if(istype(B))
-				to_chat(user, "<span class='notice'>[B.name]</span>")
+				. += "<span class='notice'>[B.name]</span>"

 /mob/camera/disease/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
 	return
@@ -113,7 +113,6 @@
 /datum/antagonist/ert/proc/forge_objectives()
 	if(ert_team)
 		objectives |= ert_team.objectives
-	owner.objectives |= objectives

 /datum/antagonist/ert/proc/equipERT()
 	var/mob/living/carbon/human/H = owner.current
@@ -8,7 +8,6 @@
 	O.completed = TRUE //YES!
 	O.owner = owner
 	objectives += O
-	owner.objectives += objectives

 /datum/antagonist/greentext/on_gain()
 	forge_objectives()
@@ -24,8 +24,6 @@
 	hijack_objective.owner = owner
 	objectives += hijack_objective

-	owner.objectives |= objectives
-
 /datum/antagonist/highlander/on_gain()
 	forge_objectives()
 	owner.special_role = "highlander"
@@ -0,0 +1,9 @@
+/datum/antagonist/magic_servant
+	name = "Magic Servant"
+	show_in_roundend = FALSE
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/magic_servant/proc/setup_master(mob/M)
+	var/datum/objective/O = new("Serve [M.real_name].")
+	O.owner = owner
+	objectives |= O
@@ -63,7 +63,6 @@

 /datum/antagonist/monkey/proc/forge_objectives()
 	objectives |= monkey_team.objectives
-	owner.objectives |= objectives

 /datum/antagonist/monkey/admin_remove(mob/admin)
 	var/mob/living/carbon/monkey/M = owner.current
@@ -52,12 +52,11 @@

 /mob/living/simple_animal/hostile/morph/examine(mob/user)
 	if(morphed)
-		form.examine(user) // Refactor examine to return desc so it's static? Not sure if worth it
+		. = form.examine(user)
 		if(get_dist(user,src)<=3)
-			to_chat(user, "<span class='warning'>It doesn't look quite right...</span>")
+			. += "<span class='warning'>It doesn't look quite right...</span>"
 	else
-		..()
-	return
+		. = ..()

 /mob/living/simple_animal/hostile/morph/med_hud_set_health()
 	if(morphed && !isliving(form))
@@ -96,7 +96,6 @@
 	var/datum/objective/O = new /datum/objective/survive()
 	O.owner = owner
 	objectives += O
-	owner.objectives |= objectives

 /proc/remove_ninja(mob/living/L)
 	if(!L || !L.mind)
@@ -0,0 +1,181 @@
+/obj/item/borg_chameleon
+	name = "cyborg chameleon projector"
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield0"
+	flags_1 = CONDUCT_1
+	item_flags = NOBLUDGEON
+	item_state = "electronic"
+	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	var/friendlyName
+	var/savedName
+	var/active = FALSE
+	var/activationCost = 300
+	var/activationUpkeep = 50
+	var/disguise = null
+	var/disguise_icon_override = null
+	var/disguise_pixel_offset = null
+	var/mob/listeningTo
+	var/static/list/signalCache = list( // list here all signals that should break the camouflage
+			COMSIG_PARENT_ATTACKBY,
+			COMSIG_ATOM_ATTACK_HAND,
+			COMSIG_MOVABLE_IMPACT_ZONE,
+			COMSIG_ATOM_BULLET_ACT,
+			COMSIG_ATOM_EX_ACT,
+			COMSIG_ATOM_FIRE_ACT,
+			COMSIG_ATOM_EMP_ACT,
+			)
+	var/mob/living/silicon/robot/user // needed for process()
+	var/animation_playing = FALSE
+
+	var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer", "Vale")
+
+
+/obj/item/borg_chameleon/Initialize()
+	. = ..()
+	friendlyName = pick(GLOB.ai_names)
+
+/obj/item/borg_chameleon/Destroy()
+	listeningTo = null
+	return ..()
+
+/obj/item/borg_chameleon/dropped(mob/user)
+	. = ..()
+	disrupt(user)
+
+/obj/item/borg_chameleon/equipped(mob/user)
+	. = ..()
+	disrupt(user)
+
+/obj/item/borg_chameleon/attack_self(mob/living/silicon/robot/user)
+	if (user && user.cell && user.cell.charge >  activationCost)
+		if (isturf(user.loc))
+			toggle(user)
+		else
+			to_chat(user, "<span class='warning'>You can't use [src] while inside something!</span>")
+	else
+		to_chat(user, "<span class='warning'>You need at least [activationCost] charge in your cell to use [src]!</span>")
+
+/obj/item/borg_chameleon/proc/toggle(mob/living/silicon/robot/user)
+	if(active)
+		playsound(src, 'sound/effects/pop.ogg', 100, TRUE, -6)
+		to_chat(user, "<span class='notice'>You deactivate \the [src].</span>")
+		deactivate(user)
+	else
+		if(animation_playing)
+			to_chat(user, "<span class='notice'>\the [src] is recharging.</span>")
+			return
+		var/borg_icon = input(user, "Select an icon!", "Robot Icon", null) as null|anything in engymodels
+		if(!borg_icon)
+			return FALSE
+		switch(borg_icon)
+			if("Default")
+				disguise = "engineer"
+				disguise_icon_override = 'icons/mob/robots.dmi'
+			if("Default - Treads")
+				disguise = "engi-tread"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Loader")
+				disguise = "loaderborg"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Handy")
+				disguise = "handyeng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Sleek")
+				disguise = "sleekeng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Can")
+				disguise = "caneng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Marina")
+				disguise = "marinaeng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Spider")
+				disguise = "spidereng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Heavy")
+				disguise = "heavyeng"
+				disguise_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			if("Pup Dozer")
+				disguise = "pupdozer"
+				disguise_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+				disguise_pixel_offset = -16
+			if("Vale")
+				disguise = "valeeng"
+				disguise_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+				disguise_pixel_offset = -16
+		animation_playing = TRUE
+		to_chat(user, "<span class='notice'>You activate \the [src].</span>")
+		playsound(src, 'sound/effects/seedling_chargeup.ogg', 100, TRUE, -6)
+		var/start = user.filters.len
+		var/X,Y,rsq,i,f
+		for(i=1, i<=7, ++i)
+			do
+				X = 60*rand() - 30
+				Y = 60*rand() - 30
+				rsq = X*X + Y*Y
+			while(rsq<100 || rsq>900)
+			user.filters += filter(type="wave", x=X, y=Y, size=rand()*2.5+0.5, offset=rand())
+		for(i=1, i<=7, ++i)
+			f = user.filters[start+i]
+			animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
+			animate(offset=f:offset-1, time=rand()*20+10)
+		if (do_after(user, 50, target=user) && user.cell.use(activationCost))
+			playsound(src, 'sound/effects/bamf.ogg', 100, TRUE, -6)
+			to_chat(user, "<span class='notice'>You are now disguised as the Nanotrasen engineering borg \"[friendlyName]\".</span>")
+			activate(user)
+		else
+			to_chat(user, "<span class='warning'>The chameleon field fizzles.</span>")
+			do_sparks(3, FALSE, user)
+			for(i=1, i<=min(7, user.filters.len), ++i) // removing filters that are animating does nothing, we gotta stop the animations first
+				f = user.filters[start+i]
+				animate(f)
+		user.filters = null
+		animation_playing = FALSE
+
+/obj/item/borg_chameleon/process()
+	if (user)
+		if (!user.cell || !user.cell.use(activationUpkeep))
+			disrupt(user)
+	else
+		return PROCESS_KILL
+
+/obj/item/borg_chameleon/proc/activate(mob/living/silicon/robot/user)
+	START_PROCESSING(SSobj, src)
+	src.user = user
+	savedName = user.name
+	user.name = friendlyName
+	user.module.cyborg_base_icon = disguise
+	user.module.cyborg_icon_override = disguise_icon_override
+	user.module.cyborg_pixel_offset = disguise_pixel_offset
+	user.bubble_icon = "robot"
+	active = TRUE
+	user.update_icons()
+
+	if(listeningTo == user)
+		return
+	if(listeningTo)
+		UnregisterSignal(listeningTo, signalCache)
+	RegisterSignal(user, signalCache, .proc/disrupt)
+	listeningTo = user
+
+/obj/item/borg_chameleon/proc/deactivate(mob/living/silicon/robot/user)
+	STOP_PROCESSING(SSobj, src)
+	if(listeningTo)
+		UnregisterSignal(listeningTo, signalCache)
+		listeningTo = null
+	do_sparks(5, FALSE, user)
+	user.name = savedName
+	user.module.cyborg_base_icon = initial(user.module.cyborg_base_icon)
+	user.module.cyborg_icon_override = 'icons/mob/robots.dmi'
+	user.bubble_icon = "syndibot"
+	active = FALSE
+	user.update_icons()
+	user.pixel_x = 0 //this solely exists because of dogborgs. I want anyone who ever reads this code later on to know this. Don't ask me why it's here, doesn't work above update_icons()
+	src.user = user
+
+/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)
@@ -64,7 +64,7 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 	for(var/obj/machinery/computer/camera_advanced/shuttle_docker/D in GLOB.jam_on_wardec)
 		D.jammed = TRUE

-  GLOB.war_declared = TRUE
+	GLOB.war_declared = TRUE
 	var/list/nukeops = get_antag_minds(/datum/antagonist/nukeop)
 	var/actual_players = GLOB.joined_player_list.len - nukeops.len
 	var/tc_malus = 0
@@ -74,6 +74,11 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 	new uplink_type(get_turf(user), user.key, CHALLENGE_TELECRYSTALS - tc_malus + CEILING(PLAYER_SCALING * actual_players, 1))

 	CONFIG_SET(number/shuttle_refuel_delay, max(CONFIG_GET(number/shuttle_refuel_delay), CHALLENGE_SHUTTLE_DELAY))
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = CONFIG_GET(number/dynamic_warops_cost)
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Nuke ops spent [threat_spent] on war ops.")
 	SSblackbox.record_feedback("amount", "nuclear_challenge_mode", 1)

 	qdel(src)
@@ -94,6 +99,14 @@ GLOBAL_VAR_INIT(war_declared, FALSE)
 		if(board.moved)
 			to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.")
 			return FALSE
+	if(istype(SSticker.mode, /datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat_level < CONFIG_GET(number/dynamic_warops_requirement))
+			to_chat(user, "Due to the dynamic space in which the station resides, you are too deep into Nanotrasen territory to reasonably go loud.")
+			return FALSE
+		else if(mode.threat < CONFIG_GET(number/dynamic_warops_cost))
+			to_chat(user, "Due to recent threats on the station, Nanotrasen is looking too closely for a war declaration to be wise.")
+			return FALSE
 	return TRUE

 /obj/item/nuclear_challenge/clownops
@@ -55,9 +55,9 @@
 /obj/machinery/nuclearbomb/examine(mob/user)
 	. = ..()
 	if(exploding)
-		to_chat(user, "It is in the process of exploding. Perhaps reviewing your affairs is in order.")
+		. += "It is in the process of exploding. Perhaps reviewing your affairs is in order."
 	if(timing)
-		to_chat(user, "There are [get_time_left()] seconds until detonation.")
+		. += "There are [get_time_left()] seconds until detonation."

 /obj/machinery/nuclearbomb/selfdestruct
 	name = "station self-destruct terminal"
@@ -343,10 +343,10 @@


 /obj/machinery/nuclearbomb/proc/set_anchor()
-	if(!isinspace())
-		anchored = !anchored
-	else
+	if(isinspace() && !anchored)
 		to_chat(usr, "<span class='warning'>There is nothing to anchor to!</span>")
+	else
+		anchored = !anchored

 /obj/machinery/nuclearbomb/proc/set_safety()
 	safety = !safety
@@ -472,9 +472,9 @@
 /obj/machinery/nuclearbomb/beer/examine(mob/user)
 	. = ..()
 	if(keg.reagents.total_volume)
-		to_chat(user, "<span class='notice'>It has [keg.reagents.total_volume] unit\s left.</span>")
+		. += "<span class='notice'>It has [keg.reagents.total_volume] unit\s left.</span>"
 	else
-		to_chat(user, "<span class='danger'>It's empty.</span>")
+		. += "<span class='danger'>It's empty.</span>"

 /obj/machinery/nuclearbomb/beer/attackby(obj/item/W, mob/user, params)
 	if(W.is_refillable())
@@ -615,7 +615,7 @@ This is here to make the tiles around the station mininuke change when it's arme
 	var/captain = user.mind && user.mind.assigned_role == "Captain"
 	var/nukie = user.mind && user.mind.has_antag_datum(/datum/antagonist/nukeop)
 	if(ghost || captain || nukie)
-		to_chat(user, "<span class='warning'>The serial numbers on [src] are incorrect.</span>")
+		. += "<span class='warning'>The serial numbers on [src] are incorrect.</span>"

 /obj/item/disk/nuclear/attackby(obj/item/I, mob/living/user, params)
 	if(istype(I, /obj/item/claymore/highlander) && !fake)
@@ -2,7 +2,7 @@
 	var/mode = TRACK_NUKE_DISK

 /obj/item/pinpointer/nuke/examine(mob/user)
-	..()
+	. = ..()
 	var/msg = "Its tracking indicator reads "
 	switch(mode)
 		if(TRACK_NUKE_DISK)
@@ -13,10 +13,10 @@
 			msg += "\"vasvygengbefuvc\"."
 		else
 			msg = "Its tracking indicator is blank."
-	to_chat(user, msg)
+	. += msg
 	for(var/obj/machinery/nuclearbomb/bomb in GLOB.machines)
 		if(bomb.timing)
-			to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()].")
+			. += "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]."

 /obj/item/pinpointer/nuke/process()
 	..()
@@ -87,7 +87,7 @@

 /datum/antagonist/nukeop/proc/forge_objectives()
 	if(nuke_team)
-		owner.objectives |= nuke_team.objectives
+		objectives |= nuke_team.objectives

 /datum/antagonist/nukeop/proc/move_to_spawnpoint()
 	var/team_number = 1
@@ -36,8 +36,6 @@
 		missionobj.completed = 1
 		mission = missionobj
 		objectives |= mission
-	owner.objectives |= objectives
-

 /datum/antagonist/official/on_gain()
 	forge_objectives()
@@ -26,7 +26,6 @@
 // Sets objectives, equips all antags with the storage implant.
 /datum/antagonist/overthrow/on_gain()
 	objectives += team.objectives
-	owner.objectives += objectives
 	..()
 	owner.announce_objectives()
 	equip_overthrow()
@@ -34,7 +33,6 @@

 /datum/antagonist/overthrow/on_removal()
 	owner.special_role = null
-	owner.objectives -= objectives
 	..()

 // Creates the overthrow team, or sets it. The objectives are static for all the team members.
@@ -35,7 +35,9 @@
 		objectives += heads_obj
 		for(var/i in members)
 			var/datum/mind/M = i
-			M.objectives += heads_obj
+			var/datum/antagonist/overthrow/O = M.has_antag_datum(/datum/antagonist/overthrow)
+			if(O)
+				O.objectives += heads_obj
 	heads_obj.find_targets()

 	addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
@@ -31,12 +31,7 @@

 /datum/antagonist/pirate/on_gain()
 	if(crew)
-		owner.objectives |= crew.objectives
-	. = ..()
-
-/datum/antagonist/pirate/on_removal()
-	if(crew)
-		owner.objectives -= crew.objectives
+		objectives |= crew.objectives
 	. = ..()

 /datum/team/pirate
@@ -53,7 +48,9 @@
 	getbooty.update_explanation_text()
 	objectives += getbooty
 	for(var/datum/mind/M in members)
-		M.objectives |= objectives
+		var/datum/antagonist/pirate/P = M.has_antag_datum(/datum/antagonist/pirate)
+		if(P)
+			P.objectives |= objectives


 /datum/objective/loot
@@ -368,11 +368,11 @@
 	scatter()

 /obj/item/ectoplasm/revenant/examine(mob/user)
-	..()
+	. = ..()
 	if(inert)
-		to_chat(user, "<span class='revennotice'>It seems inert.</span>")
+		. += "<span class='revennotice'>It seems inert.</span>"
 	else if(reforming)
-		to_chat(user, "<span class='revenwarning'>It is shifting and distorted. It would be wise to destroy this.</span>")
+		. += "<span class='revenwarning'>It is shifting and distorted. It would be wise to destroy this.</span>"

 /obj/item/ectoplasm/revenant/proc/reform()
 	if(QDELETED(src) || QDELETED(revenant) || inert)
@@ -14,8 +14,6 @@
 	objective2.owner = owner
 	objectives += objective2

-	owner.objectives |= objectives
-
 /datum/antagonist/revenant/on_gain()
 	forge_objectives()
 	. = ..()
@@ -4,6 +4,7 @@
 	name = "Spawn Revenant" // Did you mean 'griefghost'?
 	typepath = /datum/round_event/ghost_role/revenant
 	weight = 7
+	gamemode_blacklist = list("dynamic")
 	max_occurrences = 1
 	min_players = 5

@@ -66,10 +66,10 @@
 	return rev_team

 /datum/antagonist/rev/proc/create_objectives()
-	owner.objectives |= rev_team.objectives
+	objectives |= rev_team.objectives

 /datum/antagonist/rev/proc/remove_objectives()
-	owner.objectives -= rev_team.objectives
+	objectives -= rev_team.objectives

 //Bump up to head_rev
 /datum/antagonist/rev/proc/promote()
@@ -207,9 +207,20 @@
 		owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.</span>", null, null, null, owner.current)
 		to_chat(owner, "<span class='userdanger'>The frame's firmware detects and deletes your neural reprogramming! You remember nothing of your time spent reprogrammed, you can't even remember the names or identities of anyone involved...</span>")

+/datum/antagonist/rev/head/farewell()
+	if((ishuman(owner.current) || ismonkey(owner.current)))
+		if(owner.current.stat != DEAD)
+			owner.current.visible_message("<span class='deconversion_message'>[owner.current] looks like [owner.current.p_theyve()] just remembered [owner.current.p_their()] real allegiance!</span>", null, null, null, owner.current)
+			to_chat(owner, "<span class ='deconversion_message bold'>You have given up your cause of overthrowing the command staff. You are no longer a Head Revolutionary.</span>")
+		else
+			to_chat(owner, "<span class ='deconversion_message bold'>The sweet release of death. You are no longer a Head Revolutionary.</span>")
+	else if(issilicon(owner.current))
+		owner.current.visible_message("<span class='deconversion_message'>The frame beeps contentedly, suppressing the disloyal personality traits from the MMI before initalizing it.</span>", null, null, null, owner.current)
+		to_chat(owner, "<span class='userdanger'>The frame's firmware detects and suppresses your unwanted personality traits! You feel more content with the leadership around these parts.</span>")
+
 //blunt trauma deconversions call this through species.dm spec_attacked_by()
 /datum/antagonist/rev/proc/remove_revolutionary(borged, deconverter)
-	log_attack("[key_name(owner.current)] has been deconverted from the revolution by [key_name(deconverter)]!")
+	log_attack("[key_name(owner.current)] has been deconverted from the revolution by [ismob(deconverter) ? key_name(deconverter) : deconverter]!")
 	if(borged)
 		message_admins("[ADMIN_LOOKUPFLW(owner.current)] has been borged while being a [name]")
 	owner.special_role = null
@@ -219,9 +230,8 @@
 	owner.remove_antag_datum(type)

 /datum/antagonist/rev/head/remove_revolutionary(borged,deconverter)
-	if(!borged)
-		return
-	. = ..()
+	if(borged || deconverter == "gamemode")
+		. = ..()

 /datum/antagonist/rev/head/equip_rev()
 	var/mob/living/carbon/human/H = owner.current
@@ -253,6 +263,8 @@
 /datum/team/revolution
 	name = "Revolution"
 	var/max_headrevs = 3
+	var/list/ex_headrevs = list() // Dynamic removes revs on loss, used to keep a list for the roundend report.
+	var/list/ex_revs = list()

 /datum/team/revolution/proc/update_objectives(initial = FALSE)
 	var/untracked_heads = SSjob.get_all_heads()
@@ -265,7 +277,8 @@
 		new_target.update_explanation_text()
 		objectives += new_target
 	for(var/datum/mind/M in members)
-		M.objectives |= objectives
+		var/datum/antagonist/rev/R = M.has_antag_datum(/datum/antagonist/rev)
+		R.objectives |= objectives

 	addtimer(CALLBACK(src,.proc/update_objectives),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)

@@ -295,9 +308,12 @@

 	addtimer(CALLBACK(src,.proc/update_heads),HEAD_UPDATE_PERIOD,TIMER_UNIQUE)

+/datum/team/revolution/proc/save_members()
+	ex_headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+	ex_revs = get_antag_minds(/datum/antagonist/rev, TRUE)

 /datum/team/revolution/roundend_report()
-	if(!members.len)
+	if(!members.len && !ex_headrevs.len)
 		return

 	var/list/result = list()
@@ -317,8 +333,17 @@


 	var/list/targets = list()
-	var/list/datum/mind/headrevs = get_antag_minds(/datum/antagonist/rev/head)
-	var/list/datum/mind/revs = get_antag_minds(/datum/antagonist/rev,TRUE)
+	var/list/datum/mind/headrevs
+	var/list/datum/mind/revs
+	if(ex_headrevs.len)
+		headrevs = ex_headrevs
+	else
+		headrevs = get_antag_minds(/datum/antagonist/rev/head, TRUE)
+
+	if(ex_revs.len)
+		revs = ex_revs
+	else
+		revs = get_antag_minds(/datum/antagonist/rev, TRUE)
 	if(headrevs.len)
 		var/list/headrev_part = list()
 		headrev_part += "<span class='header'>The head revolutionaries were:</span>"
@@ -0,0 +1,29 @@
+/datum/antagonist/santa
+	name = "Santa"
+	show_in_antagpanel = FALSE
+
+/datum/antagonist/santa/on_gain()
+	. = ..()
+	give_equipment()
+	give_objective()
+
+/datum/antagonist/santa/greet()
+	. = ..()
+	to_chat(owner, "<span class='boldannounce'>You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag.</span>")
+
+/datum/antagonist/santa/proc/give_equipment()
+	var/mob/living/carbon/human/H = owner.current
+	if(istype(H))
+		H.equipOutfit(/datum/outfit/santa)
+
+	owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
+	var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new
+	telespell.clothes_req = 0 //santa robes aren't actually magical.
+	owner.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
+
+/datum/antagonist/santa/proc/give_objective()
+	var/datum/objective/santa_objective = new()
+	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
@@ -94,7 +94,7 @@
 	user.temporarilyRemoveItemFromInventory(src, TRUE)
 	src.Insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E

-/obj/item/organ/heart/demon/Insert(mob/living/carbon/M, special = 0)
+/obj/item/organ/heart/demon/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
 	..()
 	if(M.mind)
 		M.mind.AddSpell(new /obj/effect/proc_holder/spell/bloodcrawl(null))
@@ -26,8 +26,6 @@
 	new_objective2.explanation_text = "[objective_verb] everyone[summoner ? " else while you're at it":""]."
 	objectives += new_objective2

-	owner.objectives |= objectives
-
 /datum/antagonist/slaughter/laughter
 	name = "Laughter demon"
 	objective_verb = "Hug and Tickle"
@@ -3,6 +3,7 @@
 	typepath = /datum/round_event/ghost_role/slaughter
 	weight = 1 //Very rare
 	max_occurrences = 1
+	gamemode_blacklist = list("dynamic")
 	earliest_start = 1 HOURS
 	min_players = 20

@@ -8,7 +8,6 @@
 	var/datum/objective/survive/survive = new
 	survive.owner = owner
 	objectives += survive
-	owner.objectives |= objectives

 /datum/antagonist/survivalist/on_gain()
 	owner.special_role = "survivalist"
@@ -33,7 +33,7 @@
 	. = ..()
 	var/area/A = get_area(src)
 	if(A)
-		notify_ghosts("A swarmer shell has been created in [A.name].", 'sound/effects/bin_close.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
+		notify_ghosts("A swarmer shell has been created in [A.name].", 'sound/effects/bin_close.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)

 /obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user)
 	. = ..()
@@ -78,15 +78,14 @@
 	scan_target = null
 	if(owner)
 		if(owner.mind)
-			if(owner.mind.objectives)
-				for(var/datum/objective/objective_ in owner.mind.objectives)
-					if(!is_internal_objective(objective_))
-						continue
-					var/datum/objective/assassinate/internal/objective = objective_
-					var/mob/current = objective.target.current
-					if(current&&current.stat!=DEAD)
-						scan_target = current
-					break
+			for(var/datum/objective/objective_ in owner.mind.get_all_objectives())
+				if(!is_internal_objective(objective_))
+					continue
+				var/datum/objective/assassinate/internal/objective = objective_
+				var/mob/current = objective.target.current
+				if(current&&current.stat!=DEAD)
+					scan_target = current
+				break

 /datum/status_effect/agent_pinpointer/tick()
 	if(!owner)
@@ -100,9 +99,9 @@
 	return (istype(O, /datum/objective/assassinate/internal)||istype(O, /datum/objective/destroy/internal))

 /datum/antagonist/traitor/proc/replace_escape_objective()
-	if(!owner||!owner.objectives)
+	if(!owner || !objectives.len)
 		return
-	for (var/objective_ in owner.objectives)
+	for (var/objective_ in objectives)
 		if(!(istype(objective_, /datum/objective/escape)||istype(objective_, /datum/objective/survive)))
 			continue
 		remove_objective(objective_)
@@ -112,9 +111,9 @@
 	add_objective(martyr_objective)

 /datum/antagonist/traitor/proc/reinstate_escape_objective()
-	if(!owner||!owner.objectives)
+	if(!owner||!objectives.len)
 		return
-	for (var/objective_ in owner.objectives)
+	for (var/objective_ in objectives)
 		if(!istype(objective_, /datum/objective/martyr))
 			continue
 		remove_objective(objective_)
@@ -131,7 +130,7 @@
 		return
 	to_chat(owner.current, "<span class='userdanger'> Target eliminated: [victim.name]</span>")
 	LAZYINITLIST(targets_stolen)
-	for(var/objective_ in victim.objectives)
+	for(var/objective_ in victim.get_all_objectives())
 		if(istype(objective_, /datum/objective/assassinate/internal))
 			var/datum/objective/assassinate/internal/objective = objective_
 			if(objective.target==owner)
@@ -159,7 +158,7 @@
 				var/status_text = objective.check_completion() ? "neutralised" : "active"
 				to_chat(owner.current, "<span class='userdanger'> New target added to database: [objective.target.name] ([status_text]) </span>")
 	last_man_standing = TRUE
-	for(var/objective_ in owner.objectives)
+	for(var/objective_ in objectives)
 		if(!is_internal_objective(objective_))
 			continue
 		var/datum/objective/assassinate/internal/objective = objective_
@@ -175,7 +174,7 @@

 /datum/antagonist/traitor/internal_affairs/proc/iaa_process()
 	if(owner&&owner.current&&owner.current.stat!=DEAD)
-		for(var/objective_ in owner.objectives)
+		for(var/objective_ in objectives)
 			if(!is_internal_objective(objective_))
 				continue
 			var/datum/objective/assassinate/internal/objective = objective_
@@ -224,8 +223,6 @@
 			special_role = TRAITOR_AGENT_ROLE
 			syndicate = TRUE
 			forge_single_objective()
-	else
-		..() // Give them standard objectives.
 	return

 /datum/antagonist/traitor/internal_affairs/forge_traitor_objectives()
@@ -48,19 +48,22 @@
 		A.verbs -= /mob/living/silicon/ai/proc/choose_modules
 		A.malf_picker.remove_malf_verbs(A)
 		qdel(A.malf_picker)
-
 	SSticker.mode.traitors -= owner
 	if(!silent && owner.current)
 		to_chat(owner.current,"<span class='userdanger'> You are no longer the [special_role]! </span>")
 	owner.special_role = null
-	..()
+	. = ..()

-/datum/antagonist/traitor/proc/add_objective(var/datum/objective/O)
-	owner.objectives += O
+/datum/antagonist/traitor/proc/handle_hearing(datum/source, list/hearing_args)
+	var/message = hearing_args[HEARING_RAW_MESSAGE]
+	message = GLOB.syndicate_code_phrase_regex.Replace(message, "<span class='blue'>$1</span>")
+	message = GLOB.syndicate_code_response_regex.Replace(message, "<span class='red'>$1</span>")
+	hearing_args[HEARING_RAW_MESSAGE] = message
+
+/datum/antagonist/traitor/proc/add_objective(datum/objective/O)
 	objectives += O

-/datum/antagonist/traitor/proc/remove_objective(var/datum/objective/O)
-	owner.objectives -= O
+/datum/antagonist/traitor/proc/remove_objective(datum/objective/O)
 	objectives -= O

 /datum/antagonist/traitor/proc/forge_traitor_objectives()
@@ -72,7 +75,17 @@

 /datum/antagonist/traitor/proc/forge_human_objectives()
 	var/is_hijacker = FALSE
-	if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
+	var/datum/game_mode/dynamic/mode
+	var/is_dynamic = FALSE
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		mode = SSticker.mode
+		is_dynamic = TRUE
+		if(GLOB.joined_player_list.len>=GLOB.dynamic_high_pop_limit)
+			is_hijacker = (prob(10) && mode.threat_level > CONFIG_GET(number/dynamic_hijack_high_population_requirement))
+		else
+			var/indice_pop = min(10,round(GLOB.joined_player_list.len/mode.pop_per_requirement)+1)
+			is_hijacker = (prob(10) && (mode.threat_level >= CONFIG_GET(number_list/dynamic_hijack_requirements)[indice_pop]))
+	else if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks
 		is_hijacker = prob(10)
 	var/martyr_chance = prob(20)
 	var/objective_count = is_hijacker 			//Hijacking counts towards number of objectives
@@ -89,15 +102,19 @@
 		forge_single_objective()

 	if(is_hijacker && objective_count <= toa) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount
-		if (!(locate(/datum/objective/hijack) in owner.objectives))
+		if (!(locate(/datum/objective/hijack) in objectives))
 			var/datum/objective/hijack/hijack_objective = new
 			hijack_objective.owner = owner
 			add_objective(hijack_objective)
+			if(is_dynamic)
+				var/threat_spent = CONFIG_GET(number/dynamic_hijack_cost)
+				mode.spend_threat(threat_spent)
+				mode.log_threat("[owner.name] spent [threat_spent] on hijack.")
 			return


 	var/martyr_compatibility = 1 //You can't succeed in stealing if you're dead.
-	for(var/datum/objective/O in owner.objectives)
+	for(var/datum/objective/O in objectives)
 		if(!O.martyr_compatible)
 			martyr_compatibility = 0
 			break
@@ -106,10 +123,14 @@
 		var/datum/objective/martyr/martyr_objective = new
 		martyr_objective.owner = owner
 		add_objective(martyr_objective)
+		if(is_dynamic)
+			var/threat_spent = CONFIG_GET(number/dynamic_hijack_cost)
+			mode.spend_threat(threat_spent)
+			mode.log_threat("[owner.name] spent [threat_spent] on glorious death.")
 		return

 	else
-		if(!(locate(/datum/objective/escape) in owner.objectives))
+		if(!(locate(/datum/objective/escape) in objectives))
 			var/datum/objective/escape/escape_objective = new
 			escape_objective.owner = owner
 			add_objective(escape_objective)
@@ -141,7 +162,18 @@

 /datum/antagonist/traitor/proc/forge_single_human_objective() //Returns how many objectives are added
 	.=1
-	if(prob(50))
+	var/assassin_prob = 50
+	var/is_dynamic = FALSE
+	var/datum/game_mode/dynamic/mode
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		mode = SSticker.mode
+		is_dynamic = TRUE
+		assassin_prob = mode.threat_level*(2/3)
+	if(prob(assassin_prob))
+		if(is_dynamic)
+			var/threat_spent = CONFIG_GET(number/dynamic_assassinate_cost)
+			mode.spend_threat(threat_spent)
+			mode.log_threat("[owner.name] spent [threat_spent] on an assassination target.")
 		var/list/active_ais = active_ais()
 		if(active_ais.len && prob(100/GLOB.joined_player_list.len))
 			var/datum/objective/destroy/destroy_objective = new
@@ -159,7 +191,7 @@
 			kill_objective.find_target()
 			add_objective(kill_objective)
 	else
-		if(prob(15) && !(locate(/datum/objective/download) in owner.objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
+		if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
 			var/datum/objective/download/download_objective = new
 			download_objective.owner = owner
 			download_objective.gen_amount_goal()
@@ -228,16 +260,20 @@
 /datum/antagonist/traitor/apply_innate_effects(mob/living/mob_override)
 	. = ..()
 	update_traitor_icons_added()
-	var/mob/living/silicon/ai/A = mob_override || owner.current
-	if(istype(A) && traitor_kind == TRAITOR_AI)
+	var/mob/M = mob_override || owner.current
+	if(isAI(M) && traitor_kind == TRAITOR_AI)
+		var/mob/living/silicon/ai/A = M
 		A.hack_software = TRUE
+	RegisterSignal(M, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)

 /datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override)
 	. = ..()
 	update_traitor_icons_removed()
-	var/mob/living/silicon/ai/A = mob_override || owner.current
-	if(istype(A)  && traitor_kind == TRAITOR_AI)
+	var/mob/M = mob_override || owner.current
+	if(isAI(M) && traitor_kind == TRAITOR_AI)
+		var/mob/living/silicon/ai/A = M
 		A.hack_software = FALSE
+	UnregisterSignal(M, COMSIG_MOVABLE_HEAR)

 /datum/antagonist/traitor/proc/give_codewords()
 	if(!owner.current)
@@ -208,7 +208,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	var/unlock_text = "<span class='notice'>Hello World!</span>" //Text shown when an ability is unlocked
 	var/unlock_sound //Sound played when an ability is unlocked

-/datum/AI_Module/proc/upgrade(mob/living/silicon/AI/AI) //Apply upgrades!
+/datum/AI_Module/proc/upgrade(mob/living/silicon/ai/AI) //Apply upgrades!
 	return

 /datum/AI_Module/large //Big, powerful stuff that can only be used once.
@@ -397,7 +397,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
 	unlock_text = "<span class='notice'>You establish a power diversion to your turrets, upgrading their health and damage.</span>"
 	unlock_sound = 'sound/items/rped.ogg'

-/datum/AI_Module/large/upgrade_turrets/upgrade(mob/living/silicon/AI/AI)
+/datum/AI_Module/large/upgrade_turrets/upgrade(mob/living/silicon/ai/AI)
 	for(var/obj/machinery/porta_turret/ai/turret in GLOB.machines)
 		turret.obj_integrity += 30
 		turret.lethal_projectile = /obj/item/projectile/beam/laser/heavylaser //Once you see it, you will know what it means to FEAR.
@@ -9,7 +9,6 @@
 	var/datum/objective/martyr/normiesgetout = new
 	normiesgetout.owner = owner
 	objectives += normiesgetout
-	owner.objectives += objectives

 /datum/antagonist/heartbreaker/on_gain()
 	forge_objectives()
@@ -12,7 +12,6 @@
 		protect_objective.human_check = FALSE
 	protect_objective.explanation_text = "Protect [date.name], your date."
 	objectives += protect_objective
-	owner.objectives += objectives

 /datum/antagonist/valentine/on_gain()
 	forge_objectives()
@@ -34,8 +33,8 @@
 //Squashed up a bit
 /datum/antagonist/valentine/roundend_report()
 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break
@@ -51,8 +50,8 @@

 /datum/antagonist/valentine/chem/roundend_report()
 	var/objectives_complete = TRUE
-	if(owner.objectives.len)
-		for(var/datum/objective/objective in owner.objectives)
+	if(objectives.len)
+		for(var/datum/objective/objective in objectives)
 			if(!objective.check_completion())
 				objectives_complete = FALSE
 				break
@@ -8,7 +8,6 @@
 	var/datum/objective/hijack/hijack = new
 	hijack.owner = owner
 	objectives += hijack
-	owner.objectives |= objectives

 /datum/antagonist/wishgranter/on_gain()
 	owner.special_role = "Avatar of the Wish Granter"
@@ -255,7 +255,7 @@

 /obj/item/voodoo/attackby(obj/item/I, mob/user, params)
 	if(target && cooldown < world.time)
-		if(I.is_hot())
+		if(I.get_temperature())
 			to_chat(target, "<span class='userdanger'>You suddenly feel very hot</span>")
 			target.adjust_bodytemperature(50)
 			GiveHint(target)
@@ -340,9 +340,9 @@
 		to_chat(victim, "<span class='notice'>You feel a dark presence from [A.name]</span>")

 /obj/item/voodoo/suicide_act(mob/living/carbon/user)
-    user.visible_message("<span class='suicide'>[user] links the voodoo doll to [user.p_them()]self and sits on it, infinitely crushing [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-    user.gib()
-    return(BRUTELOSS)
+	user.visible_message("<span class='suicide'>[user] links the voodoo doll to [user.p_them()]self and sits on it, infinitely crushing [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	user.gib()
+	return(BRUTELOSS)

 /obj/item/voodoo/fire_act(exposed_temperature, exposed_volume)
 	if(target)
@@ -383,7 +383,9 @@
 	if(!istype(user) || on_cooldown)
 		return
 	var/turf/T = get_turf(user)
-	if(!T)
+	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
@@ -35,15 +35,15 @@
 		to_chat(user, "<span class='danger'>An overwhelming feeling of dread comes over you as you pick up the soulstone. It would be wise to be rid of this quickly.</span>")

 /obj/item/soulstone/examine(mob/user)
-	..()
+	. = ..()
 	if(usability || iscultist(user) || iswizard(user) || isobserver(user))
 		if (old_shard)
-			to_chat(user, "<span class='cult'>A soulstone, used to capture a soul, either from dead humans or from freed shades.</span>")
+			. += "<span class='cult'>A soulstone, used to capture a soul, either from dead humans or from freed shades.</span>"
 		else
-			to_chat(user, "<span class='cult'>A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.</span>")
-		to_chat(user, "<span class='cult'>The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade.</span>")
+			. += "<span class='cult'>A soulstone, used to capture souls, either from unconscious or sleeping humans or from freed shades.</span>"
+		. += "<span class='cult'>The captured soul can be placed into a construct shell to produce a construct, or released from the stone as a shade.</span>"
 		if(spent)
-			to_chat(user, "<span class='cult'>This shard is spent; it is now just a creepy rock.</span>")
+			. += "<span class='cult'>This shard is spent; it is now just a creepy rock.</span>"

 /obj/item/soulstone/Destroy() //Stops the shade from being qdel'd immediately and their ghost being sent back to the arrival shuttle.
 	for(var/mob/living/simple_animal/shade/A in src)
@@ -102,13 +102,13 @@
 	desc = "A wicked machine used by those skilled in magical arts. It is inactive."

 /obj/structure/constructshell/examine(mob/user)
-	..()
+	. = ..()
 	if(iscultist(user) || iswizard(user) || user.stat == DEAD)
-		to_chat(user, "<span class='cult'>A construct shell, used to house bound souls from a soulstone.</span>")
-		to_chat(user, "<span class='cult'>Placing a soulstone with a soul into this shell allows you to produce your choice of the following:</span>")
-		to_chat(user, "<span class='cult'>An <b>Artificer</b>, which can produce <b>more shells and soulstones</b>, as well as fortifications.</span>")
-		to_chat(user, "<span class='cult'>A <b>Wraith</b>, which does high damage and can jaunt through walls, though it is quite fragile.</span>")
-		to_chat(user, "<span class='cult'>A <b>Juggernaut</b>, which is very hard to kill and can produce temporary walls, but is slow.</span>")
+		. += "<span class='cult'>A construct shell, used to house bound souls from a soulstone.</span>"
+		. += "<span class='cult'>Placing a soulstone with a soul into this shell allows you to produce your choice of the following:</span>"
+		. += "<span class='cult'>An <b>Artificer</b>, which can produce <b>more shells and soulstones</b>, as well as fortifications.</span>"
+		. += "<span class='cult'>A <b>Wraith</b>, which does high damage and can jaunt through walls, though it is quite fragile.</span>"
+		. += "<span class='cult'>A <b>Juggernaut</b>, which is very hard to kill and can produce temporary walls, but is slow.</span>"

 /obj/structure/constructshell/attackby(obj/item/O, mob/user, params)
 	if(istype(O, /obj/item/soulstone))
@@ -11,12 +11,18 @@
 	var/buy_word = "Learn"
 	var/limit //used to prevent a spellbook_entry from being bought more than X times with one wizard spellbook
 	var/list/no_coexistance_typecache //Used so you can't have specific spells together
+	var/dynamic_cost = 0 // How much threat the spell costs to purchase for dynamic.
+	var/dynamic_requirement = 0 // How high the threat level needs to be for purchasing in dynamic.

 /datum/spellbook_entry/New()
 	..()
 	no_coexistance_typecache = typecacheof(no_coexistance_typecache)

 /datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(dynamic_requirement > 0 && mode.threat_level < dynamic_requirement)
+			return 0
 	return 1

 /datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user,obj/item/spellbook/book) // Specific circumstances
@@ -25,6 +31,10 @@
 	for(var/spell in user.mind.spell_list)
 		if(is_type_in_typecache(spell, no_coexistance_typecache))
 			return 0
+	if(dynamic_cost>0 && istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		if(mode.threat < dynamic_cost)
+			return 0
 	return 1

 /datum/spellbook_entry/proc/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return 1 on success
@@ -60,6 +70,10 @@
 				SSblackbox.record_feedback("nested tally", "wizard_spell_improved", 1, list("[name]", "[aspell.spell_level]"))
 				return 1
 	//No same spell found - just learn it
+	if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		mode.spend_threat(dynamic_cost)
+		mode.log_threat("Wizard spent [dynamic_cost] on [name].")
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	user.mind.AddSpell(S)
 	to_chat(user, "<span class='notice'>You have learned [S.name].</span>")
@@ -83,6 +97,10 @@
 	if(!S)
 		S = new spell_type()
 	var/spell_levels = 0
+	if(dynamic_cost > 0 && istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		mode.refund_threat(dynamic_cost)
+		mode.log_threat("Wizard refunded [dynamic_cost] on [name].")
 	for(var/obj/effect/proc_holder/spell/aspell in user.mind.spell_list)
 		if(initial(S.name) == initial(aspell.name))
 			spell_levels = aspell.spell_level
@@ -285,6 +303,8 @@
 	name = "Staff of Change"
 	desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
 	item_path = /obj/item/gun/magic/staff/change
+	dynamic_requirement = 60
+	dynamic_cost = 20

 /datum/spellbook_entry/item/staffanimation
 	name = "Staff of Animation"
@@ -369,6 +389,8 @@
 	desc = "A magical contract binding an apprentice wizard to your service, using it will summon them to your side."
 	item_path = /obj/item/antag_spawner/contract
 	category = "Assistance"
+	dynamic_requirement = 50
+	dynamic_cost = 10

 /datum/spellbook_entry/item/guardian
 	name = "Guardian Deck"
@@ -388,6 +410,11 @@
 	item_path = /obj/item/antag_spawner/slaughter_demon
 	limit = 3
 	category = "Assistance"
+	dynamic_requirement = 60
+
+/datum/spellbook_entry/item/bloodbottle/New()
+	..()
+	dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]

 /datum/spellbook_entry/item/hugbottle
 	name = "Bottle of Tickles"
@@ -402,6 +429,11 @@
 	cost = 1 //non-destructive; it's just a jape, sibling!
 	limit = 3
 	category = "Assistance"
+	dynamic_requirement = 40
+
+/datum/spellbook_entry/item/hugbottle/New()
+	..()
+	dynamic_cost = CONFIG_GET(keyed_list/dynamic_cost)["slaughter_demon"]/3

 /datum/spellbook_entry/item/mjolnir
 	name = "Mjolnir"
@@ -465,7 +497,7 @@
 	if(!SSticker.mode)
 		return FALSE
 	else
-		return TRUE
+		return ..()

 /datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
@@ -478,11 +510,13 @@
 /datum/spellbook_entry/summon/guns
 	name = "Summon Guns"
 	desc = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill you. Just be careful not to stand still too long!"
+	dynamic_cost = 10
+	dynamic_requirement = 60

 /datum/spellbook_entry/summon/guns/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return !CONFIG_GET(flag/no_summon_guns)
+	return (!CONFIG_GET(flag/no_summon_guns) && ..())

 /datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
@@ -490,16 +524,23 @@
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon guns!</span>")
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = dynamic_cost
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon guns.")
 	return 1

 /datum/spellbook_entry/summon/magic
 	name = "Summon Magic"
 	desc = "Share the wonders of magic with the crew and show them why they aren't to be trusted with it at the same time."
+	dynamic_cost = 10
+	dynamic_requirement = 60

 /datum/spellbook_entry/summon/magic/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return !CONFIG_GET(flag/no_summon_magic)
+	return (!CONFIG_GET(flag/no_summon_guns) && ..())

 /datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
@@ -507,21 +548,33 @@
 	active = 1
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon magic!</span>")
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = dynamic_cost
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon magic.")
 	return 1

 /datum/spellbook_entry/summon/events
 	name = "Summon Events"
 	desc = "Give Murphy's law a little push and replace all events with special wizard ones that will confound and confuse everyone. Multiple castings increase the rate of these events."
+	dynamic_cost = 20
+	dynamic_requirement = 60
 	var/times = 0

 /datum/spellbook_entry/summon/events/IsAvailible()
 	if(!SSticker.mode) // In case spellbook is placed on map
 		return 0
-	return !CONFIG_GET(flag/no_summon_events)
+	return (!CONFIG_GET(flag/no_summon_events) && ..())

 /datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book)
 	SSblackbox.record_feedback("tally", "wizard_spell_learned", 1, name)
 	summonevents()
+	if(istype(SSticker.mode,/datum/game_mode/dynamic) && times == 0)
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		var/threat_spent = dynamic_cost
+		mode.spend_threat(threat_spent)
+		mode.log_threat("Wizard spent [threat_spent] on summon events.")
 	times++
 	playsound(get_turf(user), 'sound/magic/castsummon.ogg', 50, 1)
 	to_chat(user, "<span class='notice'>You have cast summon events.</span>")
@@ -549,11 +602,11 @@
 	var/list/categories = list()

 /obj/item/spellbook/examine(mob/user)
-	..()
+	. = ..()
 	if(owner)
-		to_chat(user, "There is a small signature on the front cover: \"[owner]\".")
+		. += "There is a small signature on the front cover: \"[owner]\"."
 	else
-		to_chat(user, "It appears to have no author.")
+		. += "It appears to have no author."

 /obj/item/spellbook/Initialize()
 	. = ..()
@@ -626,16 +679,16 @@
 	dat += {"
 	<head>
 		<style type="text/css">
-      		body { font-size: 80%; font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; }
-      		ul#tabs { list-style-type: none; margin: 30px 0 0 0; padding: 0 0 0.3em 0; }
-      		ul#tabs li { display: inline; }
-      		ul#tabs li a { color: #42454a; background-color: #dedbde; border: 1px solid #c9c3ba; border-bottom: none; padding: 0.3em; text-decoration: none; }
-      		ul#tabs li a:hover { background-color: #f1f0ee; }
-      		ul#tabs li a.selected { color: #000; background-color: #f1f0ee; font-weight: bold; padding: 0.7em 0.3em 0.38em 0.3em; }
-      		div.tabContent { border: 1px solid #c9c3ba; padding: 0.5em; background-color: #f1f0ee; }
-      		div.tabContent.hide { display: none; }
-    	</style>
-  	</head>
+			body { font-size: 80%; font-family: 'Lucida Grande', Verdana, Arial, Sans-Serif; }
+			ul#tabs { list-style-type: none; margin: 30px 0 0 0; padding: 0 0 0.3em 0; }
+			ul#tabs li { display: inline; }
+			ul#tabs li a { color: #42454a; background-color: #dedbde; border: 1px solid #c9c3ba; border-bottom: none; padding: 0.3em; text-decoration: none; }
+			ul#tabs li a:hover { background-color: #f1f0ee; }
+			ul#tabs li a.selected { color: #000; background-color: #f1f0ee; font-weight: bold; padding: 0.7em 0.3em 0.38em 0.3em; }
+			div.tabContent { border: 1px solid #c9c3ba; padding: 0.5em; background-color: #f1f0ee; }
+			div.tabContent.hide { display: none; }
+		</style>
+	</head>
 	"}
 	dat += {"[content]</body></html>"}
 	return dat
@@ -57,19 +57,19 @@
 	if(!GLOB.wizardstart.len)
 		SSjob.SendToLateJoin(owner.current)
 		to_chat(owner, "HOT INSERTION, GO GO GO")
-	owner.current.forceMove(pick(GLOB.wizardstart))
+	else
+		owner.current.forceMove(pick(GLOB.wizardstart))

 /datum/antagonist/wizard/proc/create_objectives()
 	var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
+	new_objective.completed = TRUE //So they can greentext without admin intervention.
 	new_objective.owner = owner
 	objectives += new_objective

-	var/datum/objective/escape/escape_objective = new
-	escape_objective.owner = owner
-	objectives += escape_objective
-
-	for(var/datum/objective/O in objectives)
-		owner.objectives += O
+	if (!(locate(/datum/objective/escape) in objectives))
+		var/datum/objective/escape/escape_objective = new
+		escape_objective.owner = owner
+		objectives += escape_objective

 /datum/antagonist/wizard/on_removal()
 	unregister()
@@ -165,7 +165,7 @@
 			owner.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball(null))
 			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.")
 		if(APPRENTICE_BLUESPACE)
-			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
+			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null))
 			owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
 			to_chat(owner, "<B>Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.")
 		if(APPRENTICE_HEALING)
@@ -183,7 +183,6 @@
 	new_objective.owner = owner
 	new_objective.target = master
 	new_objective.explanation_text = "Protect [master.current.real_name], the wizard."
-	owner.objectives += new_objective
 	objectives += new_objective

 //Random event wizard
@@ -251,7 +250,6 @@
 /datum/antagonist/wizard/academy/create_objectives()
 	var/datum/objective/new_objective = new("Protect Wizard Academy from the intruders")
 	new_objective.owner = owner
-	owner.objectives += new_objective
 	objectives += new_objective

 //Solo wizard report
@@ -112,8 +112,8 @@
 	return TRUE

 /obj/item/assembly/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]</span>")
+	. = ..()
+	. += "<span class='notice'>\The [src] [secured? "is secured and ready to be used!" : "can be attached to other things."]</span>"


 /obj/item/assembly/attack_self(mob/user)
@@ -8,9 +8,9 @@
 	var/cooldown = FALSE //Door cooldowns

 /obj/item/assembly/control/examine(mob/user)
-	..()
+	. = ..()
 	if(id)
-		to_chat(user, "<span class='notice'>Its channel ID is '[id]'.</span>")
+		. += "<span class='notice'>Its channel ID is '[id]'.</span>"

 /obj/item/assembly/control/activate()
 	cooldown = TRUE
@@ -11,8 +11,8 @@
 	var/alarm_health = HEALTH_THRESHOLD_CRIT

 /obj/item/assembly/health/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.</span>")
+	. = ..()
+	. += "<span class='notice'>Use a multitool to swap between \"detect death\" mode and \"detect critical state\" mode.</span>"

 /obj/item/assembly/health/activate()
 	if(!..())
@@ -38,8 +38,8 @@
 	. = ..()

 /obj/item/assembly/infra/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The infrared trigger is [on?"on":"off"].</span>")
+	. = ..()
+	. += "<span class='notice'>The infrared trigger is [on?"on":"off"].</span>"

 /obj/item/assembly/infra/activate()
 	if(!..())
@@ -138,7 +138,7 @@
 	. = ..()
 	setDir(t)

-/obj/item/assembly/infra/throw_at()
+/obj/item/assembly/infra/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
 	. = ..()
 	olddir = dir

@@ -9,8 +9,8 @@


 /obj/item/assembly/mousetrap/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>The pressure plate is [armed?"primed":"safe"].</span>")
+	. = ..()
+	. += "<span class='notice'>The pressure plate is [armed?"primed":"safe"].</span>"

 /obj/item/assembly/mousetrap/activate()
 	if(..())
--- a/Show More
+++ b/Show More