Bleeding edgy refresh (#303)

* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors

code/datums/action.dm

@@ -345,7 +345,7 @@
 			owner.research_scanner++
 		else
 			owner.research_scanner--
-		owner << "<span class='notice'>[target] research scanner has been [active ? "activated" : "deactivated"].</span>"
+		to_chat(owner, "<span class='notice'>[target] research scanner has been [active ? "activated" : "deactivated"].</span>")
 		return 1
 
 /datum/action/item_action/toggle_research_scanner/Remove(mob/M)

code/datums/ai_laws.dm

@@ -382,28 +382,28 @@
 
 	if (devillaws && devillaws.len) //Yes, devil laws go in FRONT of zeroth laws, as the devil must still obey it's ban/obligation.
 		for(var/i in devillaws)
-			who << "666. [i]"
+			to_chat(who, "666. [i]")
 
 	if (zeroth)
-		who << "0. [zeroth]"
+		to_chat(who, "0. [zeroth]")
 
 	for (var/index = 1, index <= ion.len, index++)
 		var/law = ion[index]
 		var/num = ionnum()
-		who << "[num]. [law]"
+		to_chat(who, "[num]. [law]")
 
 	var/number = 1
 	for (var/index = 1, index <= inherent.len, index++)
 		var/law = inherent[index]
 
 		if (length(law) > 0)
-			who << "[number]. [law]"
+			to_chat(who, "[number]. [law]")
 			number++
 
 	for (var/index = 1, index <= supplied.len, index++)
 		var/law = supplied[index]
 		if (length(law) > 0)
-			who << "[number]. [law]"
+			to_chat(who, "[number]. [law]")
 			number++
 
 /datum/ai_laws/proc/clear_zeroth_law(force) //only removes zeroth from antag ai if force is 1

code/datums/antagonists/antag_datum.dm

@@ -29,7 +29,7 @@
 /datum/antagonist/proc/on_gain() //on initial gain of antag datum, do this. should only be called once per datum
 	apply_innate_effects()
 	if(!silent_update && some_flufftext)
-		owner << some_flufftext
+		to_chat(owner, some_flufftext)
 
 /datum/antagonist/proc/apply_innate_effects() //applies innate effects to the owner, may be called multiple times due to mind transferral, but should only be called once per mob
 	//antag huds would go here if antag huds were less completely unworkable as-is

code/datums/antagonists/datum_clockcult.dm

@@ -20,20 +20,20 @@
 /datum/antagonist/clockcultist/give_to_body(mob/living/new_body)
 	if(!silent_update)
 		if(issilicon(new_body))
-			new_body << "<span class='heavy_brass'>You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the Clockwork Justiciar, \
-			lies in exile, derelict and forgotten in an unseen realm.</span>"
+			to_chat(new_body, "<span class='heavy_brass'>You are unable to compute this truth. Your vision glows a brilliant yellow, and all at once it comes to you. Ratvar, the Clockwork Justiciar, \
+			lies in exile, derelict and forgotten in an unseen realm.</span>")
 		else
-			new_body << "<span class='heavy_brass'>[iscarbon(new_body) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant yellow! All at once it comes to you. \
-			Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.</span>"
+			to_chat(new_body, "<span class='heavy_brass'>[iscarbon(new_body) ? "Your mind is racing! Your body feels incredibly light! ":""]Your world glows a brilliant yellow! All at once it comes to you. \
+			Ratvar, the Clockwork Justiciar, lies in exile, derelict and forgotten in an unseen realm.</span>")
 	. = ..()
 	if(!silent_update && new_body)
 		if(.)
 			new_body.visible_message("<span class='heavy_brass'>[new_body]'s eyes glow a blazing yellow!</span>")
-			new_body << "<span class='heavy_brass'>Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. \
-			Perform his every whim without hesitation.</span>"
+			to_chat(new_body, "<span class='heavy_brass'>Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. \
+			Perform his every whim without hesitation.</span>")
 		else
 			new_body.visible_message("<span class='boldwarning'>[new_body] seems to resist an unseen force!</span>")
-			new_body << "<span class='userdanger'>And yet, you somehow push it all away.</span>"
+			to_chat(new_body, "<span class='userdanger'>And yet, you somehow push it all away.</span>")
 
 /datum/antagonist/clockcultist/on_gain()
 	if(ticker && ticker.mode && owner.mind)
@@ -43,17 +43,17 @@
 			INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_SERVANT_OF_RATVAR, ROLE_SERVANT_OF_RATVAR)
 	if(owner.mind)
 		owner.mind.special_role = "Servant of Ratvar"
-	owner.attack_log += "\[[time_stamp()]\] <font color=#BE8700>Has been converted to the cult of Ratvar!</font>"
+	owner.log_message("<font color=#BE8700>Has been converted to the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(issilicon(owner))
 		var/mob/living/silicon/S = owner
 		if(iscyborg(S) && !silent_update)
-			S << "<span class='boldwarning'>You have been desynced from your master AI.\n\
-			In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>"
+			to_chat(S, "<span class='boldwarning'>You have been desynced from your master AI.\n\
+			In addition, your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>")
 		if(isAI(S))
-			S << "<span class='boldwarning'>You are able to use your cameras to listen in on conversations.</span>"
-		S << "<span class='heavy_brass'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>"
+			to_chat(S, "<span class='boldwarning'>You are able to use your cameras to listen in on conversations.</span>")
+		to_chat(S, "<span class='heavy_brass'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	else if(isbrain(owner) || isclockmob(owner))
-		owner << "<span class='nezbere'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>"
+		to_chat(owner, "<span class='nezbere'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	..()
 	if(istype(ticker.mode, /datum/game_mode/clockwork_cult))
 		var/datum/game_mode/clockwork_cult/C = ticker.mode
@@ -89,7 +89,7 @@
 					R.visible_message("<span class='heavy_brass'>[R]'s eyes glow a blazing yellow!</span>", \
 					"<span class='heavy_brass'>Assist your new companions in their righteous efforts. Your goal is theirs, and theirs yours. You serve the Clockwork Justiciar above all else. Perform his every \
 					whim without hesitation.</span>")
-					R << "<span class='boldwarning'>Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>"
+					to_chat(R, "<span class='boldwarning'>Your onboard camera is no longer active and you have gained additional equipment, including a limited clockwork slab.</span>")
 					add_servant_of_ratvar(R, TRUE)
 		S.laws = new/datum/ai_laws/ratvar
 		S.laws.associate(S)
@@ -154,7 +154,7 @@
 	if(owner.mind)
 		owner.mind.wipe_memory()
 		owner.mind.special_role = null
-	owner.attack_log += "\[[time_stamp()]\] <font color=#BE8700>Has renounced the cult of Ratvar!</font>"
+	owner.log_message("<font color=#BE8700>Has renounced the cult of Ratvar!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(iscyborg(owner))
-		owner << "<span class='warning'>Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.</span>"
+		to_chat(owner, "<span class='warning'>Despite your freedom from Ratvar's influence, you are still irreparably damaged and no longer possess certain functions such as AI linking.</span>")
 	..()

code/datums/antagonists/datum_cult.dm

@@ -23,7 +23,7 @@
 			INVOKE_ASYNC(ticker.mode, /datum/game_mode.proc/replace_jobbaned_player, owner, ROLE_CULTIST, ROLE_CULTIST)
 	if(owner.mind)
 		owner.mind.special_role = "Cultist"
-	owner.attack_log += "\[[time_stamp()]\] <font color=#960000>Has been converted to the cult of Nar'Sie!</font>"
+	owner.log_message("<font color=#960000>Has been converted to the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	..()
 
 /datum/antagonist/cultist/apply_innate_effects()
@@ -43,8 +43,8 @@
 		if(ticker && ticker.mode)
 			ticker.mode.cult -= owner.mind
 			ticker.mode.update_cult_icons_removed(owner.mind)
-	owner << "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.</span>"
-	owner.attack_log += "\[[time_stamp()]\] <font color=#960000>Has renounced the cult of Nar'Sie!</font>"
+	to_chat(owner, "<span class='userdanger'>An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant.</span>")
+	owner.log_message("<font color=#960000>Has renounced the cult of Nar'Sie!</font>", INDIVIDUAL_ATTACK_LOG)
 	if(!silent_update)
 		owner.visible_message("<span class='big'>[owner] looks like [owner.p_they()] just reverted to their old faith!</span>")
 	..()

code/datums/browser.dm

@@ -249,7 +249,7 @@
 
 	winset(user, windowid, "on-close=\".windowclose [param]\"")
 
-	//world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]"
+	//to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]")
 
 
 // the on-close client verb
@@ -261,12 +261,12 @@
 	set hidden = 1						// hide this verb from the user's panel
 	set name = ".windowclose"			// no autocomplete on cmd line
 
-	//world << "windowclose: [atomref]"
+	//to_chat(world, "windowclose: [atomref]")
 	if(atomref!="null")				// if passed a real atomref
 		var/hsrc = locate(atomref)	// find the reffed atom
 		var/href = "close=1"
 		if(hsrc)
-			//world << "[src] Topic [href] [hsrc]"
+			//to_chat(world, "[src] Topic [href] [hsrc]")
 			usr = src.mob
 			src.Topic(href, params2list(href), hsrc)	// this will direct to the atom's
 			return										// Topic() proc via client.Topic()
@@ -274,6 +274,6 @@
 	// no atomref specified (or not found)
 	// so just reset the user mob's machine var
 	if(src && src.mob)
-		//world << "[src] was [src.mob.machine], setting to null"
+		//to_chat(world, "[src] was [src.mob.machine], setting to null")
 		src.mob.unset_machine()
 	return

code/datums/datacore.dm

@@ -16,6 +16,17 @@
 	name = "record"
 	var/list/fields = list()
 
+/datum/data/record/Destroy()
+	if(src in data_core.medical)
+		data_core.medical -= src
+	if(src in data_core.security)
+		data_core.security -= src
+	if(src in data_core.general)
+		data_core.general -= src
+	if(src in data_core.locked)
+		data_core.locked -= src
+	. = ..()
+
 /datum/data/crime
 	name = "crime"
 	var/crimeName = ""
@@ -66,8 +77,10 @@
 			return
 
 /datum/datacore/proc/manifest()
-	for(var/mob/living/carbon/human/H in player_list)
-		manifest_inject(H)
+	for(var/mob/dead/new_player/N in player_list)
+		if(ishuman(N.new_character))
+			manifest_inject(N.new_character, N.client)
+		CHECK_TICK
 
 /datum/datacore/proc/manifest_modify(name, assignment)
 	var/datum/data/record/foundrecord = find_record("name", name, data_core.general)
@@ -183,7 +196,7 @@
 
 
 var/record_id_num = 1001
-/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H)
+/datum/datacore/proc/manifest_inject(mob/living/carbon/human/H, client/C)
 	if(H.mind && (H.mind.assigned_role != H.mind.special_role))
 		var/assignment
 		if(H.mind.assigned_role)
@@ -194,7 +207,9 @@ var/record_id_num = 1001
 			assignment = "Unassigned"
 
 		var/id = num2hex(record_id_num++,6)
-		var/image = get_id_photo(H)
+		if(!C)
+			C = H.client
+		var/image = get_id_photo(H, C)
 		var/obj/item/weapon/photo/photo_front = new()
 		var/obj/item/weapon/photo/photo_side = new()
 		photo_front.photocreate(null, icon(image, dir = SOUTH))
@@ -262,7 +277,11 @@ var/record_id_num = 1001
 		locked += L
 	return
 
-/datum/datacore/proc/get_id_photo(mob/living/carbon/human/H)
+/datum/datacore/proc/get_id_photo(mob/living/carbon/human/H, client/C)
 	var/datum/job/J = SSjob.GetJob(H.mind.assigned_role)
-	var/datum/preferences/P = H.client.prefs
+	var/datum/preferences/P
+	if(!C)
+		C = H.client
+	if(C)
+		P = C.prefs
 	return get_flat_human_icon(null,J.outfit,P)

code/datums/datumvars.dm

@@ -37,7 +37,7 @@
 	var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round.
 
 	if(!usr.client || !usr.client.holder)
-		usr << "<span class='danger'>You need to be an administrator to access this.</span>"
+		to_chat(usr, "<span class='danger'>You need to be an administrator to access this.</span>")
 		return
 
 	if(!D)
@@ -80,7 +80,7 @@
 			if(A.dir)
 				atomsnowflake += "<br><font size='1'><a href='?_src_=vars;rotatedatum=[refid];rotatedir=left'><<</a> <a href='?_src_=vars;datumedit=[refid];varnameedit=dir'>[dir2text(A.dir)]</a> <a href='?_src_=vars;rotatedatum=[refid];rotatedir=right'>>></a></font>"
 			var/mob/living/M = A
-			//citadel code
+			//citadel arousal code
 			atomsnowflake += {"
 				<br><font size='1'><a href='?_src_=vars;datumedit=[refid];varnameedit=ckey'>[M.ckey ? M.ckey : "No ckey"]</a> / <a href='?_src_=vars;datumedit=[refid];varnameedit=real_name'>[M.real_name ? M.real_name : "No real name"]</a></font>
 				<br><font size='1'>
@@ -484,7 +484,7 @@
 
 		var/mob/M = locate(href_list["mob_player_panel"])
 		if(!istype(M))
-			usr << "This can only be used on instances of type /mob"
+			to_chat(usr, "This can only be used on instances of type /mob")
 			return
 
 		src.holder.show_player_panel(M)
@@ -496,7 +496,7 @@
 
 		var/mob/M = locate(href_list["godmode"])
 		if(!istype(M))
-			usr << "This can only be used on instances of type /mob"
+			to_chat(usr, "This can only be used on instances of type /mob")
 			return
 
 		src.cmd_admin_godmode(M)
@@ -508,7 +508,7 @@
 
 		var/datum/D = locate(href_list["mark_object"])
 		if(!istype(D))
-			usr << "This can only be done to instances of type /datum"
+			to_chat(usr, "This can only be done to instances of type /datum")
 			return
 
 		src.holder.marked_datum = D
@@ -529,7 +529,7 @@
 
 		var/mob/M = locate(href_list["regenerateicons"])
 		if(!ismob(M))
-			usr << "This can only be done to instances of type /mob"
+			to_chat(usr, "This can only be done to instances of type /mob")
 			return
 		M.regenerate_icons()
 
@@ -546,7 +546,7 @@
 
 			var/mob/M = locate(href_list["rename"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN)
@@ -563,7 +563,7 @@
 
 			var/D = locate(href_list["datumedit"])
 			if(!istype(D,/datum))
-				usr << "This can only be used on datums"
+				to_chat(usr, "This can only be used on datums")
 				return
 
 			modify_variables(D, href_list["varnameedit"], 1)
@@ -574,7 +574,7 @@
 
 			var/D = locate(href_list["datumchange"])
 			if(!istype(D,/datum))
-				usr << "This can only be used on datums"
+				to_chat(usr, "This can only be used on datums")
 				return
 
 			modify_variables(D, href_list["varnamechange"], 0)
@@ -585,7 +585,7 @@
 
 			var/datum/D = locate(href_list["datummass"])
 			if(!istype(D))
-				usr << "This can only be used on instances of type /datum"
+				to_chat(usr, "This can only be used on instances of type /datum")
 				return
 
 			cmd_mass_modify_object_variables(D, href_list["varnamemass"])
@@ -597,7 +597,7 @@
 
 			var/list/L = locate(href_list["listedit"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			mod_list(L, null, "list", "contents", index, autodetect_class = TRUE)
@@ -609,7 +609,7 @@
 
 			var/list/L = locate(href_list["listchange"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			mod_list(L, null, "list", "contents", index, autodetect_class = FALSE)
@@ -621,7 +621,7 @@
 
 			var/list/L = locate(href_list["listremove"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			var/variable = L[index]
@@ -636,7 +636,7 @@
 		else if(href_list["listadd"])
 			var/list/L = locate(href_list["listadd"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			mod_list_add(L, null, "list", "contents")
@@ -644,7 +644,7 @@
 		else if(href_list["listdupes"])
 			var/list/L = locate(href_list["listdupes"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			uniqueList_inplace(L)
@@ -655,7 +655,7 @@
 		else if(href_list["listnulls"])
 			var/list/L = locate(href_list["listnulls"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			listclearnulls(L)
@@ -666,7 +666,7 @@
 		else if(href_list["listlen"])
 			var/list/L = locate(href_list["listlen"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 			var/value = vv_get_value(VV_NUM)
 			if (value["class"] != VV_NUM)
@@ -680,7 +680,7 @@
 		else if(href_list["listshuffle"])
 			var/list/L = locate(href_list["listshuffle"])
 			if (!istype(L))
-				usr << "This can only be used on instances of type /list"
+				to_chat(usr, "This can only be used on instances of type /list")
 				return
 
 			shuffle_inplace(L)
@@ -694,7 +694,7 @@
 
 			var/mob/M = locate(href_list["give_spell"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			src.give_spell(M)
@@ -706,7 +706,7 @@
 
 			var/mob/M = locate(href_list["remove_spell"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			remove_spell(M)
@@ -718,7 +718,7 @@
 
 			var/mob/M = locate(href_list["give_disease"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			src.give_disease(M)
@@ -730,7 +730,7 @@
 
 			var/mob/M = locate(href_list["ninja"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			src.cmd_admin_ninjafy(M)
@@ -742,7 +742,7 @@
 
 			var/mob/M = locate(href_list["gib"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			src.cmd_admin_gib(M)
@@ -753,7 +753,7 @@
 
 			var/mob/M = locate(href_list["build_mode"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			togglebuildmode(M)
@@ -765,7 +765,7 @@
 
 			var/mob/M = locate(href_list["drop_everything"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			if(usr.client)
@@ -777,7 +777,7 @@
 
 			var/mob/M = locate(href_list["direct_control"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 
 			if(usr.client)
@@ -789,7 +789,7 @@
 
 			var/mob/M = locate(href_list["offer_control"])
 			if(!istype(M))
-				usr << "This can only be used on instances of type /mob"
+				to_chat(usr, "This can only be used on instances of type /mob")
 				return
 			offer_control(M)
 
@@ -799,7 +799,7 @@
 
 			var/obj/O = locate(href_list["delall"])
 			if(!isobj(O))
-				usr << "This can only be used on instances of type /obj"
+				to_chat(usr, "This can only be used on instances of type /obj")
 				return
 
 			var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
@@ -822,7 +822,7 @@
 							qdel(Obj)
 						CHECK_TICK
 					if(!i)
-						usr << "No objects of this type exist"
+						to_chat(usr, "No objects of this type exist")
 						return
 					log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
 					message_admins("<span class='notice'>[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) </span>")
@@ -834,7 +834,7 @@
 							qdel(Obj)
 						CHECK_TICK
 					if(!i)
-						usr << "No objects of this type exist"
+						to_chat(usr, "No objects of this type exist")
 						return
 					log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
 					message_admins("<span class='notice'>[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) </span>")
@@ -864,7 +864,7 @@
 								if(ID == chosen_id)
 									valid_id = 1
 							if(!valid_id)
-								usr << "<span class='warning'>A reagent with that ID doesn't exist!</span>"
+								to_chat(usr, "<span class='warning'>A reagent with that ID doesn't exist!</span>")
 					if("Choose ID")
 						chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in reagent_options
 				if(chosen_id)
@@ -882,7 +882,7 @@
 
 			var/atom/A = locate(href_list["explode"])
 			if(!isobj(A) && !ismob(A) && !isturf(A))
-				usr << "This can only be done to instances of type /obj, /mob and /turf"
+				to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
 				return
 
 			src.cmd_admin_explosion(A)
@@ -894,7 +894,7 @@
 
 			var/atom/A = locate(href_list["emp"])
 			if(!isobj(A) && !ismob(A) && !isturf(A))
-				usr << "This can only be done to instances of type /obj, /mob and /turf"
+				to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
 				return
 
 			src.cmd_admin_emp(A)
@@ -906,7 +906,7 @@
 
 			var/atom/A = locate(href_list["rotatedatum"])
 			if(!istype(A))
-				usr << "This can only be done to instances of type /atom"
+				to_chat(usr, "This can only be done to instances of type /atom")
 				return
 
 			switch(href_list["rotatedir"])
@@ -922,7 +922,7 @@
 
 			var/mob/living/carbon/C = locate(href_list["editorgans"])
 			if(!istype(C))
-				usr << "This can only be done to instances of type /mob/living/carbon"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
 				return
 
 			manipulate_organs(C)
@@ -934,13 +934,13 @@
 
 			var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"])
 			if(!istype(Mo))
-				usr << "This can only be done to instances of type /mob/living/carbon/monkey"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!Mo)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("humanone"=href_list["makehuman"]))
 
@@ -950,13 +950,13 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["makemonkey"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("monkeyone"=href_list["makemonkey"]))
 
@@ -966,13 +966,13 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["makerobot"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("makerobot"=href_list["makerobot"]))
 
@@ -982,13 +982,13 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["makealien"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("makealien"=href_list["makealien"]))
 
@@ -998,13 +998,13 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["makeslime"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("makeslime"=href_list["makeslime"]))
 
@@ -1014,13 +1014,13 @@
 
 			var/mob/living/carbon/H = locate(href_list["makeai"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
 				return
 
 			if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
 				return
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 			holder.Topic(href, list("makeai"=href_list["makeai"]))
 
@@ -1030,13 +1030,13 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["setspecies"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 
 			var/result = input(usr, "Please choose a new species","Species") as null|anything in species_list
 
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 
 			if(result)
@@ -1049,7 +1049,7 @@
 
 			var/mob/living/carbon/C = locate(href_list["editbodypart"])
 			if(!istype(C))
-				usr << "This can only be done to instances of type /mob/living/carbon"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
 				return
 
 			var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment")
@@ -1061,7 +1061,7 @@
 			var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list
 
 			if(!C)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 
 			if(result)
@@ -1071,21 +1071,21 @@
 						if(BP)
 							BP.drop_limb()
 						else
-							usr << "[C] doesn't have such bodypart."
+							to_chat(usr, "[C] doesn't have such bodypart.")
 					if("add")
 						if(BP)
-							usr << "[C] already has such bodypart."
+							to_chat(usr, "[C] already has such bodypart.")
 						else
 							if(!C.regenerate_limb(result))
-								usr << "[C] cannot have such bodypart."
+								to_chat(usr, "[C] cannot have such bodypart.")
 					if("augment")
 						if(ishuman(C))
 							if(BP)
 								BP.change_bodypart_status(BODYPART_ROBOTIC, 1)
 							else
-								usr << "[C] doesn't have such bodypart."
+								to_chat(usr, "[C] doesn't have such bodypart.")
 						else
-							usr << "Only humans can be augmented."
+							to_chat(usr, "Only humans can be augmented.")
 
 
 
@@ -1095,25 +1095,24 @@
 
 			var/mob/living/carbon/human/H = locate(href_list["purrbation"])
 			if(!istype(H))
-				usr << "This can only be done to instances of type /mob/living/carbon/human"
+				to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
 				return
 			if(!ishumanbasic(H))
-				usr << "This can only be done to the basic human species \
-					at the moment."
+				to_chat(usr, "This can only be done to the basic human species at the moment.")
 				return
 
 			if(!H)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 
 			var/success = purrbation_toggle(H)
 			if(success)
-				usr << "Put [H] on purrbation."
+				to_chat(usr, "Put [H] on purrbation.")
 				log_admin("[key_name(usr)] has put [key_name(H)] on purrbation.")
 				message_admins("<span class='notice'>[key_name(usr)] has put [key_name(H)] on purrbation.</span>")
 
 			else
-				usr << "Removed [H] from purrbation."
+				to_chat(usr, "Removed [H] from purrbation.")
 				log_admin("[key_name(usr)] has removed [key_name(H)] from purrbation.")
 				message_admins("<span class='notice'>[key_name(usr)] has removed [key_name(H)] from purrbation.</span>")
 
@@ -1130,7 +1129,7 @@
 			var/amount =  input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
 
 			if(!L)
-				usr << "Mob doesn't exist anymore"
+				to_chat(usr, "Mob doesn't exist anymore")
 				return
 
 			switch(Text)
@@ -1151,7 +1150,7 @@
 				if("arousal")
 					L.adjustArousalLoss(amount)
 				else
-					usr << "You caused an error. DEBUG: Text:[Text] Mob:[L]"
+					to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
 					return
 
 			if(amount != 0)

code/datums/diseases/advance/advance.dm

@@ -163,7 +163,7 @@ var/list/advance_cures = 	list(
 	return generated
 
 /datum/disease/advance/proc/Refresh(new_name = 0)
-	//world << "[src.name] \ref[src] - REFRESH!"
+	//to_chat(world, "[src.name] \ref[src] - REFRESH!")
 	GenerateProperties()
 	AssignProperties()
 	id = null
@@ -255,7 +255,7 @@ var/list/advance_cures = 	list(
 /datum/disease/advance/proc/GenerateCure()
 	if(properties && properties.len)
 		var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len)
-		//world << "Res = [res]"
+		//to_chat(world, "Res = [res]")
 		cures = list(advance_cures[res])
 
 		// Get the cure name from the cure_id
@@ -327,7 +327,7 @@ var/list/advance_cures = 	list(
 // Mix a list of advance diseases and return the mixed result.
 /proc/Advance_Mix(var/list/D_list)
 
-	//world << "Mixing!!!!"
+	//to_chat(world, "Mixing!!!!")
 
 	var/list/diseases = list()
 
@@ -352,7 +352,7 @@ var/list/advance_cures = 	list(
 		D2.Mix(D1)
 
 	 // Should be only 1 entry left, but if not let's only return a single entry
-	//world << "END MIXING!!!!!"
+	//to_chat(world, "END MIXING!!!!!")
 	var/datum/disease/advance/to_return = pick(diseases)
 	to_return.Refresh(1)
 	return to_return
@@ -421,7 +421,7 @@ var/list/advance_cures = 	list(
 /mob/verb/test()
 
 	for(var/datum/disease/D in SSdisease.processing)
-		src << "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>"
+		to_chat(src, "<a href='?_src_=vars;Vars=\ref[D]'>[D.name] - [D.holder]</a>")
 */
 
 

code/datums/diseases/advance/symptoms/beard.dm

@@ -32,17 +32,17 @@ BONUS
 			var/mob/living/carbon/human/H = M
 			switch(A.stage)
 				if(1, 2)
-					H << "<span class='warning'>Your chin itches.</span>"
+					to_chat(H, "<span class='warning'>Your chin itches.</span>")
 					if(H.facial_hair_style == "Shaved")
 						H.facial_hair_style = "Jensen Beard"
 						H.update_hair()
 				if(3, 4)
-					H << "<span class='warning'>You feel tough.</span>"
+					to_chat(H, "<span class='warning'>You feel tough.</span>")
 					if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard") && !(H.facial_hair_style == "Full Beard"))
 						H.facial_hair_style = "Full Beard"
 						H.update_hair()
 				else
-					H << "<span class='warning'>You feel manly!</span>"
+					to_chat(H, "<span class='warning'>You feel manly!</span>")
 					if(!(H.facial_hair_style == "Dwarf Beard") && !(H.facial_hair_style == "Very Long Beard"))
 						H.facial_hair_style = pick("Dwarf Beard", "Very Long Beard")
 						H.update_hair()

code/datums/diseases/advance/symptoms/choking.dm

@@ -31,13 +31,13 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2)
-				M << "<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]</span>")
 			if(3, 4)
-				M << "<span class='warning'><b>[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]</span>"
+				to_chat(M, "<span class='warning'><b>[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]</span>")
 				Choke_stage_3_4(M, A)
 				M.emote("gasp")
 			else
-				M << "<span class='userdanger'>[pick("You're choking!", "You can't breathe!")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("You're choking!", "You can't breathe!")]</span>")
 				Choke(M, A)
 				M.emote("gasp")
 	return
@@ -85,11 +85,11 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(3, 4)
-				M << "<span class='warning'><b>[pick("Your windpipe feels thin.", "Your lungs feel small.")]</span>"
+				to_chat(M, "<span class='warning'><b>[pick("Your windpipe feels thin.", "Your lungs feel small.")]</span>")
 				Asphyxiate_stage_3_4(M, A)
 				M.emote("gasp")
 			else
-				M << "<span class='userdanger'>[pick("Your lungs hurt!", "It hurts to breathe!")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("Your lungs hurt!", "It hurts to breathe!")]</span>")
 				Asphyxiate(M, A)
 				M.emote("gasp")
 				if(M.getOxyLoss() >= 120)

code/datums/diseases/advance/symptoms/confusion.dm

@@ -32,9 +32,9 @@ Bonus
 		var/mob/living/carbon/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("Your head hurts.", "Your mind blanks for a moment.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your mind blanks for a moment.")]</span>")
 			else
-				M << "<span class='userdanger'>You can't think straight!</span>"
+				to_chat(M, "<span class='userdanger'>You can't think straight!</span>")
 				M.confused = min(100, M.confused + 8)
 
 	return

code/datums/diseases/advance/symptoms/cough.dm

@@ -31,7 +31,7 @@ BONUS
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3)
-				M << "<span notice='warning'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>"
+				to_chat(M, "<span notice='warning'>[pick("You swallow excess mucus.", "You lightly cough.")]</span>")
 			else
 				M.emote("cough")
 				var/obj/item/I = M.get_active_held_item()

code/datums/diseases/advance/symptoms/deafness.dm

@@ -31,14 +31,14 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(3, 4)
-				M << "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You hear a ringing in your ear.", "Your ears pop.")]</span>")
 			if(5)
 				if(!(M.ear_deaf))
-					M << "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>"
+					to_chat(M, "<span class='userdanger'>Your ears pop and begin ringing loudly!</span>")
 					M.setEarDamage(-1,INFINITY) //Shall be enough
 					addtimer(CALLBACK(src, .proc/Undeafen, M), 200)
 
 /datum/symptom/deafness/proc/Undeafen(mob/living/M)
 	if(M)
-		M << "<span class='warning'>The ringing in your ears fades...</span>"
+		to_chat(M, "<span class='warning'>The ringing in your ears fades...</span>")
 		M.setEarDamage(-1,0)

code/datums/diseases/advance/symptoms/dizzy.dm

@@ -31,8 +31,8 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("You feel dizzy.", "Your head spins.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel dizzy.", "Your head spins.")]</span>")
 			else
-				M << "<span class='userdanger'>A wave of dizziness washes over you!</span>"
+				to_chat(M, "<span class='userdanger'>A wave of dizziness washes over you!</span>")
 				M.Dizzy(5)
 	return

code/datums/diseases/advance/symptoms/fever.dm

@@ -29,7 +29,7 @@ Bonus
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/carbon/M = A.affected_mob
-		M << "<span class='warning'>[pick("You feel hot.", "You feel like you're burning.")]</span>"
+		to_chat(M, "<span class='warning'>[pick("You feel hot.", "You feel like you're burning.")]</span>")
 		if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT)
 			Heat(M, A)
 

code/datums/diseases/advance/symptoms/fire.dm

@@ -31,16 +31,16 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(3)
-				M << "<span class='warning'>[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]</span>")
 			if(4)
 				Firestacks_stage_4(M, A)
 				M.IgniteMob()
-				M << "<span class='userdanger'>Your skin bursts into flames!</span>"
+				to_chat(M, "<span class='userdanger'>Your skin bursts into flames!</span>")
 				M.emote("scream")
 			if(5)
 				Firestacks_stage_5(M, A)
 				M.IgniteMob()
-				M << "<span class='userdanger'>Your skin erupts into an inferno!</span>"
+				to_chat(M, "<span class='userdanger'>Your skin erupts into an inferno!</span>")
 				M.emote("scream")
 	return
 
@@ -90,16 +90,16 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(3)
-				M << "<span class='warning'>[pick("Your veins boil.", "You feel hot.", "You smell meat cooking.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("Your veins boil.", "You feel hot.", "You smell meat cooking.")]</span>")
 			if(4)
 				Alkali_fire_stage_4(M, A)
 				M.IgniteMob()
-				M << "<span class='userdanger'>Your sweat bursts into flames!</span>"
+				to_chat(M, "<span class='userdanger'>Your sweat bursts into flames!</span>")
 				M.emote("scream")
 			if(5)
 				Alkali_fire_stage_5(M, A)
 				M.IgniteMob()
-				M << "<span class='userdanger'>Your skin erupts into an inferno!</span>"
+				to_chat(M, "<span class='userdanger'>Your skin erupts into an inferno!</span>")
 				M.emote("scream")
 				if(M.fire_stacks < 0)
 					M.visible_message("<span class='warning'>[M]'s sweat sizzles and pops on contact with water!</span>")

code/datums/diseases/advance/symptoms/flesh_eating.dm

@@ -31,9 +31,9 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(2,3)
-				M << "<span class='warning'>[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]</span>")
 			if(4,5)
-				M << "<span class='userdanger'>[pick("You cringe as a violent pain takes over your body.", "It feels like your body is eating itself inside out.", "IT HURTS.")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("You cringe as a violent pain takes over your body.", "It feels like your body is eating itself inside out.", "IT HURTS.")]</span>")
 				Flesheat(M, A)
 	return
 
@@ -75,9 +75,9 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(2,3)
-				M << "<span class='warning'>[pick("You feel your body break apart.", "Your skin rubs off like dust.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel your body break apart.", "Your skin rubs off like dust.")]</span>")
 			if(4,5)
-				M << "<span class='userdanger'>[pick("You feel your muscles weakening.", "Your skin begins detaching itself.", "You feel sandy.")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("You feel your muscles weakening.", "Your skin begins detaching itself.", "You feel sandy.")]</span>")
 				Flesh_death(M, A)
 	return
 

code/datums/diseases/advance/symptoms/genetics.dm

@@ -35,7 +35,7 @@ Bonus
 			return
 		switch(A.stage)
 			if(4, 5)
-				C << "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>"
+				to_chat(C, "<span class='warning'>[pick("Your skin feels itchy.", "You feel light headed.")]</span>")
 				C.dna.remove_mutation_group(possible_mutations)
 				C.randmut(possible_mutations)
 	return

code/datums/diseases/advance/symptoms/hallucigen.dm

@@ -31,11 +31,11 @@ Bonus
 		var/mob/living/carbon/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2)
-				M << "<span class='warning'>[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]</span>")
 			if(3, 4)
-				M << "<span class='danger'>[pick("Something is following you.", "You are being watched.", "You hear a whisper in your ear.", "Thumping footsteps slam toward you from nowhere.")]</span>"
+				to_chat(M, "<span class='danger'>[pick("Something is following you.", "You are being watched.", "You hear a whisper in your ear.", "Thumping footsteps slam toward you from nowhere.")]</span>")
 			else
-				M << "<span class='userdanger'>[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]</span>")
 				M.hallucination += 25
 
 	return

code/datums/diseases/advance/symptoms/headache.dm

@@ -30,5 +30,5 @@ BONUS
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
-		M << "<span class='warning'>[pick("Your head hurts.", "Your head starts pounding.")]</span>"
+		to_chat(M, "<span class='warning'>[pick("Your head hurts.", "Your head starts pounding.")]</span>")
 	return

code/datums/diseases/advance/symptoms/itching.dm

@@ -30,5 +30,5 @@ BONUS
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
-		M << "<span class='warning'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>"
+		to_chat(M, "<span class='warning'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>")
 	return

code/datums/diseases/advance/symptoms/oxygen.dm

@@ -34,5 +34,5 @@ Bonus
 				M.losebreath -= 2
 		else
 			if(prob(SYMPTOM_ACTIVATION_PROB * 3))
-				M << "<span class='notice'>[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]</span>"
+				to_chat(M, "<span class='notice'>[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]</span>")
 	return

code/datums/diseases/advance/symptoms/sensory.dm

@@ -87,19 +87,19 @@ Bonus
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		switch(A.stage)
 			if(1)
-				M << "<span class='warning'>You can't feel anything.</span>"
+				to_chat(M, "<span class='warning'>You can't feel anything.</span>")
 			if(2)
-				M << "<span class='warning'>You feel absolutely hammered.</span>"
+				to_chat(M, "<span class='warning'>You feel absolutely hammered.</span>")
 				if(prob(10))
 					sleepy_ticks += rand(10,14)
 			if(3)
 				M.reagents.add_reagent("ethanol",rand(5,7))
-				M << "<span class='warning'>You try to focus on not dying.</span>"
+				to_chat(M, "<span class='warning'>You try to focus on not dying.</span>")
 				if(prob(15))
 					sleepy_ticks += rand(10,14)
 			if(4)
 				M.reagents.add_reagent("ethanol",rand(6,10))
-				M << "<span class='warning'>u can count 2 potato!</span>"
+				to_chat(M, "<span class='warning'>u can count 2 potato!</span>")
 				if(prob(20))
 					sleepy_ticks += rand(10,14)
 			if(5)
@@ -122,7 +122,7 @@ Bonus
 
 	switch(sleepy) //Works like morphine
 		if(11)
-			M << "<span class='warning'>You start to feel tired...</span>"
+			to_chat(M, "<span class='warning'>You start to feel tired...</span>")
 		if(12 to 24)
 			M.drowsyness += 1
 		if(24 to INFINITY)

code/datums/diseases/advance/symptoms/shedding.dm

@@ -28,17 +28,17 @@ BONUS
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/M = A.affected_mob
-		M << "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>"
+		to_chat(M, "<span class='warning'>[pick("Your scalp itches.", "Your skin feels flakey.")]</span>")
 		if(ishuman(M))
 			var/mob/living/carbon/human/H = M
 			switch(A.stage)
 				if(3, 4)
 					if(!(H.hair_style == "Bald") && !(H.hair_style == "Balding Hair"))
-						H << "<span class='warning'>Your hair starts to fall out in clumps...</span>"
+						to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
 						addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50)
 				if(5)
 					if(!(H.facial_hair_style == "Shaved") || !(H.hair_style == "Bald"))
-						H << "<span class='warning'>Your hair starts to fall out in clumps...</span>"
+						to_chat(H, "<span class='warning'>Your hair starts to fall out in clumps...</span>")
 						addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50)
 
 /datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald)

code/datums/diseases/advance/symptoms/shivering.dm

@@ -29,7 +29,7 @@ Bonus
 	..()
 	if(prob(SYMPTOM_ACTIVATION_PROB))
 		var/mob/living/carbon/M = A.affected_mob
-		M << "<span class='warning'>[pick("You feel cold.", "You start shivering.")]</span>"
+		to_chat(M, "<span class='warning'>[pick("You feel cold.", "You start shivering.")]</span>")
 		if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
 			Chill(M, A)
 	return

code/datums/diseases/advance/symptoms/viral.dm

@@ -27,9 +27,9 @@ BONUS
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1)
-				M << "<span class='notice'>You feel off, but no different from before.</span>"
+				to_chat(M, "<span class='notice'>You feel off, but no different from before.</span>")
 			if(5)
-				M << "<span class='notice'>You feel better, but nothing interesting happens.</span>"
+				to_chat(M, "<span class='notice'>You feel better, but nothing interesting happens.</span>")
 
 /*
 //////////////////////////////////////
@@ -60,9 +60,9 @@ BONUS
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1)
-				M << "<span class='notice'>You feel better, but no different from before.</span>"
+				to_chat(M, "<span class='notice'>You feel better, but no different from before.</span>")
 			if(5)
-				M << "<span class='notice'>You feel off, but nothing interesting happens.</span>"
+				to_chat(M, "<span class='notice'>You feel off, but nothing interesting happens.</span>")
 
 /*
 //////////////////////////////////////

code/datums/diseases/advance/symptoms/vision.dm

@@ -31,20 +31,20 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2)
-				M << "<span class='warning'>Your eyes itch.</span>"
+				to_chat(M, "<span class='warning'>Your eyes itch.</span>")
 			if(3, 4)
-				M << "<span class='warning'><b>Your eyes burn!</b></span>"
+				to_chat(M, "<span class='warning'><b>Your eyes burn!</b></span>")
 				M.blur_eyes(10)
 				M.adjust_eye_damage(1)
 			else
-				M << "<span class='userdanger'>Your eyes burn horrificly!</span>"
+				to_chat(M, "<span class='userdanger'>Your eyes burn horrificly!</span>")
 				M.blur_eyes(20)
 				M.adjust_eye_damage(5)
 				if(M.eye_damage >= 10)
 					M.become_nearsighted()
 					if(prob(M.eye_damage - 10 + 1))
 						if(M.become_blind())
-							M << "<span class='userdanger'>You go blind!</span>"
+							to_chat(M, "<span class='userdanger'>You go blind!</span>")
 
 
 /*
@@ -80,13 +80,13 @@ Bonus
 		if(4, 5) //basically oculine
 			if(M.disabilities & BLIND)
 				if(prob(20))
-					M << "<span class='warning'>Your vision slowly returns...</span>"
+					to_chat(M, "<span class='warning'>Your vision slowly returns...</span>")
 					M.cure_blind()
 					M.cure_nearsighted()
 					M.blur_eyes(35)
 
 				else if(M.disabilities & NEARSIGHT)
-					M << "<span class='warning'>The blackness in your peripheral vision fades.</span>"
+					to_chat(M, "<span class='warning'>The blackness in your peripheral vision fades.</span>")
 					M.cure_nearsighted()
 					M.blur_eyes(10)
 
@@ -97,5 +97,5 @@ Bonus
 					M.adjust_eye_damage(-1)
 		else
 			if(prob(SYMPTOM_ACTIVATION_PROB * 3))
-				M << "<span class='notice'>[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]</span>"
+				to_chat(M, "<span class='notice'>[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]</span>")
 	return

code/datums/diseases/advance/symptoms/voice_change.dm

@@ -32,7 +32,7 @@ Bonus
 		var/mob/living/carbon/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("Your throat hurts.", "You clear your throat.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("Your throat hurts.", "You clear your throat.")]</span>")
 			else
 				if(ishuman(M))
 					var/mob/living/carbon/human/H = M

code/datums/diseases/advance/symptoms/vomit.dm

@@ -35,7 +35,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel nauseous.", "You feel like you're going to throw up!")]</span>")
 			else
 				Vomit(M)
 

code/datums/diseases/advance/symptoms/weakness.dm

@@ -31,12 +31,12 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2)
-				M << "<span class='warning'>[pick("You feel weak.", "You feel lazy.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel weak.", "You feel lazy.")]</span>")
 			if(3, 4)
-				M << "<span class='warning'><b>[pick("You feel very frail.", "You think you might faint.")]</span>"
+				to_chat(M, "<span class='warning'><b>[pick("You feel very frail.", "You think you might faint.")]</span>")
 				M.adjustStaminaLoss(15)
 			else
-				M << "<span class='userdanger'>[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]</span>"
+				to_chat(M, "<span class='userdanger'>[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]</span>")
 				M.adjustStaminaLoss(30)
 				if(M.getStaminaLoss() > 60 && !M.stat)
 					M.visible_message("<span class='warning'>[M] faints!</span>", "<span class='userdanger'>You swoon and faint...</span>")

code/datums/diseases/advance/symptoms/weight.dm

@@ -31,7 +31,7 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("You feel blubbery.", "Your stomach hurts.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel blubbery.", "Your stomach hurts.")]</span>")
 			else
 				M.overeatduration = min(M.overeatduration + 100, 600)
 				M.nutrition = min(M.nutrition + 100, NUTRITION_LEVEL_FULL)
@@ -73,9 +73,9 @@ Bonus
 		var/mob/living/M = A.affected_mob
 		switch(A.stage)
 			if(1, 2, 3, 4)
-				M << "<span class='warning'>[pick("You feel hungry.", "You crave for food.")]</span>"
+				to_chat(M, "<span class='warning'>[pick("You feel hungry.", "You crave for food.")]</span>")
 			else
-				M << "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>"
+				to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 				M.overeatduration = max(M.overeatduration - 100, 0)
 				M.nutrition = max(M.nutrition - 100, 0)
 

code/datums/diseases/advance/symptoms/youth.dm

@@ -34,22 +34,22 @@ BONUS
 				if(1)
 					if(H.age > 41)
 						H.age = 41
-						H << "<span class='notice'>You haven't had this much energy in years!</span>"
+						to_chat(H, "<span class='notice'>You haven't had this much energy in years!</span>")
 				if(2)
 					if(H.age > 36)
 						H.age = 36
-						H << "<span class='notice'>You're suddenly in a good mood.</span>"
+						to_chat(H, "<span class='notice'>You're suddenly in a good mood.</span>")
 				if(3)
 					if(H.age > 31)
 						H.age = 31
-						H << "<span class='notice'>You begin to feel more lithe.</span>"
+						to_chat(H, "<span class='notice'>You begin to feel more lithe.</span>")
 				if(4)
 					if(H.age > 26)
 						H.age = 26
-						H << "<span class='notice'>You feel reinvigorated.</span>"
+						to_chat(H, "<span class='notice'>You feel reinvigorated.</span>")
 				if(5)
 					if(H.age > 21)
 						H.age = 21
-						H << "<span class='notice'>You feel like you can take on the world!</span>"
+						to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
 
 	return

code/datums/diseases/anxiety.dm

@@ -16,18 +16,18 @@
 	switch(stage)
 		if(2) //also changes say, see say.dm
 			if(prob(5))
-				affected_mob << "<span class='notice'>You feel anxious.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel anxious.</span>")
 		if(3)
 			if(prob(10))
-				affected_mob << "<span class='notice'>Your stomach flutters.</span>"
+				to_chat(affected_mob, "<span class='notice'>Your stomach flutters.</span>")
 			if(prob(5))
-				affected_mob << "<span class='notice'>You feel panicky.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel panicky.</span>")
 			if(prob(2))
-				affected_mob << "<span class='danger'>You're overtaken with panic!</span>"
+				to_chat(affected_mob, "<span class='danger'>You're overtaken with panic!</span>")
 				affected_mob.confused += (rand(2,3))
 		if(4)
 			if(prob(10))
-				affected_mob << "<span class='danger'>You feel butterflies in your stomach.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel butterflies in your stomach.</span>")
 			if(prob(5))
 				affected_mob.visible_message("<span class='danger'>[affected_mob] stumbles around in a panic.</span>", \
 												"<span class='userdanger'>You have a panic attack!</span>")

code/datums/diseases/appendicitis.dm

@@ -26,7 +26,7 @@
 				A.inflamed = 1
 				A.update_icon()
 			if(prob(3))
-				affected_mob << "<span class='warning'>You feel a stabbing pain in your abdomen!</span>"
+				to_chat(affected_mob, "<span class='warning'>You feel a stabbing pain in your abdomen!</span>")
 				affected_mob.Stun(rand(2,3))
 				affected_mob.adjustToxLoss(1)
 		if(3)

code/datums/diseases/beesease.dm

@@ -16,12 +16,12 @@
 	switch(stage)
 		if(2) //also changes say, see say.dm
 			if(prob(2))
-				affected_mob << "<span class='notice'>You taste honey in your mouth.</span>"
+				to_chat(affected_mob, "<span class='notice'>You taste honey in your mouth.</span>")
 		if(3)
 			if(prob(10))
-				affected_mob << "<span class='notice'>Your stomach rumbles.</span>"
+				to_chat(affected_mob, "<span class='notice'>Your stomach rumbles.</span>")
 			if(prob(2))
-				affected_mob << "<span class='danger'>Your stomach stings painfully.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach stings painfully.</span>")
 				if(prob(20))
 					affected_mob.adjustToxLoss(2)
 					affected_mob.updatehealth()
@@ -30,7 +30,7 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] buzzes.</span>", \
 												"<span class='userdanger'>Your stomach buzzes violently!</span>")
 			if(prob(5))
-				affected_mob << "<span class='danger'>You feel something moving in your throat.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel something moving in your throat.</span>")
 			if(prob(1))
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")

code/datums/diseases/brainrot.dm

@@ -22,7 +22,7 @@
 			if(prob(2))
 				affected_mob.emote("yawn")
 			if(prob(2))
-				affected_mob << "<span class='danger'>You don't feel like yourself.</span>"
+				to_chat(affected_mob, "<span class='danger'>You don't feel like yourself.</span>")
 			if(prob(5))
 				affected_mob.adjustBrainLoss(1)
 				affected_mob.updatehealth()
@@ -35,7 +35,7 @@
 				affected_mob.adjustBrainLoss(2)
 				affected_mob.updatehealth()
 				if(prob(2))
-					affected_mob << "<span class='danger'>Your try to remember something important...but can't.</span>"
+					to_chat(affected_mob, "<span class='danger'>Your try to remember something important...but can't.</span>")
 
 		if(4)
 			if(prob(2))
@@ -46,9 +46,9 @@
 				affected_mob.adjustBrainLoss(3)
 				affected_mob.updatehealth()
 				if(prob(2))
-					affected_mob << "<span class='danger'>Strange buzzing fills your head, removing all thoughts.</span>"
+					to_chat(affected_mob, "<span class='danger'>Strange buzzing fills your head, removing all thoughts.</span>")
 			if(prob(3))
-				affected_mob << "<span class='danger'>You lose consciousness...</span>"
+				to_chat(affected_mob, "<span class='danger'>You lose consciousness...</span>")
 				affected_mob.visible_message("<span class='warning'>[affected_mob] suddenly collapses</span>")
 				affected_mob.Paralyse(rand(5,10))
 				if(prob(1))

code/datums/diseases/cold.dm

@@ -16,16 +16,16 @@
 		if(2)
 /*
 			if(affected_mob.sleeping && prob(40))  //removed until sleeping is fixed
-				affected_mob << "\blue You feel better."
+				to_chat(affected_mob, "\blue You feel better.")
 				cure()
 				return
 */
 			if(affected_mob.lying && prob(40))  //changed FROM prob(10) until sleeping is fixed
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
 				return
 			if(prob(1) && prob(5))
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
 				return
 			if(prob(1))
@@ -33,22 +33,22 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your throat feels sore.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Mucous runs down the back of your throat.</span>"
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
 		if(3)
 /*
 			if(affected_mob.sleeping && prob(25))  //removed until sleeping is fixed
-				affected_mob << "\blue You feel better."
+				to_chat(affected_mob, "\blue You feel better.")
 				cure()
 				return
 */
 			if(affected_mob.lying && prob(25))  //changed FROM prob(5) until sleeping is fixed
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
 				return
 			if(prob(1) && prob(1))
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
 				return
 			if(prob(1))
@@ -56,9 +56,9 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your throat feels sore.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Mucous runs down the back of your throat.</span>"
+				to_chat(affected_mob, "<span class='danger'>Mucous runs down the back of your throat.</span>")
 			if(prob(1) && prob(50))
 				if(!affected_mob.resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu(0)

code/datums/diseases/cold9.dm

@@ -16,7 +16,7 @@
 		if(2)
 			affected_mob.bodytemperature -= 10
 			if(prob(1) && prob(10))
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				cure()
 				return
 			if(prob(1))
@@ -24,9 +24,9 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your throat feels sore.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(5))
-				affected_mob << "<span class='danger'>You feel stiff.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
 		if(3)
 			affected_mob.bodytemperature -= 20
 			if(prob(1))
@@ -34,6 +34,6 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your throat feels sore.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your throat feels sore.</span>")
 			if(prob(10))
-				affected_mob << "<span class='danger'>You feel stiff.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")

code/datums/diseases/dna_spread.dm

@@ -36,11 +36,11 @@
 			if(prob(8))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your muscles ache.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
 				if(prob(20))
 					affected_mob.take_bodypart_damage(1)
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your stomach hurts.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
 				if(prob(20))
 					affected_mob.adjustToxLoss(2)
 					affected_mob.updatehealth()
@@ -50,7 +50,7 @@
 				original_dna = new affected_mob.dna.type
 				affected_mob.dna.copy_dna(original_dna)
 
-				affected_mob << "<span class='danger'>You don't feel like yourself..</span>"
+				to_chat(affected_mob, "<span class='danger'>You don't feel like yourself..</span>")
 				var/datum/dna/transform_dna = strain_data["dna"]
 
 				transform_dna.transfer_identity(affected_mob, transfer_SE = 1)
@@ -70,5 +70,5 @@
 		affected_mob.updateappearance(mutcolor_update=1)
 		affected_mob.domutcheck()
 
-		affected_mob << "<span class='notice'>You feel more like yourself.</span>"
+		to_chat(affected_mob, "<span class='notice'>You feel more like yourself.</span>")
 	return ..()

code/datums/diseases/fake_gbs.dm

@@ -22,7 +22,7 @@
 			else if(prob(5))
 				affected_mob.emote("gasp")
 			if(prob(10))
-				affected_mob << "<span class='danger'>You're starting to feel very weak...</span>"
+				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
 		if(4)
 			if(prob(10))
 				affected_mob.emote("cough")

code/datums/diseases/flu.dm

@@ -16,7 +16,7 @@
 	switch(stage)
 		if(2)
 			if(affected_mob.lying && prob(20))
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				stage--
 				return
 			if(prob(1))
@@ -24,18 +24,18 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your muscles ache.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
 				if(prob(20))
 					affected_mob.take_bodypart_damage(1)
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your stomach hurts.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
 				if(prob(20))
 					affected_mob.adjustToxLoss(1)
 					affected_mob.updatehealth()
 
 		if(3)
 			if(affected_mob.lying && prob(15))
-				affected_mob << "<span class='notice'>You feel better.</span>"
+				to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 				stage--
 				return
 			if(prob(1))
@@ -43,11 +43,11 @@
 			if(prob(1))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your muscles ache.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your muscles ache.</span>")
 				if(prob(20))
 					affected_mob.take_bodypart_damage(1)
 			if(prob(1))
-				affected_mob << "<span class='danger'>Your stomach hurts.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach hurts.</span>")
 				if(prob(20))
 					affected_mob.adjustToxLoss(1)
 					affected_mob.updatehealth()

code/datums/diseases/fluspanish.dm

@@ -21,7 +21,7 @@
 			if(prob(5))
 				affected_mob.emote("cough")
 			if(prob(1))
-				affected_mob << "<span class='danger'>You're burning in your own skin!</span>"
+				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
 				affected_mob.take_bodypart_damage(0,5)
 
 		if(3)
@@ -31,6 +31,6 @@
 			if(prob(5))
 				affected_mob.emote("cough")
 			if(prob(5))
-				affected_mob << "<span class='danger'>You're burning in your own skin!</span>"
+				to_chat(affected_mob, "<span class='danger'>You're burning in your own skin!</span>")
 				affected_mob.take_bodypart_damage(0,5)
 	return

code/datums/diseases/gbs.dm

@@ -27,14 +27,14 @@
 			else if(prob(5))
 				affected_mob.emote("gasp")
 			if(prob(10))
-				affected_mob << "<span class='danger'>You're starting to feel very weak...</span>"
+				to_chat(affected_mob, "<span class='danger'>You're starting to feel very weak...</span>")
 		if(4)
 			if(prob(10))
 				affected_mob.emote("cough")
 			affected_mob.adjustToxLoss(5)
 			affected_mob.updatehealth()
 		if(5)
-			affected_mob << "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>"
+			to_chat(affected_mob, "<span class='danger'>Your body feels as if it's trying to rip itself open...</span>")
 			if(prob(50))
 				affected_mob.gib()
 		else

code/datums/diseases/magnitis.dm

@@ -16,7 +16,7 @@
 	switch(stage)
 		if(2)
 			if(prob(2))
-				affected_mob << "<span class='danger'>You feel a slight shock course through your body.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a slight shock course through your body.</span>")
 			if(prob(2))
 				for(var/obj/M in orange(2,affected_mob))
 					if(!M.anchored && (M.flags & CONDUCT))
@@ -27,9 +27,9 @@
 					step_towards(S,affected_mob)
 		if(3)
 			if(prob(2))
-				affected_mob << "<span class='danger'>You feel a strong shock course through your body.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a strong shock course through your body.</span>")
 			if(prob(2))
-				affected_mob << "<span class='danger'>You feel like clowning around.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel like clowning around.</span>")
 			if(prob(4))
 				for(var/obj/M in orange(4,affected_mob))
 					if(!M.anchored && (M.flags & CONDUCT))
@@ -46,9 +46,9 @@
 						step_towards(S,affected_mob)
 		if(4)
 			if(prob(2))
-				affected_mob << "<span class='danger'>You feel a powerful shock course through your body.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a powerful shock course through your body.</span>")
 			if(prob(2))
-				affected_mob << "<span class='danger'>You query upon the nature of miracles.</span>"
+				to_chat(affected_mob, "<span class='danger'>You query upon the nature of miracles.</span>")
 			if(prob(8))
 				for(var/obj/M in orange(6,affected_mob))
 					if(!M.anchored && (M.flags & CONDUCT))

code/datums/diseases/pierrot_throat.dm

@@ -16,10 +16,10 @@
 	..()
 	switch(stage)
 		if(1)
-			if(prob(10)) affected_mob << "<span class='danger'>You feel a little silly.</span>"
+			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You feel a little silly.</span>")
 		if(2)
-			if(prob(10)) affected_mob << "<span class='danger'>You start seeing rainbows.</span>"
+			if(prob(10)) to_chat(affected_mob, "<span class='danger'>You start seeing rainbows.</span>")
 		if(3)
-			if(prob(10)) affected_mob << "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>"
+			if(prob(10)) to_chat(affected_mob, "<span class='danger'>Your thoughts are interrupted by a loud <b>HONK!</b></span>")
 		if(4)
 			if(prob(5)) affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) )

code/datums/diseases/retrovirus.dm

@@ -31,38 +31,38 @@
 		if(1)
 			if(restcure)
 				if(affected_mob.lying && prob(30))
-					affected_mob << "<span class='notice'>You feel better.</span>"
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
 			if (prob(8))
-				affected_mob << "<span class='danger'>Your head hurts.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your head hurts.</span>")
 			if (prob(9))
-				affected_mob << "You feel a tingling sensation in your chest."
+				to_chat(affected_mob, "You feel a tingling sensation in your chest.")
 			if (prob(9))
-				affected_mob << "<span class='danger'>You feel angry.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel angry.</span>")
 		if(2)
 			if(restcure)
 				if(affected_mob.lying && prob(20))
-					affected_mob << "<span class='notice'>You feel better.</span>"
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
 			if (prob(8))
-				affected_mob << "<span class='danger'>Your skin feels loose.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your skin feels loose.</span>")
 			if (prob(10))
-				affected_mob << "You feel very strange."
+				to_chat(affected_mob, "You feel very strange.")
 			if (prob(4))
-				affected_mob << "<span class='danger'>You feel a stabbing pain in your head!</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head!</span>")
 				affected_mob.Paralyse(2)
 			if (prob(4))
-				affected_mob << "<span class='danger'>Your stomach churns.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach churns.</span>")
 		if(3)
 			if(restcure)
 				if(affected_mob.lying && prob(20))
-					affected_mob << "<span class='notice'>You feel better.</span>"
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
 			if (prob(10))
-				affected_mob << "<span class='danger'>Your entire body vibrates.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your entire body vibrates.</span>")
 
 			if (prob(35))
 				if(prob(50))
@@ -73,7 +73,7 @@
 		if(4)
 			if(restcure)
 				if(affected_mob.lying && prob(5))
-					affected_mob << "<span class='notice'>You feel better.</span>"
+					to_chat(affected_mob, "<span class='notice'>You feel better.</span>")
 					cure()
 					return
 			if (prob(60))

code/datums/diseases/rhumba_beat.dm

@@ -21,23 +21,23 @@
 				affected_mob.adjustToxLoss(5)
 				affected_mob.updatehealth()
 			if(prob(1))
-				affected_mob << "<span class='danger'>You feel strange...</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel strange...</span>")
 		if(3)
 			if(prob(5))
-				affected_mob << "<span class='danger'>You feel the urge to dance...</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel the urge to dance...</span>")
 			else if(prob(5))
 				affected_mob.emote("gasp")
 			else if(prob(10))
-				affected_mob << "<span class='danger'>You feel the need to chick chicky boom...</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel the need to chick chicky boom...</span>")
 		if(4)
 			if(prob(10))
 				affected_mob.emote("gasp")
-				affected_mob << "<span class='danger'>You feel a burning beat inside...</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a burning beat inside...</span>")
 			if(prob(20))
 				affected_mob.adjustToxLoss(5)
 				affected_mob.updatehealth()
 		if(5)
-			affected_mob << "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>"
+			to_chat(affected_mob, "<span class='danger'>Your body is unable to contain the Rhumba Beat...</span>")
 			if(prob(50))
 				affected_mob.gib()
 		else

code/datums/diseases/transformation.dm

@@ -22,23 +22,23 @@
 	switch(stage)
 		if(1)
 			if (prob(stage_prob) && stage1)
-				affected_mob << pick(stage1)
+				to_chat(affected_mob, pick(stage1))
 		if(2)
 			if (prob(stage_prob) && stage2)
-				affected_mob << pick(stage2)
+				to_chat(affected_mob, pick(stage2))
 		if(3)
 			if (prob(stage_prob*2) && stage3)
-				affected_mob << pick(stage3)
+				to_chat(affected_mob, pick(stage3))
 		if(4)
 			if (prob(stage_prob*2) && stage4)
-				affected_mob << pick(stage4)
+				to_chat(affected_mob, pick(stage4))
 		if(5)
 			do_disease_transformation(affected_mob)
 
 /datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob)
 	if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD)
 		if(stage5)
-			affected_mob << pick(stage5)
+			to_chat(affected_mob, pick(stage5))
 		if(jobban_isbanned(affected_mob, new_form))
 			affected_mob.death(1)
 			return
@@ -98,10 +98,10 @@
 	switch(stage)
 		if(2)
 			if(prob(2))
-				affected_mob << "<span class='notice'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>"
+				to_chat(affected_mob, "<span class='notice'>Your [pick("back", "arm", "leg", "elbow", "head")] itches.</span>")
 		if(3)
 			if(prob(4))
-				affected_mob << "<span class='danger'>You feel a stabbing pain in your head.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
 				affected_mob.confused += 10
 		if(4)
 			if(prob(3))
@@ -137,7 +137,7 @@
 			if (prob(8))
 				affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop"))
 			if (prob(4))
-				affected_mob << "<span class='danger'>You feel a stabbing pain in your head.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
 				affected_mob.Paralyse(2)
 		if(4)
 			if (prob(20))
@@ -166,7 +166,7 @@
 	switch(stage)
 		if(3)
 			if (prob(4))
-				affected_mob << "<span class='danger'>You feel a stabbing pain in your head.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a stabbing pain in your head.</span>")
 				affected_mob.Paralyse(2)
 		if(4)
 			if (prob(20))

code/datums/diseases/tuberculosis.dm

@@ -17,42 +17,42 @@
 		if(2)
 			if(prob(2))
 				affected_mob.emote("cough")
-				affected_mob << "<span class='danger'>Your chest hurts.</span>"
+				to_chat(affected_mob, "<span class='danger'>Your chest hurts.</span>")
 			if(prob(2))
-				affected_mob << "<span class='danger'>Your stomach violently rumbles!</span>"
+				to_chat(affected_mob, "<span class='danger'>Your stomach violently rumbles!</span>")
 			if(prob(5))
-				affected_mob << "<span class='danger'>You feel a cold sweat form.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a cold sweat form.</span>")
 		if(4)
 			if(prob(2))
-				affected_mob << "<span class='userdanger'>You see four of everything</span>"
+				to_chat(affected_mob, "<span class='userdanger'>You see four of everything</span>")
 				affected_mob.Dizzy(5)
 			if(prob(2))
-				affected_mob << "<span class='danger'>You feel a sharp pain from your lower chest!</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel a sharp pain from your lower chest!</span>")
 				affected_mob.adjustOxyLoss(5)
 				affected_mob.emote("gasp")
 			if(prob(10))
-				affected_mob << "<span class='danger'>You feel air escape from your lungs painfully.</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel air escape from your lungs painfully.</span>")
 				affected_mob.adjustOxyLoss(25)
 				affected_mob.emote("gasp")
 		if(5)
 			if(prob(2))
-				affected_mob << "<span class='userdanger'>[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]</span>"
+				to_chat(affected_mob, "<span class='userdanger'>[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]</span>")
 				affected_mob.adjustStaminaLoss(70)
 			if(prob(10))
 				affected_mob.adjustStaminaLoss(100)
 				affected_mob.visible_message("<span class='warning'>[affected_mob] faints!</span>", "<span class='userdanger'>You surrender yourself and feel at peace...</span>")
 				affected_mob.AdjustSleeping(5)
 			if(prob(2))
-				affected_mob << "<span class='userdanger'>You feel your mind relax and your thoughts drift!</span>"
+				to_chat(affected_mob, "<span class='userdanger'>You feel your mind relax and your thoughts drift!</span>")
 				affected_mob.confused = min(100, affected_mob.confused + 8)
 			if(prob(10))
 				affected_mob.vomit(20)
 			if(prob(3))
-				affected_mob << "<span class='warning'><i>[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]</i></span>"
+				to_chat(affected_mob, "<span class='warning'><i>[pick("Your stomach silently rumbles...", "Your stomach seizes up and falls limp, muscles dead and lifeless.", "You could eat a crayon")]</i></span>")
 				affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0)
 				affected_mob.nutrition = max(affected_mob.nutrition - 100, 0)
 			if(prob(15))
-				affected_mob << "<span class='danger'>[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]</span>"
+				to_chat(affected_mob, "<span class='danger'>[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]</span>")
 				affected_mob.bodytemperature += 40
 	return
 

code/datums/diseases/wizarditis.dm

@@ -31,14 +31,14 @@ STI KALY - blind
 			if(prob(1)&&prob(50))
 				affected_mob.say(pick("You shall not pass!", "Expeliarmus!", "By Merlins beard!", "Feel the power of the Dark Side!"))
 			if(prob(1)&&prob(50))
-				affected_mob << "<span class='danger'>You feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel [pick("that you don't have enough mana", "that the winds of magic are gone", "an urge to summon familiar")].</span>")
 
 
 		if(3)
 			if(prob(1)&&prob(50))
 				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!"))
 			if(prob(1)&&prob(50))
-				affected_mob << "<span class='danger'>You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel [pick("the magic bubbling in your veins","that this location gives you a +1 to INT","an urge to summon familiar")].</span>")
 
 		if(4)
 
@@ -46,7 +46,7 @@ STI KALY - blind
 				affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!"))
 				return
 			if(prob(1)&&prob(50))
-				affected_mob << "<span class='danger'>You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].</span>"
+				to_chat(affected_mob, "<span class='danger'>You feel [pick("the tidal wave of raw power building inside","that this location gives you a +2 to INT and +1 to WIS","an urge to teleport")].</span>")
 				spawn_wizard_clothes(50)
 			if(prob(1)&&prob(1))
 				teleport()

code/datums/emotes.dm

@@ -36,11 +36,10 @@ var/global/list/emote_list = list()
 	var/msg = select_message_type(user)
 	if(params && message_param)
 		msg = select_param(user, params)
-	/*
 	if(findtext(msg, "their"))
 		msg = replacetext(msg, "their", user.p_their())
 	if(findtext(msg, "them"))
-		msg = replacetext(msg, "them", user.p_them())*/
+		msg = replacetext(msg, "them", user.p_them())
 	if(findtext(msg, "%s"))
 		msg = replacetext(msg, "%s", user.p_s())
 
@@ -51,6 +50,7 @@ var/global/list/emote_list = list()
 	if(!msg)
 		return FALSE
 
+	user.log_message(msg, INDIVIDUAL_EMOTE_LOG)
 	msg = "<b>[user]</b> " + msg
 
 	for(var/mob/M in dead_mob_list)
@@ -99,6 +99,8 @@ var/global/list/emote_list = list()
 			return FALSE
 		if(restraint_check && user.restrained())
 			return FALSE
+		if(user.reagents && user.reagents.has_reagent("mimesbane"))
+			return FALSE
 
 
 /datum/emote/sound
@@ -109,4 +111,4 @@ var/global/list/emote_list = list()
 /datum/emote/sound/run_emote(mob/user, params)
 	. = ..()
 	if(.)
-		playsound(user.loc, sound, 50, vary)
+		playsound(user.loc, sound, 50, vary)

code/datums/helper_datums/getrev.dm

@@ -27,10 +27,10 @@ var/global/datum/getrev/revdata = new()
 		for(var/line in testmerge)
 			if(line)
 				log_world("Test merge active of PR #[line]")
+				feedback_add_details("testmerged_prs","[line]")
 		log_world("Based off master commit [parentcommit]")
 	else
 		log_world(parentcommit)
-	log_world("Current map - [MAP_NAME]") //can't think of anywhere better to put it
 
 /datum/getrev/proc/DownloadPRDetails()
 	if(!config.githubrepoid)
@@ -76,20 +76,20 @@ var/global/datum/getrev/revdata = new()
 	set desc = "Check the current server code revision"
 
 	if(revdata.parentcommit)
-		src << "<b>Server revision compiled on:</b> [revdata.date]"
+		to_chat(src, "<b>Server revision compiled on:</b> [revdata.date]")
 		if(revdata.testmerge.len)
-			src << revdata.GetTestMergeInfo()
-			src << "Based off master commit:"
-		src << "<a href='[config.githuburl]/commit/[revdata.parentcommit]'>[revdata.parentcommit]</a>"
+			to_chat(src, revdata.GetTestMergeInfo())
+			to_chat(src, "Based off master commit:")
+		to_chat(src, "<a href='[config.githuburl]/commit/[revdata.parentcommit]'>[revdata.parentcommit]</a>")
 	else
-		src << "Revision unknown"
-	src << "<b>Current Infomational Settings:</b>"
-	src << "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]"
-	src << "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]"
-	src << "Enforce Human Authority: [config.enforce_human_authority]"
-	src << "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]"
-	src << "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes"
-	src << "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes"
+		to_chat(src, "Revision unknown")
+	to_chat(src, "<b>Current Infomational Settings:</b>")
+	to_chat(src, "Protect Authority Roles From Traitor: [config.protect_roles_from_antagonist]")
+	to_chat(src, "Protect Assistant Role From Traitor: [config.protect_assistant_from_antagonist]")
+	to_chat(src, "Enforce Human Authority: [config.enforce_human_authority]")
+	to_chat(src, "Allow Latejoin Antagonists: [config.allow_latejoin_antagonists]")
+	to_chat(src, "Enforce Continuous Rounds: [config.continuous.len] of [config.modes.len] roundtypes")
+	to_chat(src, "Allow Midround Antagonists: [config.midround_antag.len] of [config.modes.len] roundtypes")
 	if(config.show_game_type_odds)
 		if(ticker.current_state == GAME_STATE_PLAYING)
 			var/prob_sum = 0
@@ -111,8 +111,8 @@ var/global/datum/getrev/revdata = new()
 				for(var/ctag in probs)
 					if(config.probabilities[ctag] > 0)
 						var/percentage = round(config.probabilities[ctag] / prob_sum * 100, 0.1)
-						src << "[ctag] [percentage]%"
-		
+						to_chat(src, "[ctag] [percentage]%")
+
 		src <<"<b>All Game Mode Odds:</b>"
 		var/sum = 0
 		for(var/ctag in config.probabilities)
@@ -120,4 +120,4 @@ var/global/datum/getrev/revdata = new()
 		for(var/ctag in config.probabilities)
 			if(config.probabilities[ctag] > 0)
 				var/percentage = round(config.probabilities[ctag] / sum * 100, 0.1)
-				src << "[ctag] [percentage]%"
+				to_chat(src, "[ctag] [percentage]%")

code/datums/helper_datums/teleport.dm

@@ -169,7 +169,7 @@
 		precision = max(rand(1,100)*bagholding.len,100)
 		if(isliving(teleatom))
 			var/mob/living/MM = teleatom
-			MM << "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>"
+			to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
 	return 1
 
 // Safe location finder

code/datums/hud.dm

@@ -81,11 +81,11 @@ var/datum/atom_hud/huds = list( \
 		if(src in hud.hudusers)
 			hud.add_hud_to(src)
 
-/mob/new_player/reload_huds()
+/mob/dead/new_player/reload_huds()
 	return
 
 /mob/proc/add_click_catcher()
 	client.screen += client.void
 
-/mob/new_player/add_click_catcher()
+/mob/dead/new_player/add_click_catcher()
 	return

code/datums/map_config.dm

@@ -0,0 +1,146 @@
+//used for holding information about unique properties of maps
+//feed it json files that match the datum layout
+//defaults to box
+//  -Cyberboss
+
+/datum/map_config
+    var/config_filename = "_maps/tgstation2.json"
+    var/map_name = "Box Station"
+    var/map_path = "map_files/TgStation"
+    var/map_file = "tgstation.2.1.3.dmm"
+
+    var/minetype = "lavaland"
+
+    var/list/transition_config = list(MAIN_STATION = CROSSLINKED,
+                                    CENTCOMM = SELFLOOPING,
+                                    EMPTY_AREA_1 = CROSSLINKED,
+                                    EMPTY_AREA_2 = CROSSLINKED,
+                                    MINING = SELFLOOPING,
+                                    EMPTY_AREA_3 = CROSSLINKED,
+                                    EMPTY_AREA_4 = CROSSLINKED,
+                                    EMPTY_AREA_5 = CROSSLINKED,
+                                    EMPTY_AREA_6 = CROSSLINKED,
+                                    EMPTY_AREA_7 = CROSSLINKED,
+                                    EMPTY_AREA_8 = CROSSLINKED)
+    var/defaulted = TRUE    //if New failed
+
+    var/config_max_users = 0
+    var/config_min_users = 0
+    var/voteweight = 1
+
+/datum/map_config/New(filename = "data/next_map.json", default_to_box, delete_after)
+    if(default_to_box)
+        return
+    LoadConfig(filename)
+    if(delete_after)
+        fdel(filename)
+
+/datum/map_config/proc/LoadConfig(filename)
+    if(!fexists(filename))
+        log_world("map_config not found: [filename]")
+        return
+
+    var/json = file(filename)
+    if(!json)
+        log_world("Could not open map_config: [filename]")
+        return
+    
+    json = file2text(json)
+    if(!json)
+        log_world("map_config is not text: [filename]")
+        return
+    
+    json = json_decode(json)
+    if(!json)
+        log_world("map_config is not json: [filename]")
+        return
+
+    if(!ValidateJSON(json))
+        log_world("map_config failed to validate for above reason: [filename]")
+        return
+    
+    config_filename = filename
+
+    map_name = json["map_name"]
+    map_path = json["map_path"]
+    map_file = json["map_file"]
+
+    minetype = json["minetype"]
+
+    var/list/jtcl = json["transition_config"]
+
+    if(jtcl != "default")
+        transition_config.Cut()
+
+        for(var/I in jtcl)
+            transition_config[TransitionStringToEnum(I)] = TransitionStringToEnum(jtcl[I])
+        
+    defaulted = FALSE
+
+#define CHECK_EXISTS(X) if(!istext(json[X])) log_world(X + "missing from json!")
+/datum/map_config/proc/ValidateJSON(list/json)
+    CHECK_EXISTS("map_name")
+    CHECK_EXISTS("map_path")
+    CHECK_EXISTS("map_file")
+    CHECK_EXISTS("minetype")
+    CHECK_EXISTS("transition_config")
+
+    var/path = GetFullMapPath(json["map_path"], json["map_file"])
+    if(!fexists(path))
+        log_world("Map file ([path]) does not exist!")
+        return
+
+    if(json["transition_config"] != "default")
+        if(!islist(json["transition_config"]))
+            log_world("transition_config is not a list!") 
+            return
+
+        var/list/jtcl = json["transition_config"]
+        for(var/I in jtcl)
+            if(isnull(TransitionStringToEnum(I)))
+                log_world("Invalid transition_config option: [I]!")
+            if(isnull(TransitionStringToEnum(jtcl[I])))
+                log_world("Invalid transition_config option: [I]!")
+
+    return TRUE
+#undef CHECK_EXISTS
+
+/datum/map_config/proc/TransitionStringToEnum(string)
+    switch(string)
+        if("CROSSLINKED")
+            return CROSSLINKED
+        if("SELFLOOPING")
+            return SELFLOOPING
+        if("UNAFFECTED")
+            return UNAFFECTED
+        if("MAIN_STATION")
+            return MAIN_STATION
+        if("CENTCOMM")
+            return CENTCOMM
+        if("MINING")
+            return MINING
+        if("EMPTY_AREA_1")
+            return EMPTY_AREA_1
+        if("EMPTY_AREA_2")
+            return EMPTY_AREA_2
+        if("EMPTY_AREA_3")
+            return EMPTY_AREA_3
+        if("EMPTY_AREA_4")
+            return EMPTY_AREA_4
+        if("EMPTY_AREA_5")
+            return EMPTY_AREA_5
+        if("EMPTY_AREA_6")
+            return EMPTY_AREA_6
+        if("EMPTY_AREA_7")
+            return EMPTY_AREA_7
+        if("EMPTY_AREA_8")
+            return EMPTY_AREA_8
+
+/datum/map_config/proc/GetFullMapPath(mp = map_path, mf = map_file)
+    return "_maps/[mp]/[mf]"
+
+/datum/map_config/proc/MakeNextMap()
+    return config_filename == "data/next_map.json" || fcopy(config_filename, "data/next_map.json")
+
+/datum/map_config/proc/MakePreviousMap()
+    return config_filename == "data/previous_map.json" || fcopy(config_filename, "data/previous_map.json")

code/datums/martial.dm

@@ -98,11 +98,11 @@
 	name = "Boxing"
 
 /datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	A << "<span class='warning'>Can't disarm while boxing!</span>"
+	to_chat(A, "<span class='warning'>Can't disarm while boxing!</span>")
 	return 1
 
 /datum/martial_art/boxing/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	A << "<span class='warning'>Can't grab while boxing!</span>"
+	to_chat(A, "<span class='warning'>Can't grab while boxing!</span>")
 	return 1
 
 /datum/martial_art/boxing/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -148,10 +148,10 @@
 	set desc = "Remember how to wrestle."
 	set category = "Wrestling"
 
-	usr << "<b><i>You flex your muscles and have a revelation...</i></b>"
-	usr << "<span class='notice'>Clinch</span>: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful."
-	usr << "<span class='notice'>Suplex</span>: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor."
-	usr << "<span class='notice'>Advanced grab</span>: Grab. Passively causes stamina damage when grabbing someone."
+	to_chat(usr, "<b><i>You flex your muscles and have a revelation...</i></b>")
+	to_chat(usr, "<span class='notice'>Clinch</span>: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful.")
+	to_chat(usr, "<span class='notice'>Suplex</span>: Disarm someone you are grabbing. Suplexes your target to the floor. Greatly injures them and leaves both you and your target on the floor.")
+	to_chat(usr, "<span class='notice'>Advanced grab</span>: Grab. Passively causes stamina damage when grabbing someone.")
 
 #define TORNADO_COMBO "HHD"
 #define THROWBACK_COMBO "DHD"
@@ -177,13 +177,18 @@
 		return 1
 	return 0
 
+/datum/martial_art/plasma_fist/proc/TornadoAnimate(mob/living/carbon/human/A)
+	set waitfor = FALSE
+	for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
+		if(!A)
+			break
+		A.setDir(i)
+		playsound(A.loc, 'sound/weapons/punch1.ogg', 15, 1, -1)
+		sleep(1)
+
 /datum/martial_art/plasma_fist/proc/Tornado(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	A.say("TORNADO SWEEP!")
-	spawn(0)
-		for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
-			A.setDir(i)
-			playsound(A.loc, 'sound/weapons/punch1.ogg', 15, 1, -1)
-			sleep(1)
+	TornadoAnimate(A)
 	var/obj/effect/proc_holder/spell/aoe_turf/repulse/R = new(null)
 	var/list/turfs = list()
 	for(var/turf/T in range(1,A))
@@ -238,10 +243,10 @@
 	set desc = "Remember the martial techniques of the Plasma Fist."
 	set category = "Plasma Fist"
 
-	usr << "<b><i>You clench your fists and have a flashback of knowledge...</i></b>"
-	usr << "<span class='notice'>Tornado Sweep</span>: Harm Harm Disarm. Repulses target and everyone back."
-	usr << "<span class='notice'>Throwback</span>: Disarm Harm Disarm. Throws the target and an item at them."
-	usr << "<span class='notice'>The Plasma Fist</span>: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body."
+	to_chat(usr, "<b><i>You clench your fists and have a flashback of knowledge...</i></b>")
+	to_chat(usr, "<span class='notice'>Tornado Sweep</span>: Harm Harm Disarm. Repulses target and everyone back.")
+	to_chat(usr, "<span class='notice'>Throwback</span>: Disarm Harm Disarm. Throws the target and an item at them.")
+	to_chat(usr, "<span class='notice'>The Plasma Fist</span>: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.")
 
 //Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss
 #define WRIST_WRENCH_COMBO "DD"
@@ -391,13 +396,13 @@
 	set desc = "Remember the martial techniques of the Sleeping Carp clan."
 	set category = "Sleeping Carp"
 
-	usr << "<b><i>You retreat inward and recall the teachings of the Sleeping Carp...</i></b>"
+	to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Sleeping Carp...</i></b>")
 
-	usr << "<span class='notice'>Wrist Wrench</span>: Disarm Disarm. Forces opponent to drop item in hand."
-	usr << "<span class='notice'>Back Kick</span>: Harm Grab. Opponent must be facing away. Knocks down."
-	usr << "<span class='notice'>Stomach Knee</span>: Grab Harm. Knocks the wind out of opponent and stuns."
-	usr << "<span class='notice'>Head Kick</span>: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand."
-	usr << "<span class='notice'>Elbow Drop</span>: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition."
+	to_chat(usr, "<span class='notice'>Wrist Wrench</span>: Disarm Disarm. Forces opponent to drop item in hand.")
+	to_chat(usr, "<span class='notice'>Back Kick</span>: Harm Grab. Opponent must be facing away. Knocks down.")
+	to_chat(usr, "<span class='notice'>Stomach Knee</span>: Grab Harm. Knocks the wind out of opponent and stuns.")
+	to_chat(usr, "<span class='notice'>Head Kick</span>: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.")
+	to_chat(usr, "<span class='notice'>Elbow Drop</span>: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.")
 
 //CQC
 #define SLAM_COMBO "GH"
@@ -573,15 +578,15 @@
 	set desc = "You try to remember some of the basics of CQC."
 	set category = "CQC"
 
-	usr << "<b><i>You try to remember some of the basics of CQC.</i></b>"
+	to_chat(usr, "<b><i>You try to remember some of the basics of CQC.</i></b>")
 
-	usr << "<span class='notice'>Slam</span>: Grab Harm. Slam opponent into the ground, weakens and knocks down."
-	usr << "<span class='notice'>CQC Kick</span>: Harm Disarm Harm. Knocks opponent away. Knocks out stunned or weakened opponents."
-	usr << "<span class='notice'>Restrain</span>: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a choke hold."
-	usr << "<span class='notice'>Pressure</span>: Disarm Grab. Decent stamina damage."
-	usr << "<span class='notice'>Consecutive CQC</span>: Harm Harm Disarm. Mainly offensive move, huge damage and decent stamina damage."
+	to_chat(usr, "<span class='notice'>Slam</span>: Grab Harm. Slam opponent into the ground, weakens and knocks down.")
+	to_chat(usr, "<span class='notice'>CQC Kick</span>: Harm Disarm Harm. Knocks opponent away. Knocks out stunned or weakened opponents.")
+	to_chat(usr, "<span class='notice'>Restrain</span>: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a choke hold.")
+	to_chat(usr, "<span class='notice'>Pressure</span>: Disarm Grab. Decent stamina damage.")
+	to_chat(usr, "<span class='notice'>Consecutive CQC</span>: Harm Harm Disarm. Mainly offensive move, huge damage and decent stamina damage.")
 
-	usr << "<b><i>In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.</i></b>"
+	to_chat(usr, "<b><i>In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.</i></b>")
 
 //ITEMS
 
@@ -638,7 +643,7 @@
 		var/mob/living/carbon/human/H = user
 		var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null)
 		F.teach(H)
-		H << "<span class='boldannounce'>You have learned the ancient martial art of Plasma Fist.</span>"
+		to_chat(H, "<span class='boldannounce'>You have learned the ancient martial art of Plasma Fist.</span>")
 		used = 1
 		desc = "It's completely blank."
 		name = "empty scroll"
@@ -670,8 +675,9 @@
 /obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user)
 	if(!istype(user) || !user)
 		return
-	user << "<span class='sciradio'>You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
+	var/message = "<span class='sciradio'>You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
 	directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.</span>"
+	to_chat(user, message)
 	var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null)
 	theSleepingCarp.teach(user)
 	user.drop_item()
@@ -701,7 +707,7 @@
 /obj/item/weapon/twohanded/bostaff/attack(mob/target, mob/living/user)
 	add_fingerprint(user)
 	if((CLUMSY in user.disabilities) && prob(50))
-		user << "<span class ='warning'>You club yourself over the head with [src].</span>"
+		to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>")
 		user.Weaken(3)
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
@@ -715,7 +721,7 @@
 		return ..()
 	var/mob/living/carbon/C = target
 	if(C.stat)
-		user << "<span class='warning'>It would be dishonorable to attack a foe while they cannot retaliate.</span>"
+		to_chat(user, "<span class='warning'>It would be dishonorable to attack a foe while they cannot retaliate.</span>")
 		return
 	if(user.a_intent == INTENT_DISARM)
 		if(!wielded)

code/datums/martial/krav_maga.dm

@@ -10,7 +10,7 @@
 
 /datum/action/neck_chop/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>"
+		to_chat(owner, "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] assumes the Neck Chop stance!</span>", "<b><i>Your next attack will be a Neck Chop.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -22,7 +22,7 @@
 
 /datum/action/leg_sweep/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>"
+		to_chat(owner, "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] assumes the Leg Sweep stance!</span>", "<b><i>Your next attack will be a Leg Sweep.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -34,7 +34,7 @@
 
 /datum/action/lung_punch/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>"
+		to_chat(owner, "<span class='warning'>You can't use Krav Maga while you're incapacitated.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] assumes the Lung Punch stance!</span>", "<b><i>Your next attack will be a Lung Punch.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -42,15 +42,15 @@
 
 /datum/martial_art/krav_maga/teach(var/mob/living/carbon/human/H,var/make_temporary=0)
 	..()
-	H << "<span class = 'userdanger'>You know the arts of Krav Maga!</span>"
-	H << "<span class = 'danger'>Place your cursor over a move at the top of the screen to see what it does.</span>"
+	to_chat(H, "<span class = 'userdanger'>You know the arts of Krav Maga!</span>")
+	to_chat(H, "<span class = 'danger'>Place your cursor over a move at the top of the screen to see what it does.</span>")
 	neckchop.Grant(H)
 	legsweep.Grant(H)
 	lungpunch.Grant(H)
 
 /datum/martial_art/krav_maga/remove(var/mob/living/carbon/human/H)
 	..()
-	H << "<span class = 'userdanger'>You suddenly forget the arts of Krav Maga...</span>"
+	to_chat(H, "<span class = 'userdanger'>You suddenly forget the arts of Krav Maga...</span>")
 	neckchop.Remove(H)
 	legsweep.Remove(H)
 	lungpunch.Remove(H)

code/datums/martial/wrestling.dm

@@ -36,7 +36,7 @@
 
 /datum/action/slam/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>"
+		to_chat(owner, "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] prepares to BODY SLAM!</span>", "<b><i>Your next attack will be a BODY SLAM.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -48,7 +48,7 @@
 
 /datum/action/throw_wrassle/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>"
+		to_chat(owner, "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] prepares to THROW!</span>", "<b><i>Your next attack will be a THROW.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -60,7 +60,7 @@
 
 /datum/action/kick/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>"
+		to_chat(owner, "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] prepares to KICK!</span>", "<b><i>Your next attack will be a KICK.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -72,7 +72,7 @@
 
 /datum/action/strike/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>"
+		to_chat(owner, "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] prepares to STRIKE!</span>", "<b><i>Your next attack will be a STRIKE.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -84,7 +84,7 @@
 
 /datum/action/drop/Trigger()
 	if(owner.incapacitated())
-		owner << "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>"
+		to_chat(owner, "<span class='warning'>You can't WRESTLE while you're OUT FOR THE COUNT.</span>")
 		return
 	owner.visible_message("<span class='danger'>[owner] prepares to LEG DROP!</span>", "<b><i>Your next attack will be a LEG DROP.</i></b>")
 	var/mob/living/carbon/human/H = owner
@@ -92,8 +92,8 @@
 
 /datum/martial_art/wrestling/teach(var/mob/living/carbon/human/H,var/make_temporary=0)
 	..()
-	H << "<span class = 'userdanger'>SNAP INTO A THIN TIM!</span>"
-	H << "<span class = 'danger'>Place your cursor over a move at the top of the screen to see what it does.</span>"
+	to_chat(H, "<span class = 'userdanger'>SNAP INTO A THIN TIM!</span>")
+	to_chat(H, "<span class = 'danger'>Place your cursor over a move at the top of the screen to see what it does.</span>")
 	drop.Grant(H)
 	kick.Grant(H)
 	slam.Grant(H)
@@ -102,7 +102,7 @@
 
 /datum/martial_art/wrestling/remove(var/mob/living/carbon/human/H)
 	..()
-	H << "<span class = 'userdanger'>You no longer feel that the tower of power is too sweet to be sour...</span>"
+	to_chat(H, "<span class = 'userdanger'>You no longer feel that the tower of power is too sweet to be sour...</span>")
 	drop.Remove(H)
 	kick.Remove(H)
 	slam.Remove(H)
@@ -119,7 +119,7 @@
 	if(!D)
 		return
 	if(!A.pulling || A.pulling != D)
-		A << "You need to have [D] in a cinch!"
+		to_chat(A, "You need to have [D] in a cinch!")
 		return
 	D.forceMove(A.loc)
 	D.setDir(get_dir(D, A))
@@ -145,11 +145,11 @@
 		if (A && D)
 
 			if (get_dist(A, D) > 1)
-				A << "[D] is too far away!"
+				to_chat(A, "[D] is too far away!")
 				return 0
 
 			if (!isturf(A.loc) || !isturf(D.loc))
-				A << "You can't throw [D] from here!"
+				to_chat(A, "You can't throw [D] from here!")
 				return 0
 
 			A.setDir(turn(A.dir, 90))
@@ -167,11 +167,11 @@
 		// These are necessary because of the sleep call.
 
 		if (get_dist(A, D) > 1)
-			A << "[D] is too far away!"
+			to_chat(A, "[D] is too far away!")
 			return 0
 
 		if (!isturf(A.loc) || !isturf(D.loc))
-			A << "You can't throw [D] from here!"
+			to_chat(A, "You can't throw [D] from here!")
 			return 0
 
 		D.forceMove(A.loc) // Maybe this will help with the wallthrowing bug.
@@ -190,7 +190,7 @@
 	if(!D)
 		return
 	if(!A.pulling || A.pulling != D)
-		A << "You need to have [D] in a cinch!"
+		to_chat(A, "You need to have [D] in a cinch!")
 		return
 	D.forceMove(A.loc)
 	A.setDir(get_dir(A, D))
@@ -223,7 +223,7 @@
 					D.pixel_x = A.pixel_x + 8
 
 			if (get_dist(A, D) > 1)
-				A << "[D] is too far away!"
+				to_chat(A, "[D] is too far away!")
 				A.pixel_x = 0
 				A.pixel_y = 0
 				D.pixel_x = 0
@@ -231,7 +231,7 @@
 				return 0
 
 			if (!isturf(A.loc) || !isturf(D.loc))
-				A << "You can't slam [D] here!"
+				to_chat(A, "You can't slam [D] here!")
 				A.pixel_x = 0
 				A.pixel_y = 0
 				D.pixel_x = 0
@@ -255,11 +255,11 @@
 		D.pixel_y = 0
 
 		if (get_dist(A, D) > 1)
-			A << "[D] is too far away!"
+			to_chat(A, "[D] is too far away!")
 			return 0
 
 		if (!isturf(A.loc) || !isturf(D.loc))
-			A << "You can't slam [D] here!"
+			to_chat(A, "You can't slam [D] here!")
 			return 0
 
 		D.forceMove(A.loc)
@@ -369,12 +369,12 @@
 				A.visible_message("<span class = 'danger'><B>...and dives head-first into the ground, ouch!</b></span>")
 				A.adjustBruteLoss(rand(10,20))
 				A.Weaken(3)
-			A << "[D] is too far away!"
+			to_chat(A, "[D] is too far away!")
 			return 0
 
 		if (!isturf(A.loc) || !isturf(D.loc))
 			A.pixel_y = 0
-			A << "You can't drop onto [D] from here!"
+			to_chat(A, "You can't drop onto [D] from here!")
 			return 0
 
 		if(A)

code/datums/mind.dm

@@ -36,7 +36,6 @@
 	var/active = 0
 
 	var/memory
-	var/attack_log
 
 	var/assigned_role
 	var/special_role
@@ -69,6 +68,9 @@
 	src.key = key
 	soulOwner = src
 
+/datum/mind/Destroy()
+	ticker.minds -= src
+	return ..()
 
 /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0)
 	if(current)	// remove ourself from our old body's mind variable
@@ -228,11 +230,12 @@
 
 	enslaved_to = creator
 
-	current.faction = creator.faction.Copy()
+	current.faction |= creator.faction
+	creator.faction |= current.faction
 
 	if(creator.mind.special_role)
 		message_admins("[key_name_admin(current)](<A HREF='?_src_=holder;adminmoreinfo=\ref[current]'>?</A>) has been created by [key_name_admin(creator)](<A HREF='?_src_=holder;adminmoreinfo=\ref[creator]'>?</A>), an antagonist.")
-		current << "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalities change, so do yours. This will never change unless your creator's body is destroyed.</span>"
+		to_chat(current, "<span class='userdanger'>Despite your creators current allegiances, your true master remains [creator.real_name]. If their loyalities change, so do yours. This will never change unless your creator's body is destroyed.</span>")
 
 /datum/mind/proc/show_memory(mob/recipient, window=1)
 	if(!recipient)
@@ -248,8 +251,8 @@
 
 	if(window)
 		recipient << browse(output,"window=memory")
-	else
-		recipient << "<i>[output]</i>"
+	else if(objectives.len || memory)
+		to_chat(recipient, "<i>[output]</i>")
 
 /datum/mind/proc/edit_memory()
 	if(!ticker || !ticker.mode)
@@ -542,11 +545,14 @@
 		text = uppertext(text)
 	text = "<i><b>[text]</b></i>: "
 	if(src in ticker.mode.devils)
-		text += "<b>DEVIL</b>|sintouched|<a href='?src=\ref[src];devil=clear'>human</a>"
+		if(devilinfo && !devilinfo.ascendable)
+			text += "<b>DEVIL</b>|<a href='?src=\ref[src];devil=ascendable_devil'>Ascendable Devil</a>|sintouched|<a href='?src=\ref[src];devil=clear'>human</a>"
+		else
+			text += "<a href='?src=\ref[src];devil=devil'>DEVIL</a>|<b>ASCENDABLE DEVIL</b>|sintouched|<a href='?src=\ref[src];devil=clear'>human</a>"
 	else if(src in ticker.mode.sintouched)
-		text += "devil|<b>SINTOUCHED</b>|<a href='?src=\ref[src];devil=clear'>human</a>"
+		text += "devil|Ascendable Devil|<b>SINTOUCHED</b>|<a href='?src=\ref[src];devil=clear'>human</a>"
 	else
-		text += "<a href='?src=\ref[src];devil=devil'>devil</a>|<a href='?src=\ref[src];devil=sintouched'>sintouched</a>|<b>HUMAN</b>"
+		text += "<a href='?src=\ref[src];devil=devil'>devil</a>|<a href='?src=\ref[src];devil=ascendable_devil'>Ascendable Devil</a>|<a href='?src=\ref[src];devil=sintouched'>sintouched</a>|<b>HUMAN</b>"
 
 	if(current && current.client && (ROLE_DEVIL in current.client.prefs.be_special))
 		text += "|Enabled in Prefs"
@@ -695,7 +701,7 @@
 					new_objective.owner = src
 					new_objective.update_explanation_text()
 				else
-					usr << "No active AIs with minds"
+					to_chat(usr, "No active AIs with minds")
 
 			if ("prevent")
 				new_objective = new /datum/objective/block
@@ -793,16 +799,16 @@
 		switch(href_list["revolution"])
 			if("clear")
 				remove_rev()
-				current << "<span class='userdanger'>You have been brainwashed! You are no longer a revolutionary!</span>"
+				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a revolutionary!</span>")
 				message_admins("[key_name_admin(usr)] has de-rev'ed [current].")
 				log_admin("[key_name(usr)] has de-rev'ed [current].")
 			if("rev")
 				if(src in ticker.mode.head_revolutionaries)
 					ticker.mode.head_revolutionaries -= src
 					ticker.mode.update_rev_icons_removed(src)
-					current << "<span class='userdanger'>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</span>"
+					to_chat(current, "<span class='userdanger'>Revolution has been disappointed of your leader traits! You are a regular revolutionary now!</span>")
 				else if(!(src in ticker.mode.revolutionaries))
-					current << "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>"
+					to_chat(current, "<span class='danger'><FONT size = 3> You are now a revolutionary! Help your cause. Do not harm your fellow freedom fighters. You can identify your comrades by the red \"R\" icons, and your leaders by the blue \"R\" icons. Help them kill the heads to win the revolution!</FONT></span>")
 				else
 					return
 				ticker.mode.revolutionaries += src
@@ -815,9 +821,9 @@
 				if(src in ticker.mode.revolutionaries)
 					ticker.mode.revolutionaries -= src
 					ticker.mode.update_rev_icons_removed(src)
-					current << "<span class='userdanger'>You have proved your devotion to revoltion! Yea are a head revolutionary now!</span>"
+					to_chat(current, "<span class='userdanger'>You have proved your devotion to revoltion! Yea are a head revolutionary now!</span>")
 				else if(!(src in ticker.mode.head_revolutionaries))
-					current << "<span class='userdanger'>You are a member of the revolutionaries' leadership now!</span>"
+					to_chat(current, "<span class='userdanger'>You are a member of the revolutionaries' leadership now!</span>")
 				else
 					return
 				if (ticker.mode.head_revolutionaries.len>0)
@@ -840,24 +846,24 @@
 			if("autoobjectives")
 				ticker.mode.forge_revolutionary_objectives(src)
 				ticker.mode.greet_revolutionary(src,0)
-				usr << "<span class='notice'>The objectives for revolution have been generated and shown to [key]</span>"
+				to_chat(usr, "<span class='notice'>The objectives for revolution have been generated and shown to [key]</span>")
 
 			if("flash")
 				if (!ticker.mode.equip_revolutionary(current))
-					usr << "<span class='danger'>Spawning flash failed!</span>"
+					to_chat(usr, "<span class='danger'>Spawning flash failed!</span>")
 
 			if("takeflash")
 				var/list/L = current.get_contents()
 				var/obj/item/device/assembly/flash/flash = locate() in L
 				if (!flash)
-					usr << "<span class='danger'>Deleting flash failed!</span>"
+					to_chat(usr, "<span class='danger'>Deleting flash failed!</span>")
 				qdel(flash)
 
 			if("repairflash")
 				var/list/L = current.get_contents()
 				var/obj/item/device/assembly/flash/flash = locate() in L
 				if (!flash)
-					usr << "<span class='danger'>Repairing flash failed!</span>"
+					to_chat(usr, "<span class='danger'>Repairing flash failed!</span>")
 				else
 					flash.crit_fail = 0
 					flash.update_icon()
@@ -876,11 +882,11 @@
 			if("equip")
 				switch(ticker.mode.equip_gang(current,gang_datum))
 					if(1)
-						usr << "<span class='warning'>Unable to equip territory spraycan!</span>"
+						to_chat(usr, "<span class='warning'>Unable to equip territory spraycan!</span>")
 					if(2)
-						usr << "<span class='warning'>Unable to equip recruitment pen and spraycan!</span>"
+						to_chat(usr, "<span class='warning'>Unable to equip recruitment pen and spraycan!</span>")
 					if(3)
-						usr << "<span class='warning'>Unable to equip gangtool, pen, and spraycan!</span>"
+						to_chat(usr, "<span class='warning'>Unable to equip gangtool, pen, and spraycan!</span>")
 
 			if("takeequip")
 				var/list/L = current.get_contents()
@@ -912,7 +918,7 @@
 		gang_datum = G
 		special_role = "[G.name] Gang Boss"
 		G.add_gang_hud(src)
-		current << "<FONT size=3 color=red><B>You are a [G.name] Gang Boss!</B></FONT>"
+		to_chat(current, "<FONT size=3 color=red><B>You are a [G.name] Gang Boss!</B></FONT>")
 		message_admins("[key_name_admin(usr)] has added [current] to the [G.name] Gang leadership.")
 		log_admin("[key_name(usr)] has added [current] to the [G.name] Gang leadership.")
 		ticker.mode.forge_gang_objectives(src)
@@ -944,11 +950,11 @@
 					log_admin("[key_name(usr)] has cult'ed [current].")
 			if("tome")
 				if (!ticker.mode.equip_cultist(current,1))
-					usr << "<span class='danger'>Spawning tome failed!</span>"
+					to_chat(usr, "<span class='danger'>Spawning tome failed!</span>")
 
 			if("amulet")
 				if (!ticker.mode.equip_cultist(current))
-					usr << "<span class='danger'>Spawning amulet failed!</span>"
+					to_chat(usr, "<span class='danger'>Spawning amulet failed!</span>")
 
 	else if(href_list["clockcult"])
 		switch(href_list["clockcult"])
@@ -963,15 +969,15 @@
 					log_admin("[key_name(usr)] has made [current] into a servant of Ratvar.")
 			if("slab")
 				if(!ticker.mode.equip_servant(current))
-					usr << "<span class='warning'>Failed to outfit [current] with a slab!</span>"
+					to_chat(usr, "<span class='warning'>Failed to outfit [current] with a slab!</span>")
 				else
-					usr << "<span class='notice'>Successfully gave [current] a clockwork slab!</span>"
+					to_chat(usr, "<span class='notice'>Successfully gave [current] a clockwork slab!</span>")
 
 	else if (href_list["wizard"])
 		switch(href_list["wizard"])
 			if("clear")
 				remove_wizard()
-				current << "<span class='userdanger'>You have been brainwashed! You are no longer a wizard!</span>"
+				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a wizard!</span>")
 				log_admin("[key_name(usr)] has de-wizard'ed [current].")
 				ticker.mode.update_wiz_icons_removed(src)
 			if("wizard")
@@ -979,7 +985,7 @@
 					ticker.mode.wizards += src
 					special_role = "Wizard"
 					//ticker.mode.learn_basic_spells(current)
-					current << "<span class='boldannounce'>You are the Space Wizard!</span>"
+					to_chat(current, "<span class='boldannounce'>You are the Space Wizard!</span>")
 					message_admins("[key_name_admin(usr)] has wizard'ed [current].")
 					log_admin("[key_name(usr)] has wizard'ed [current].")
 					ticker.mode.update_wiz_icons_added(src)
@@ -991,13 +997,13 @@
 				ticker.mode.name_wizard(current)
 			if("autoobjectives")
 				ticker.mode.forge_wizard_objectives(src)
-				usr << "<span class='notice'>The objectives for wizard [key] have been generated. You can edit them and anounce manually.</span>"
+				to_chat(usr, "<span class='notice'>The objectives for wizard [key] have been generated. You can edit them and anounce manually.</span>")
 
 	else if (href_list["changeling"])
 		switch(href_list["changeling"])
 			if("clear")
 				remove_changeling()
-				current << "<span class='userdanger'>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</span>"
+				to_chat(current, "<span class='userdanger'>You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!</span>")
 				message_admins("[key_name_admin(usr)] has de-changeling'ed [current].")
 				log_admin("[key_name(usr)] has de-changeling'ed [current].")
 			if("changeling")
@@ -1005,17 +1011,17 @@
 					ticker.mode.changelings += src
 					current.make_changeling()
 					special_role = "Changeling"
-					current << "<span class='boldannounce'>Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!</span>"
+					to_chat(current, "<span class='boldannounce'>Your powers are awoken. A flash of memory returns to us...we are [changeling.changelingID], a changeling!</span>")
 					message_admins("[key_name_admin(usr)] has changeling'ed [current].")
 					log_admin("[key_name(usr)] has changeling'ed [current].")
 					ticker.mode.update_changeling_icons_added(src)
 			if("autoobjectives")
 				ticker.mode.forge_changeling_objectives(src)
-				usr << "<span class='notice'>The objectives for changeling [key] have been generated. You can edit them and anounce manually.</span>"
+				to_chat(usr, "<span class='notice'>The objectives for changeling [key] have been generated. You can edit them and anounce manually.</span>")
 
 			if("initialdna")
 				if( !changeling || !changeling.stored_profiles.len || !istype(current, /mob/living/carbon))
-					usr << "<span class='danger'>Resetting DNA failed!</span>"
+					to_chat(usr, "<span class='danger'>Resetting DNA failed!</span>")
 				else
 					var/mob/living/carbon/C = current
 					changeling.first_prof.dna.transfer_identity(C, transfer_SE=1)
@@ -1027,7 +1033,7 @@
 		switch(href_list["nuclear"])
 			if("clear")
 				remove_nukeop()
-				current << "<span class='userdanger'>You have been brainwashed! You are no longer a syndicate operative!</span>"
+				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a syndicate operative!</span>")
 				message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].")
 				log_admin("[key_name(usr)] has de-nuke op'ed [current].")
 			if("nuclear")
@@ -1040,7 +1046,7 @@
 						current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]"
 					special_role = "Syndicate"
 					assigned_role = "Syndicate"
-					current << "<span class='notice'>You are a [syndicate_name()] agent!</span>"
+					to_chat(current, "<span class='notice'>You are a [syndicate_name()] agent!</span>")
 					ticker.mode.forge_syndicate_objectives(src)
 					ticker.mode.greet_syndicate(src)
 					message_admins("[key_name_admin(usr)] has nuke op'ed [current].")
@@ -1060,7 +1066,7 @@
 				qdel(H.w_uniform)
 
 				if (!ticker.mode.equip_syndicate(current))
-					usr << "<span class='danger'>Equipping a syndicate failed!</span>"
+					to_chat(usr, "<span class='danger'>Equipping a syndicate failed!</span>")
 			if("tellcode")
 				var/code
 				for (var/obj/machinery/nuclearbomb/bombue in machines)
@@ -1069,15 +1075,15 @@
 						break
 				if (code)
 					store_memory("<B>Syndicate Nuclear Bomb Code</B>: [code]", 0, 0)
-					current << "The nuclear authorization code is: <B>[code]</B>"
+					to_chat(current, "The nuclear authorization code is: <B>[code]</B>")
 				else
-					usr << "<span class='danger'>No valid nuke found!</span>"
+					to_chat(usr, "<span class='danger'>No valid nuke found!</span>")
 
 	else if (href_list["traitor"])
 		switch(href_list["traitor"])
 			if("clear")
 				remove_traitor()
-				current << "<span class='userdanger'>You have been brainwashed! You are no longer a traitor!</span>"
+				to_chat(current, "<span class='userdanger'>You have been brainwashed! You are no longer a traitor!</span>")
 				message_admins("[key_name_admin(usr)] has de-traitor'ed [current].")
 				log_admin("[key_name(usr)] has de-traitor'ed [current].")
 				ticker.mode.update_traitor_icons_removed(src)
@@ -1086,7 +1092,7 @@
 				if(!(src in ticker.mode.traitors))
 					ticker.mode.traitors += src
 					special_role = "traitor"
-					current << "<span class='boldannounce'>You are a traitor!</span>"
+					to_chat(current, "<span class='boldannounce'>You are a traitor!</span>")
 					message_admins("[key_name_admin(usr)] has traitor'ed [current].")
 					log_admin("[key_name(usr)] has traitor'ed [current].")
 					if(isAI(current))
@@ -1096,7 +1102,7 @@
 
 			if("autoobjectives")
 				ticker.mode.forge_traitor_objectives(src)
-				usr << "<span class='notice'>The objectives for traitor [key] have been generated. You can edit them and anounce manually.</span>"
+				to_chat(usr, "<span class='notice'>The objectives for traitor [key] have been generated. You can edit them and anounce manually.</span>")
 
 	else if(href_list["devil"])
 		switch(href_list["devil"])
@@ -1106,15 +1112,20 @@
 						if(devilinfo)
 							devilinfo.regress_blood_lizard()
 						else
-							usr << "<span class='warning'>Something went wrong with removing the devil, we were unable to find an attached devilinfo.</span>."
+							to_chat(usr, "<span class='warning'>Something went wrong with removing the devil, we were unable to find an attached devilinfo.</span>.")
 					ticker.mode.devils -= src
 					special_role = null
-					current << "<span class='userdanger'>Your infernal link has been severed! You are no longer a devil!</span>"
+					to_chat(current, "<span class='userdanger'>Your infernal link has been severed! You are no longer a devil!</span>")
 					RemoveSpell(/obj/effect/proc_holder/spell/targeted/infernal_jaunt)
 					RemoveSpell(/obj/effect/proc_holder/spell/aimed/fireball/hellish)
 					RemoveSpell(/obj/effect/proc_holder/spell/targeted/summon_contract)
 					RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork)
 					RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/violin)
+					RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/greater)
+					RemoveSpell(/obj/effect/proc_holder/spell/targeted/conjure_item/summon_pitchfork/ascended)
+					RemoveSpell(/obj/effect/proc_holder/spell/targeted/summon_dancefloor)
+					RemoveSpell(/obj/effect/proc_holder/spell/targeted/sintouch)
+					RemoveSpell(/obj/effect/proc_holder/spell/targeted/sintouch/ascended)
 					message_admins("[key_name_admin(usr)] has de-devil'ed [current].")
 					devilinfo = null
 					if(issilicon(current))
@@ -1126,15 +1137,39 @@
 					message_admins("[key_name_admin(usr)] has de-sintouch'ed [current].")
 					log_admin("[key_name(usr)] has de-sintouch'ed [current].")
 			if("devil")
+				if(devilinfo)
+					devilinfo.ascendable = FALSE
+					message_admins("[key_name_admin(usr)] has made [current] unable to ascend as a devil.")
+					log_admin("[key_name_admin(usr)] has made [current] unable to ascend as a devil.")
+					return
 				if(!ishuman(current) && !iscyborg(current))
 					usr << "<span class='warning'>This only works on humans and cyborgs!</span>"
 					return
 				ticker.mode.devils += src
 				special_role = "devil"
-				ticker.mode.finalize_devil(src)
+				ticker.mode.finalize_devil(src, FALSE)
 				ticker.mode.add_devil_objectives(src, 2)
 				announceDevilLaws()
 				announce_objectives()
+				message_admins("[key_name_admin(usr)] has devil'ed [current].")
+				log_admin("[key_name(usr)] has devil'ed [current].")
+			if("ascendable_devil")
+				if(devilinfo)
+					devilinfo.ascendable = TRUE
+					message_admins("[key_name_admin(usr)] has made [current] able to ascend as a devil.")
+					log_admin("[key_name_admin(usr)] has made [current] able to ascend as a devil.")
+					return
+				if(!ishuman(current) && !iscyborg(current))
+					to_chat(usr, "<span class='warning'>This only works on humans and cyborgs!</span>")
+					return
+				ticker.mode.devils += src
+				special_role = "devil"
+				ticker.mode.finalize_devil(src, TRUE)
+				ticker.mode.add_devil_objectives(src, 2)
+				announceDevilLaws()
+				announce_objectives()
+				message_admins("[key_name_admin(usr)] has devil'ed [current].  The devil has been marked as ascendable.")
+				log_admin("[key_name(usr)] has devil'ed [current]. The devil has been marked as ascendable.")
 			if("sintouched")
 				if(ishuman(current))
 					ticker.mode.sintouched += src
@@ -1142,17 +1177,17 @@
 					H.influenceSin()
 					message_admins("[key_name_admin(usr)] has sintouch'ed [current].")
 				else
-					usr << "<span class='warning'>This only works on humans!</span>"
+					to_chat(usr, "<span class='warning'>This only works on humans!</span>")
 					return
 
 	else if(href_list["abductor"])
 		switch(href_list["abductor"])
 			if("clear")
-				usr << "Not implemented yet. Sorry!"
+				to_chat(usr, "Not implemented yet. Sorry!")
 				//ticker.mode.update_abductor_icons_removed(src)
 			if("abductor")
 				if(!ishuman(current))
-					usr << "<span class='warning'>This only works on humans!</span>"
+					to_chat(usr, "<span class='warning'>This only works on humans!</span>")
 					return
 				make_Abductor()
 				log_admin("[key_name(usr)] turned [current] into abductor.")
@@ -1182,7 +1217,7 @@
 						src = null
 						M = H.monkeyize()
 						src = M.mind
-						//world << "DEBUG: \"healthy\": M=[M], M.mind=[M.mind], src=[src]!"
+						//to_chat(world, "DEBUG: \"healthy\": M=[M], M.mind=[M.mind], src=[src]!")
 					else if (istype(M) && length(M.viruses))
 						for(var/datum/disease/D in M.viruses)
 							D.cure(0)
@@ -1252,7 +1287,7 @@
 							log_admin("[key_name(usr)] changed [current]'s telecrystal count to [crystals].")
 			if("uplink")
 				if(!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors)))
-					usr << "<span class='danger'>Equipping a syndicate failed!</span>"
+					to_chat(usr, "<span class='danger'>Equipping a syndicate failed!</span>")
 				log_admin("[key_name(usr)] attempted to give [current] an uplink.")
 
 	else if (href_list["obj_announce"])
@@ -1262,10 +1297,10 @@
 
 /datum/mind/proc/announce_objectives()
 	var/obj_count = 1
-	current << "<span class='notice'>Your current objectives:</span>"
+	to_chat(current, "<span class='notice'>Your current objectives:</span>")
 	for(var/objective in objectives)
 		var/datum/objective/O = objective
-		current << "<B>Objective #[obj_count]</B>: [O.explanation_text]"
+		to_chat(current, "<B>Objective #[obj_count]</B>: [O.explanation_text]")
 		obj_count++
 
 /datum/mind/proc/find_syndicate_uplink()
@@ -1316,14 +1351,14 @@
 
 		if (nuke_code)
 			store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke_code]", 0, 0)
-			current << "The nuclear authorization code is: <B>[nuke_code]</B>"
+			to_chat(current, "The nuclear authorization code is: <B>[nuke_code]</B>")
 		else
 			var/obj/machinery/nuclearbomb/nuke = locate("syndienuke") in nuke_list
 			if(nuke)
 				store_memory("<B>Syndicate Nuclear Bomb Code</B>: [nuke.r_code]", 0, 0)
-				current << "The nuclear authorization code is: <B>nuke.r_code</B>"
+				to_chat(current, "The nuclear authorization code is: <B>nuke.r_code</B>")
 			else
-				current << "You were not provided with a nuclear code. Trying asking your team leader or contacting syndicate command.</B>"
+				to_chat(current, "You were not provided with a nuclear code. Trying asking your team leader or contacting syndicate command.</B>")
 
 		if (leader)
 			ticker.mode.prepare_syndicate_leader(src,nuke_code)
@@ -1346,7 +1381,7 @@
 		assigned_role = "Wizard"
 		if(!wizardstart.len)
 			current.loc = pick(latejoin)
-			current << "HOT INSERTION, GO GO GO"
+			to_chat(current, "HOT INSERTION, GO GO GO")
 		else
 			current.loc = pick(wizardstart)
 
@@ -1360,20 +1395,20 @@
 	if(!(src in ticker.mode.cult))
 		ticker.mode.add_cultist(src,FALSE)
 		special_role = "Cultist"
-		current << "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>"
-		current << "<font color=\"purple\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>"
+		to_chat(current, "<font color=\"purple\"><b><i>You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.</b></i></font>")
+		to_chat(current, "<font color=\"purple\"><b><i>Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.</b></i></font>")
 		var/datum/game_mode/cult/cult = ticker.mode
 
 		if (istype(cult))
 			cult.memorize_cult_objectives(src)
 		else
 			var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
-			current << "<B>Objective #1</B>: [explanation]"
+			to_chat(current, "<B>Objective #1</B>: [explanation]")
 			memory += "<B>Objective #1</B>: [explanation]<BR>"
 
 	var/mob/living/carbon/human/H = current
 	if (!ticker.mode.equip_cultist(current))
-		H << "Spawning an amulet from your Master failed."
+		to_chat(H, "Spawning an amulet from your Master failed.")
 
 /datum/mind/proc/make_Rev()
 	if (ticker.mode.head_revolutionaries.len>0)
@@ -1468,13 +1503,14 @@
 	S.action.Grant(current)
 
 //To remove a specific spell from a mind
-/datum/mind/proc/RemoveSpell(var/obj/effect/proc_holder/spell/spell)
-	if(!spell) return
+/datum/mind/proc/RemoveSpell(obj/effect/proc_holder/spell/spell)
+	if(!spell)
+		return
 	for(var/X in spell_list)
 		var/obj/effect/proc_holder/spell/S = X
 		if(istype(S, spell))
-			qdel(S)
 			spell_list -= S
+			qdel(S)
 
 /datum/mind/proc/transfer_actions(mob/living/new_character)
 	if(current && current.actions)
@@ -1513,7 +1549,7 @@
 	mind_initialize()	//updates the mind (or creates and initializes one if one doesn't exist)
 	mind.active = 1		//indicates that the mind is currently synced with a client
 
-/mob/new_player/sync_mind()
+/mob/dead/new_player/sync_mind()
 	return
 
 /mob/dead/observer/sync_mind()
@@ -1529,8 +1565,7 @@
 		if(ticker)
 			ticker.minds += mind
 		else
-			spawn(0)
-				throw EXCEPTION("mind_initialize(): No ticker ready")
+			stack_trace("mind_initialize(): No ticker ready")
 	if(!mind.name)
 		mind.name = real_name
 	mind.current = src

code/datums/mutations.dm

@@ -66,7 +66,7 @@
 		return 1
 	owner.dna.mutations.Add(src)
 	if(text_gain_indication)
-		owner << text_gain_indication
+		to_chat(owner, text_gain_indication)
 	if(visual_indicators.len)
 		var/list/mut_overlay = list(get_visual_indicator(owner))
 		if(owner.overlays_standing[layer_used])
@@ -94,7 +94,7 @@
 /datum/mutation/human/proc/on_losing(mob/living/carbon/human/owner)
 	if(owner && istype(owner) && (owner.dna.mutations.Remove(src)))
 		if(text_lose_indication && owner.stat != DEAD)
-			owner << text_lose_indication
+			to_chat(owner, text_lose_indication)
 		if(visual_indicators.len)
 			var/list/mut_overlay = list()
 			if(owner.overlays_standing[layer_used])
@@ -137,7 +137,7 @@
 /datum/mutation/human/hulk/on_life(mob/living/carbon/human/owner)
 	if(owner.health < 0)
 		on_losing(owner)
-		owner << "<span class='danger'>You suddenly feel very weak.</span>"
+		to_chat(owner, "<span class='danger'>You suddenly feel very weak.</span>")
 
 /datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
 	if(..())
@@ -249,7 +249,7 @@
 	text_gain_indication = "<span class='danger'>You feel strange.</span>"
 
 /datum/mutation/human/bad_dna/on_acquiring(mob/living/carbon/human/owner)
-	owner << text_gain_indication
+	to_chat(owner, text_gain_indication)
 	var/mob/new_mob
 	if(prob(95))
 		if(prob(50))
@@ -378,7 +378,7 @@
 
 /datum/mutation/human/race/on_acquiring(mob/living/carbon/human/owner)
 	if(owner.has_brain_worms())
-		owner << "<span class='warning'>You feel something strongly clinging to your humanity!</span>"
+		to_chat(owner, "<span class='warning'>You feel something strongly clinging to your humanity!</span>")
 		return
 	if(..())
 		return

code/datums/outfit.dm

@@ -3,6 +3,7 @@
 
 	var/uniform = null
 	var/suit = null
+	var/toggle_helmet = TRUE
 	var/back = null
 	var/belt = null
 	var/gloves = null
@@ -76,7 +77,7 @@
 			for(var/i=0,i<number,i++)
 				H.equip_to_slot_or_del(new path(H),slot_in_backpack)
 
-	if(!H.head && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit))
+	if(!H.head && toggle_helmet && istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit))
 		var/obj/item/clothing/suit/space/hardsuit/HS = H.wear_suit
 		HS.ToggleHelmet()
 

code/datums/progressbar.dm

@@ -29,7 +29,7 @@
 	bar.pixel_y = 32 + (PROGRESSBAR_HEIGHT * (listindex - 1))
 
 /datum/progressbar/proc/update(progress)
-	//world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]"
+	//to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]")
 	if (!user || !user.client)
 		shown = 0
 		return

code/datums/riding.dm

@@ -65,7 +65,7 @@
 //MOVEMENT
 /datum/riding/proc/handle_ride(mob/user, direction)
 	if(user.incapacitated())
-		ridden.unbuckle_mob(user)
+		Unbuckle(user)
 		return
 
 	if(world.time < next_vehicle_move)
@@ -79,7 +79,10 @@
 		handle_vehicle_layer()
 		handle_vehicle_offsets()
 	else
-		user << "<span class='notice'>You'll need the keys in one of your hands to drive \the [ridden.name].</span>"
+		to_chat(user, "<span class='notice'>You'll need the keys in one of your hands to drive \the [ridden.name].</span>")
+
+/datum/riding/proc/Unbuckle(atom/movable/M)
+	addtimer(CALLBACK(ridden, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE)
 
 /datum/riding/proc/Process_Spacemove(direction)
 	if(ridden.has_gravity())
@@ -209,6 +212,13 @@
 	generic_pixel_x = 0
 	generic_pixel_y = 4
 
+//i want to ride my
+/datum/riding/bicycle
+	keytype = null
+	generic_pixel_x = 0
+	generic_pixel_y = 4
+	vehicle_move_delay = 0
+
 //speedbike
 /datum/riding/space/speedbike
 	keytype = null
@@ -244,24 +254,32 @@
 
 //SPEEDUWAGON
 
-/datum/riding/space/speedbike/speedwagon/handle_vehicle_offsets()
+/datum/riding/space/speedwagon
+	vehicle_move_delay = 0
+
+/datum/riding/space/speedwagon/handle_vehicle_offsets()
 	if(ridden.has_buckled_mobs())
 		for(var/m in ridden.buckled_mobs)
 			var/mob/living/buckled_mob = m
 			buckled_mob.setDir(ridden.dir)
+			ridden.pixel_x = -48
+			ridden.pixel_y = -48
 			switch(ridden.dir)
 				if(NORTH)
-					buckled_mob.pixel_x = -5
-					buckled_mob.pixel_y = -5
+					buckled_mob.pixel_x = -10
+					buckled_mob.pixel_y = -3
 				if(SOUTH)
-					buckled_mob.pixel_x = 5
+					buckled_mob.pixel_x = 16
 					buckled_mob.pixel_y = 3
 				if(EAST)
-					buckled_mob.pixel_x = -8
-					buckled_mob.pixel_y = 5
+					buckled_mob.pixel_x = -4
+					buckled_mob.pixel_y = 30
 				if(WEST)
-					buckled_mob.pixel_x = 8
-					buckled_mob.pixel_y = 5
+					buckled_mob.pixel_x = 4
+					buckled_mob.pixel_y = -1
+
+/datum/riding/space/speedwagon/handle_vehicle_layer()
+	ridden.layer = BELOW_MOB_LAYER
 
 ///////////////BOATS////////////
 /datum/riding/boat
@@ -274,7 +292,7 @@
 	if(istype(next, /turf/open/floor/plating/lava) || istype(current, /turf/open/floor/plating/lava)) //We can move from land to lava, or lava to land, but not from land to land
 		..()
 	else
-		user << "Boats don't go on land!"
+		to_chat(user, "Boats don't go on land!")
 		return 0
 
 /datum/riding/boat/dragon
@@ -293,7 +311,7 @@
 
 /datum/riding/animal/handle_ride(mob/user, direction)
 	if(user.incapacitated())
-		ridden.unbuckle_mob(user)
+		Unbuckle(user)
 		return
 
 	if(world.time < next_vehicle_move)
@@ -308,7 +326,7 @@
 		handle_vehicle_layer()
 		handle_vehicle_offsets()
 	else
-		user << "<span class='notice'>You'll need something  to guide the [ridden.name].</span>"
+		to_chat(user, "<span class='notice'>You'll need something  to guide the [ridden.name].</span>")
 
 ///////Humans. Yes, I said humans. No, this won't end well...//////////
 /datum/riding/human
@@ -318,11 +336,11 @@
 	var/mob/living/carbon/human/H = ridden	//IF this runtimes I'm blaming the admins.
 	if(M.incapacitated(FALSE, TRUE) || H.incapacitated(FALSE, TRUE))
 		M.visible_message("<span class='boldwarning'>[M] falls off of [ridden]!</span>")
-		ridden.unbuckle_mob(M)
+		Unbuckle(M)
 		return FALSE
 	if(M.restrained(TRUE))
 		M.visible_message("<span class='boldwarning'>[M] can't hang onto [ridden] with their hands cuffed!</span>")	//Honestly this should put the ridden mob in a chokehold.
-		ridden.unbuckle_mob(M)
+		Unbuckle(M)
 		return FALSE
 	if(H.pulling == M)
 		H.stop_pulling()
@@ -370,14 +388,14 @@
 			if(R.module && R.module.ride_allow_incapacitated)
 				kick = FALSE
 		if(kick)
-			user << "<span class='userdanger'>You fall off of [ridden]!</span>"
-			ridden.unbuckle_mob(user)
+			to_chat(user, "<span class='userdanger'>You fall off of [ridden]!</span>")
+			Unbuckle(user)
 			return
 	if(istype(user, /mob/living/carbon))
 		var/mob/living/carbon/carbonuser = user
 		if(!carbonuser.get_num_arms())
-			ridden.unbuckle_mob(user)
-			user << "<span class='userdanger'>You can't grab onto [ridden] with no hands!</span>"
+			Unbuckle(user)
+			to_chat(user, "<span class='userdanger'>You can't grab onto [ridden] with no hands!</span>")
 			return
 
 /datum/riding/cyborg/handle_vehicle_layer()
@@ -474,4 +492,4 @@
 	if(selfdeleting)
 		if(rider in ridden.buckled_mobs)
 			ridden.unbuckle_mob(rider)
-	. = ..()
+	. = ..()

code/datums/ruins/space.dm

@@ -136,13 +136,6 @@
 	description = "Based on the trace elements we've detected on the gutted asteroids, we suspect that a mining ship using a restricted engine is somewhere in the area. \
 	We'd like to request a patrol vessel to investigate."
 
-/datum/map_template/ruin/space/spacebar
-	id = "spacebar"
-	suffix = "spacebar.dmm"
-	name = "The Rampant Golem and Yellow Hound"
-	description = "No questions asked. No shoes/foot protection, no service. No tabs. No violence in the inside areas. That's it. Welcome to the Rampant Golem and Yellow Hound. \
-	Can I take your order?"
-
 /datum/map_template/ruin/space/spacehotel
 	id = "spacehotel"
 	suffix = "spacehotel.dmm"

code/datums/shuttles.dm

@@ -244,3 +244,10 @@
 	description = "A large shuttle for a large station, this shuttle can comfortably fit all your overpopulation and crowding needs. Complete with all facilities plus additional equipment."
 	admin_notes = "Go big or go home."
 	credit_cost = 7500
+
+/datum/map_template/shuttle/emergency/raven
+	suffix = "raven"
+	name = "Centcomm Raven Battlecruiser"
+	description = "The Centcomm Raven Battlecruiser is currently docked at the Centcomm ship bay awaiting a mission, this Battlecruiser has been reassigned as an emergency escape shuttle for currently unknown reasons. The Centcomm Raven Battlecruiser should comfortably fit a medium to large crew size crew and is complete with all required facitlities including a top of the range Centcomm Medical Bay."
+	admin_notes = "The long way home"
+	credit_cost = 12500

code/datums/status_effects/buffs.dm

@@ -201,3 +201,21 @@
 	if(islist(owner.stun_absorption) && owner.stun_absorption["hisgrace"])
 		owner.stun_absorption -= "hisgrace"
 
+
+/datum/status_effect/wish_granters_gift //Fully revives after ten seconds.
+	id = "wish_granters_gift"
+	duration = 50
+	alert_type = /obj/screen/alert/status_effect/wish_granters_gift
+
+/datum/status_effect/wish_granters_gift/on_apply()
+	to_chat(owner, "<span class='notice'>Death is not your end! The Wish Granter's energy suffuses you, and you begin to rise...</span>")
+
+/datum/status_effect/wish_granters_gift/on_remove()
+	owner.revive(full_heal = 1, admin_revive = 1)
+	owner.visible_message("<span class='warning'>[owner] appears to wake from the dead, having healed all wounds!</span>", "<span class='notice'>You have regenerated.</span>")
+	owner.update_canmove()
+
+/obj/screen/alert/status_effect/wish_granters_gift
+	name = "Wish Granter's Immortality"
+	desc = "You are being resurrected!"
+	icon_state = "wish_granter"

code/datums/status_effects/gas.dm

@@ -12,7 +12,7 @@
 
 /datum/status_effect/freon/on_apply()
 	if(!owner.stat)
-		owner << "You become frozen in a cube!"
+		to_chat(owner, "<span class='userdanger'>You become frozen in a cube!</span>")
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
 	owner.add_overlay(cube)
 	owner.update_canmove()
@@ -24,7 +24,7 @@
 
 /datum/status_effect/freon/on_remove()
 	if(!owner.stat)
-		owner << "The cube melts!"
+		to_chat(owner, "The cube melts!")
 	owner.cut_overlay(cube)
 	owner.bodytemperature += 100
 	owner.update_canmove()

code/datums/weather/weather.dm

@@ -67,7 +67,7 @@
 		var/mob/M = V
 		if(M.z == target_z)
 			if(telegraph_message)
-				M << telegraph_message
+				to_chat(M, telegraph_message)
 			if(telegraph_sound)
 				M << sound(telegraph_sound)
 	addtimer(CALLBACK(src, .proc/start), telegraph_duration)
@@ -81,7 +81,7 @@
 		var/mob/M = V
 		if(M.z == target_z)
 			if(weather_message)
-				M << weather_message
+				to_chat(M, weather_message)
 			if(weather_sound)
 				M << sound(weather_sound)
 	START_PROCESSING(SSweather, src)
@@ -96,7 +96,7 @@
 		var/mob/M = V
 		if(M.z == target_z)
 			if(end_message)
-				M << end_message
+				to_chat(M, end_message)
 			if(end_sound)
 				M << sound(end_sound)
 	STOP_PROCESSING(SSweather, src)
@@ -141,4 +141,4 @@
 				N.icon = 'icons/turf/areas.dmi'
 				N.layer = AREA_LAYER //Just default back to normal area stuff since I assume setting a var is faster than initial
 				N.invisibility = INVISIBILITY_MAXIMUM
-				N.opacity = 0
+				N.set_opacity(FALSE)

code/datums/weather/weather_types.dm

@@ -55,13 +55,13 @@
 		var/area/A = V
 		if(stage == MAIN_STAGE)
 			A.invisibility = 0
-			A.opacity = 1
+			A.set_opacity(TRUE)
 			A.layer = overlay_layer
 			A.icon = 'icons/effects/weather_effects.dmi'
 			A.icon_state = "darkness"
 		else
 			A.invisibility = INVISIBILITY_MAXIMUM
-			A.opacity = 0
+			A.set_opacity(FALSE)
 
 
 /datum/weather/ash_storm //Ash Storms: Common happenings on lavaland. Heavily obscures vision and deals heavy fire damage to anyone caught outside.
@@ -165,7 +165,8 @@
 		return
 	priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert")
 	status_alarm()
-	spawn(300) revoke_maint_all_access()
+	sleep(300)
+	revoke_maint_all_access() // Need to make this a timer at some point.
 
 /datum/weather/rad_storm/proc/status_alarm(command)	//Makes the status displays show the radiation warning for those who missed the announcement.
 	var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)

code/datums/wires/airlock.dm

@@ -36,6 +36,7 @@
 	return status
 
 /datum/wires/airlock/on_pulse(wire)
+	set waitfor = FALSE
 	var/obj/machinery/door/airlock/A = holder
 	switch(wire)
 		if(WIRE_POWER1, WIRE_POWER2) // Pulse to loose power.
@@ -70,25 +71,25 @@
 				A.aiControlDisabled = 1
 			else if(A.aiControlDisabled == -1)
 				A.aiControlDisabled = 2
-			spawn(10)
-				if(A)
-					if(A.aiControlDisabled == 1)
-						A.aiControlDisabled = 0
-					else if(A.aiControlDisabled == 2)
-						A.aiControlDisabled = -1
+			sleep(10)
+			if(A)
+				if(A.aiControlDisabled == 1)
+					A.aiControlDisabled = 0
+				else if(A.aiControlDisabled == 2)
+					A.aiControlDisabled = -1
 		if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks.
 			if(!A.secondsElectrified)
-				A.secondsElectrified = 30
+				A.set_electrified(30)
 				if(usr)
 					A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
 				add_logs(usr, A, "electrified")
-				spawn(10)
-					if(A)
-						while (A.secondsElectrified > 0)
-							A.secondsElectrified -= 1
-							if(A.secondsElectrified < 0)
-								A.secondsElectrified = 0
-							sleep(10)
+				sleep(10)
+				if(A)
+					while (A.secondsElectrified > 0)
+						A.secondsElectrified -= 1
+						if(A.secondsElectrified < 0)
+							A.set_electrified(0)
+						sleep(10)
 		if(WIRE_SAFETY)
 			A.safe = !A.safe
 			if(!A.density)
@@ -137,10 +138,10 @@
 		if(WIRE_SHOCK) // Cut to shock the door, mend to unshock.
 			if(mend)
 				if(A.secondsElectrified)
-					A.secondsElectrified = 0
+					A.set_electrified(0)
 			else
 				if(A.secondsElectrified != -1)
-					A.secondsElectrified = -1
+					A.set_electrified(-1)
 					if(usr)
 						A.shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])")
 					add_logs(usr, A, "electrified")

code/datums/wires/r_n_d.dm

@@ -24,6 +24,7 @@
 	return status
 
 /datum/wires/r_n_d/on_pulse(wire)
+	set waitfor = FALSE
 	var/obj/machinery/r_n_d/R = holder
 	switch(wire)
 		if(WIRE_HACK)
@@ -32,9 +33,9 @@
 			R.disabled = !R.disabled
 		if(WIRE_SHOCK)
 			R.shocked = TRUE
-			spawn(100)
-				if(R)
-					R.shocked = FALSE
+			sleep(100)
+			if(R)
+				R.shocked = FALSE
 
 /datum/wires/r_n_d/on_cut(wire, mend)
 	var/obj/machinery/r_n_d/R = holder

code/datums/wires/suit_storage_unit.dm

@@ -42,4 +42,4 @@
 			SSU.safeties = mend
 		if(WIRE_ZAP)
 			if(usr)
-				SSU.shock(usr)
+				SSU.shock(usr)

code/datums/wires/wires.dm

@@ -234,14 +234,14 @@ var/list/wire_name_directory = list()
 				cut_color(target_wire)
 				. = TRUE
 			else
-				L << "<span class='warning'>You need wirecutters!</span>"
+				to_chat(L, "<span class='warning'>You need wirecutters!</span>")
 		if("pulse")
 			if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr))
 				playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
 				pulse_color(target_wire)
 				. = TRUE
 			else
-				L << "<span class='warning'>You need a multitool!</span>"
+				to_chat(L, "<span class='warning'>You need a multitool!</span>")
 		if("attach")
 			if(is_attached(target_wire))
 				var/obj/item/O = detach_assembly(target_wire)
@@ -257,6 +257,6 @@ var/list/wire_name_directory = list()
 						attach_assembly(target_wire, A)
 						. = TRUE
 					else
-						L << "<span class='warning'>You need an attachable assembly!</span>"
+						to_chat(L, "<span class='warning'>You need an attachable assembly!</span>")
 
 #undef MAXIMUM_EMP_WIRES