Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00
parent 41c9cf3a4a 67194ef0db
commit 0ffaf66d1f
186 changed files with 3316 additions and 1264 deletions
@@ -83,10 +83,10 @@
 	var/a_computerid
 	var/a_ip

-	if(src.owner && istype(src.owner, /client))
-		a_ckey = src.owner:ckey
-		a_computerid = src.owner:computer_id
-		a_ip = src.owner:address
+	if(istype(owner))
+		a_ckey = owner.ckey
+		a_computerid = owner.computer_id
+		a_ip = owner.address

 	if(blockselfban)
 		if(a_ckey == ckey)
@@ -309,12 +309,12 @@
 		to_chat(usr, "<span class='danger'>Database update failed due to multiple bans having the same ID. Contact the database admin.</span>")
 		return

-	if(!src.owner || !istype(src.owner, /client))
+	if(!istype(owner))
 		return

-	var/unban_ckey = src.owner:ckey
-	var/unban_computerid = src.owner:computer_id
-	var/unban_ip = src.owner:address
+	var/unban_ckey = owner.ckey
+	var/unban_computerid = owner.computer_id
+	var/unban_ip = owner.address

 	var/sql_update = "UPDATE [format_table_name("ban")] SET unbanned = 1, unbanned_datetime = Now(), unbanned_ckey = '[unban_ckey]', unbanned_computerid = '[unban_computerid]', unbanned_ip = INET_ATON('[unban_ip]') WHERE id = [id]"
 	var/datum/DBQuery/query_unban = SSdbcore.NewQuery(sql_update)
@@ -109,14 +109,14 @@ GLOBAL_PROTECT(Banlist)
 	else
 		GLOB.Banlist.dir.Add("[ckey][computerid]")
 		GLOB.Banlist.cd = "/base/[ckey][computerid]"
-		GLOB.Banlist["key"] << ckey
-		GLOB.Banlist["id"] << computerid
-		GLOB.Banlist["ip"] << address
-		GLOB.Banlist["reason"] << reason
-		GLOB.Banlist["bannedby"] << bannedby
-		GLOB.Banlist["temp"] << temp
+		WRITE_FILE(GLOB.Banlist["key"], ckey)
+		WRITE_FILE(GLOB.Banlist["id"], computerid)
+		WRITE_FILE(GLOB.Banlist["ip"], address)
+		WRITE_FILE(GLOB.Banlist["reason"], reason)
+		WRITE_FILE(GLOB.Banlist["bannedby"], bannedby)
+		WRITE_FILE(GLOB.Banlist["temp"], temp)
 		if (temp)
-			GLOB.Banlist["minutes"] << bantimestamp
+			WRITE_FILE(GLOB.Banlist["minutes"], bantimestamp)
 		if(!temp)
 			create_message("note", ckey, bannedby, "Permanently banned - [reason]", null, null, 0, 0)
 		else
@@ -211,17 +211,17 @@ GLOBAL_PROTECT(Banlist)
 			GLOB.Banlist.cd = "/base"
 			GLOB.Banlist.dir.Add("trash[i]trashid[i]")
 			GLOB.Banlist.cd = "/base/trash[i]trashid[i]"
-			GLOB.Banlist["key"] << "trash[i]"
+			WRITE_FILE(GLOB.Banlist["key"], "trash[i]")
 		else
 			GLOB.Banlist.cd = "/base"
 			GLOB.Banlist.dir.Add("[last]trashid[i]")
 			GLOB.Banlist.cd = "/base/[last]trashid[i]"
-			GLOB.Banlist["key"] << last
-		GLOB.Banlist["id"] << "trashid[i]"
-		GLOB.Banlist["reason"] << "Trashban[i]."
-		GLOB.Banlist["temp"] << a
-		GLOB.Banlist["minutes"] << GLOB.CMinutes + rand(1,2000)
-		GLOB.Banlist["bannedby"] << "trashmin"
+			WRITE_FILE(GLOB.Banlist["key"], last)
+		WRITE_FILE(GLOB.Banlist["id"], "trashid[i]")
+		WRITE_FILE(GLOB.Banlist["reason"], "Trashban[i].")
+		WRITE_FILE(GLOB.Banlist["temp"], a)
+		WRITE_FILE(GLOB.Banlist["minutes"], GLOB.CMinutes + rand(1,2000))
+		WRITE_FILE(GLOB.Banlist["bannedby"], "trashmin")
 		last = "trash[i]"

 	GLOB.Banlist.cd = "/base"
@@ -595,7 +595,7 @@
 			log_admin("[key_name(usr)] delayed the round start.")
 		else
 			to_chat(world, "<b>The game will start in [newtime] seconds.</b>")
-			world << 'sound/ai/attention.ogg'
+			SEND_SOUND(world, sound('sound/ai/attention.ogg'))
 			log_admin("[key_name(usr)] set the pre-game delay to [newtime] seconds.")
 		SSblackbox.add_details("admin_verb","Delay Game Start") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

@@ -5,7 +5,7 @@
 	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"


-/client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY) )
+/client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS) )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)
@@ -0,0 +1 @@
+garbage
@@ -142,7 +142,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
-			GLOB.world_game_log << "Failed to connect to database in load_admin_ranks(). Reverting to legacy system."
+			WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admin_ranks(). Reverting to legacy system.")
 			config.admin_legacy_system = 1
 			load_admin_ranks()
 			return
@@ -220,7 +220,7 @@ GLOBAL_PROTECT(admin_ranks)
 	else
 		if(!SSdbcore.Connect())
 			log_world("Failed to connect to database in load_admins(). Reverting to legacy system.")
-			GLOB.world_game_log << "Failed to connect to database in load_admins(). Reverting to legacy system."
+			WRITE_FILE(GLOB.world_game_log, "Failed to connect to database in load_admins(). Reverting to legacy system.")
 			config.admin_legacy_system = 1
 			load_admins()
 			return
@@ -390,7 +390,7 @@
 			SSblackbox.add_details("admin_secrets_fun_used","Chinese Cartoons")
 			message_admins("[key_name_admin(usr)] made everything kawaii.")
 			for(var/mob/living/carbon/human/H in GLOB.mob_list)
-				H << sound('sound/ai/animes.ogg')
+				SEND_SOUND(H, sound('sound/ai/animes.ogg'))

 				if(H.dna.species.id == "human")
 					if(H.dna.features["tail_human"] == "None" || H.dna.features["ears"] == "None")
@@ -6,7 +6,7 @@
 		log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
 		return
 	if(href_list["ahelp"])
-		if(!check_rights(R_ADMIN))
+		if(!check_rights(R_ADMIN, TRUE))
 			return

 		var/ahelp_ref = href_list["ahelp"]
@@ -506,10 +506,10 @@
 		ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]</span>")
 		GLOB.Banlist.cd = "/base/[banfolder]"
-		GLOB.Banlist["reason"] << reason
-		GLOB.Banlist["temp"] << temp
-		GLOB.Banlist["minutes"] << minutes
-		GLOB.Banlist["bannedby"] << usr.ckey
+		WRITE_FILE(GLOB.Banlist["reason"], reason)
+		WRITE_FILE(GLOB.Banlist["temp"], temp)
+		WRITE_FILE(GLOB.Banlist["minutes"], minutes)
+		WRITE_FILE(GLOB.Banlist["bannedby"], usr.ckey)
 		GLOB.Banlist.cd = "/base"
 		SSblackbox.inc("ban_edit",1)
 		unbanpanel()
@@ -1697,7 +1697,7 @@
 		message_admins("[key_name(H)] got their cookie, spawned by [key_name(src.owner)].")
 		SSblackbox.inc("admin_cookies_spawned",1)
 		to_chat(H, "<span class='adminnotice'>Your prayers have been answered!! You received the <b>best cookie</b>!</span>")
-		H << 'sound/effects/pray_chaplain.ogg'
+		SEND_SOUND(H, sound('sound/effects/pray_chaplain.ogg'))

 	else if(href_list["adminsmite"])
 		if(!check_rights(R_ADMIN|R_FUN))
@@ -28,7 +28,7 @@
 	if(text)
 		var/F = file("broken_icons.txt")
 		fdel(F)
-		F << text
+		WRITE_FILE(F, text)
 		to_chat(world, "Completely successfully and written to [F]")


@@ -259,7 +259,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	//send this msg to all admins
 	for(var/client/X in GLOB.admins)
 		if(X.prefs.toggles & SOUND_ADMINHELP)
-			X << 'sound/effects/adminhelp.ogg'
+			SEND_SOUND(X, sound('sound/effects/adminhelp.ogg'))
 		window_flash(X, ignorepref = TRUE)
 		to_chat(X, admin_msg)

@@ -347,7 +347,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(initiator)
 		initiator.giveadminhelpverb()

-		initiator << 'sound/effects/adminhelp.ogg'
+		SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))

 		to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
 		to_chat(initiator, "<font color='red'><b>Your admin help was rejected.</b> The adminhelp verb has been returned to you so that you may try again.</font>")
@@ -84,11 +84,11 @@
 	var/list/keys = list()
 	for(var/mob/M in GLOB.player_list)
 		keys += M.client
-	var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
+	var/client/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
 	if(!selection)
 		to_chat(src, "No keys found.")
 		return
-	var/mob/M = selection:mob
+	var/mob/M = selection.mob
 	log_admin("[key_name(usr)] jumped to [key_name(M)]")
 	message_admins("[key_name_admin(usr)] jumped to [key_name_admin(M)]")

@@ -167,7 +167,7 @@

 			//play the recieving admin the adminhelp sound (if they have them enabled)
 			if(recipient.prefs.toggles & SOUND_ADMINHELP)
-				recipient << 'sound/effects/adminhelp.ogg'
+				SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))

 		else
 			if(holder)	//sender is an admin but recipient is not. Do BIG RED TEXT
@@ -182,7 +182,7 @@
 				admin_ticket_log(recipient, "<font color='blue'>PM From [key_name_admin(src)]: [keywordparsedmsg]</font>")

 				//always play non-admin recipients the adminhelp sound
-				recipient << 'sound/effects/adminhelp.ogg'
+				SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg'))

 				//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
 				if(config.popup_admin_pm)
@@ -301,7 +301,7 @@

 	window_flash(C, ignorepref = TRUE)
 	//always play non-admin recipients the adminhelp sound
-	C << 'sound/effects/adminhelp.ogg'
+	SEND_SOUND(C, 'sound/effects/adminhelp.ogg')

 	C.ircreplyamount = IRCREPLYCOUNT

@@ -316,10 +316,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		alert("Wait until the game starts")
 		return
 	if(ishuman(M))
-		log_admin("[key_name(src)] has alienized [M.key].")
-		spawn(0)
-			M:Alienize()
-			SSblackbox.add_details("admin_verb","Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+		INVOKE_ASYNC(M, /mob/living/carbon/human/proc/Alienize)
+		SSblackbox.add_details("admin_verb","Make Alien") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 		log_admin("[key_name(usr)] made [key_name(M)] into an alien.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] made [key_name(M)] into an alien.</span>")
 	else
@@ -333,10 +331,8 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		alert("Wait until the game starts")
 		return
 	if(ishuman(M))
-		log_admin("[key_name(src)] has slimeized [M.key].")
-		spawn(0)
-			M:slimeize()
-			SSblackbox.add_details("admin_verb","Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+		INVOKE_ASYNC(M, /mob/living/carbon/human/proc/slimeize)
+		SSblackbox.add_details("admin_verb","Make Slime") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 		log_admin("[key_name(usr)] made [key_name(M)] into a slime.")
 		message_admins("<span class='adminnotice'>[key_name_admin(usr)] made [key_name(M)] into a slime.</span>")
 	else
@@ -461,12 +457,14 @@ GLOBAL_PROTECT(AdminProcCallCount)

 			if(worn)
 				if(istype(worn, /obj/item/device/pda))
-					worn:id = id
-					id.loc = worn
+					var/obj/item/device/pda/PDA = worn
+					PDA.id = id
+					id.forceMove(PDA)
 				else if(istype(worn, /obj/item/weapon/storage/wallet))
-					worn:front_id = id
-					id.loc = worn
-					worn.update_icon()
+					var/obj/item/weapon/storage/wallet/W = worn
+					W.front_id = id
+					id.forceMove(W)
+					W.update_icon()
 			else
 				H.equip_to_slot(id,slot_wear_id)

@@ -78,8 +78,9 @@
 				continue
 			output += "&nbsp;&nbsp;[filters[filter]]: [f.len]<br>"
 			for (var/device in f)
-				if (isobj(device))
-					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([device:x],[device:y],[device:z] in area [get_area(device:loc)])<br>"
+				if (istype(device, /atom))
+					var/atom/A = device
+					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device] ([A.x],[A.y],[A.z] in area [get_area(device)])<br>"
 				else
 					output += "&nbsp;&nbsp;&nbsp;&nbsp;[device]<br>"

@@ -30,7 +30,7 @@

 	for(var/mob/M in GLOB.player_list)
 		if(M.client.prefs.toggles & SOUND_MIDI)
-			M << admin_sound
+			SEND_SOUND(M, admin_sound)

 	SSblackbox.add_details("admin_verb","Play Global Sound") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

@@ -68,5 +68,5 @@
 	message_admins("[key_name_admin(src)] stopped all currently playing sounds.")
 	for(var/mob/M in GLOB.player_list)
 		if(M.client)
-			M << sound(null)
+			SEND_SOUND(M, sound(null))
 	SSblackbox.add_details("admin_verb","Stop All Playing Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -40,7 +40,7 @@
 			to_chat(C, msg)
 			if(C.prefs.toggles & SOUND_PRAYERS)
 				if(usr.job == "Chaplain")
-					C << 'sound/effects/pray.ogg'
+					SEND_SOUND(C, sound('sound/effects/pray.ogg'))
 	to_chat(usr, "Your prayers have been received by the gods.")

 	SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -44,7 +44,8 @@

 		qdel(src)
 		return
-	if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
+	var/obj/item/weapon/weldingtool/WT = W
+	if((istype(WT) && WT.welding))
 		if(!status)
 			status = TRUE
 			GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
@@ -189,8 +189,9 @@
 #define CONNECTED 2
 #define EMPTY 4
 #define LOW 8
-#define FULL 16
-#define DANGER 32
+#define MEDIUM 16
+#define FULL 32
+#define DANGER 64
 /obj/machinery/portable_atmospherics/canister/update_icon()
 	if(stat & BROKEN)
 		cut_overlays()
@@ -207,9 +208,11 @@
 	var/pressure = air_contents.return_pressure()
 	if(pressure < 10)
 		update |= EMPTY
-	else if(pressure < ONE_ATMOSPHERE)
+	else if(pressure < 5 * ONE_ATMOSPHERE)
 		update |= LOW
-	else if(pressure < 15 * ONE_ATMOSPHERE)
+	else if(pressure < 10 * ONE_ATMOSPHERE)
+		update |= MEDIUM
+	else if(pressure < 40 * ONE_ATMOSPHERE)
 		update |= FULL
 	else
 		update |= DANGER
@@ -222,9 +225,9 @@
 		add_overlay("can-open")
 	if(update & CONNECTED)
 		add_overlay("can-connector")
-	if(update & EMPTY)
+	if(update & LOW)
 		add_overlay("can-o0")
-	else if(update & LOW)
+	else if(update & MEDIUM)
 		add_overlay("can-o1")
 	else if(update & FULL)
 		add_overlay("can-o2")
@@ -234,6 +237,7 @@
 #undef CONNECTED
 #undef EMPTY
 #undef LOW
+#undef MEDIUM
 #undef FULL
 #undef DANGER

@@ -145,7 +145,7 @@

 			var/reason = ""
 			if(requestonly)
-				reason = input("Reason:", name, "") as text|null
+				reason = stripped_input("Reason:", name, "")
 				if(isnull(reason) || ..())
 					return

@@ -0,0 +1,10 @@
+diff a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm	(rejected hunks)
+@@ -145,7 +145,7 @@
+ 
+ 			var/reason = ""
+ 			if(requestonly)
+-				reason = stripped_input("Reason:", name, "") as text|null
+				reason = stripped_input("Reason:", name, "")
+ 				if(isnull(reason) || ..())
+ 					return
+ 
@@ -73,7 +73,7 @@
 			return

 	//Logs all hrefs
-	GLOB.world_href_log << "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
+	WRITE_FILE(GLOB.world_href_log, "<small>[time_stamp(show_ds = TRUE)] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>")

 	// Admin PM
 	if(href_list["priv_msg"])
@@ -226,34 +226,34 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		return 0
 	S.cd = "/"

-	S["version"] << SAVEFILE_VERSION_MAX		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date
+	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX)			//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date

 	//general preferences
-	S["ooccolor"]			<< ooccolor
-	S["lastchangelog"]		<< lastchangelog
-	S["UI_style"]			<< UI_style
-	S["hotkeys"]			<< hotkeys
-	S["tgui_fancy"]			<< tgui_fancy
-	S["tgui_lock"]			<< tgui_lock
-	S["windowflash"]		<< windowflashing
-	S["be_special"]			<< be_special
-	S["default_slot"]		<< default_slot
-	S["toggles"]			<< toggles
-	S["chat_toggles"]		<< chat_toggles
-	S["ghost_form"]			<< ghost_form
-	S["ghost_orbit"]		<< ghost_orbit
-	S["ghost_accs"]			<< ghost_accs
-	S["ghost_others"]		<< ghost_others
-	S["preferred_map"]		<< preferred_map
-	S["ignoring"]			<< ignoring
-	S["ghost_hud"]			<< ghost_hud
-	S["inquisitive_ghost"]	<< inquisitive_ghost
-	S["uses_glasses_colour"]<< uses_glasses_colour
-	S["clientfps"]			<< clientfps
-	S["parallax"]			<< parallax
-	S["menuoptions"]		<< menuoptions
-	S["enable_tips"]		<< enable_tips
-	S["tip_delay"]			<< tip_delay
+	WRITE_FILE(S["ooccolor"], ooccolor)
+	WRITE_FILE(S["lastchangelog"], lastchangelog)
+	WRITE_FILE(S["UI_style"], UI_style)
+	WRITE_FILE(S["hotkeys"], hotkeys)
+	WRITE_FILE(S["tgui_fancy"], tgui_fancy)
+	WRITE_FILE(S["tgui_lock"], tgui_lock)
+	WRITE_FILE(S["windowflash"], windowflashing)
+	WRITE_FILE(S["be_special"], be_special)
+	WRITE_FILE(S["default_slot"], default_slot)
+	WRITE_FILE(S["toggles"], toggles)
+	WRITE_FILE(S["chat_toggles"], chat_toggles)
+	WRITE_FILE(S["ghost_form"], ghost_form)
+	WRITE_FILE(S["ghost_orbit"], ghost_orbit)
+	WRITE_FILE(S["ghost_accs"], ghost_accs)
+	WRITE_FILE(S["ghost_others"], ghost_others)
+	WRITE_FILE(S["preferred_map"], preferred_map)
+	WRITE_FILE(S["ignoring"], ignoring)
+	WRITE_FILE(S["ghost_hud"], ghost_hud)
+	WRITE_FILE(S["inquisitive_ghost"], inquisitive_ghost)
+	WRITE_FILE(S["uses_glasses_colour"], uses_glasses_colour)
+	WRITE_FILE(S["clientfps"], clientfps)
+	WRITE_FILE(S["parallax"], parallax)
+	WRITE_FILE(S["menuoptions"], menuoptions)
+	WRITE_FILE(S["enable_tips"], enable_tips)
+	WRITE_FILE(S["tip_delay"], tip_delay)
 	//citadel code
 	S["arousable"]			<< arousable

@@ -273,7 +273,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	slot = sanitize_integer(slot, 1, max_save_slots, initial(default_slot))
 	if(slot != default_slot)
 		default_slot = slot
-		S["default_slot"] << slot
+		WRITE_FILE(S["default_slot"] , slot)

 	S.cd = "/character[slot]"
 	var/needs_update = savefile_needs_update(S)
@@ -292,7 +292,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 			pref_species = new rando_race()

 	if(!S["features["mcolor"]"] || S["features["mcolor"]"] == "#000")
-		S["features["mcolor"]"]	<< "#FFF"
+		WRITE_FILE(S["features["mcolor"]"]	, "#FFF")

 	//Character
 	S["OOC_Notes"]			>> metadata
@@ -470,53 +470,53 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["version"]			<< SAVEFILE_VERSION_MAX	//load_character will sanitize any bad data, so assume up-to-date.

 	//Character
-	S["OOC_Notes"]			<< metadata
-	S["real_name"]			<< real_name
-	S["name_is_always_random"] << be_random_name
-	S["body_is_always_random"] << be_random_body
-	S["gender"]				<< gender
-	S["age"]				<< age
-	S["hair_color"]			<< hair_color
-	S["facial_hair_color"]	<< facial_hair_color
-	S["eye_color"]			<< eye_color
-	S["skin_tone"]			<< skin_tone
-	S["hair_style_name"]	<< hair_style
-	S["facial_style_name"]	<< facial_hair_style
-	S["underwear"]			<< underwear
-	S["undershirt"]			<< undershirt
-	S["socks"]				<< socks
-	S["backbag"]			<< backbag
-	S["uplink_loc"]			<< uplink_spawn_loc
-	S["species"]			<< pref_species.id
-	S["feature_mcolor"]					<< features["mcolor"]
-	S["feature_lizard_tail"]			<< features["tail_lizard"]
-	S["feature_human_tail"]				<< features["tail_human"]
-	S["feature_lizard_snout"]			<< features["snout"]
-	S["feature_lizard_horns"]			<< features["horns"]
-	S["feature_human_ears"]				<< features["ears"]
-	S["feature_lizard_frills"]			<< features["frills"]
-	S["feature_lizard_spines"]			<< features["spines"]
-	S["feature_lizard_body_markings"]	<< features["body_markings"]
-	S["feature_lizard_legs"]			<< features["legs"]
-	S["clown_name"]			<< custom_names["clown"]
-	S["mime_name"]			<< custom_names["mime"]
-	S["ai_name"]			<< custom_names["ai"]
-	S["cyborg_name"]		<< custom_names["cyborg"]
-	S["religion_name"]		<< custom_names["religion"]
-	S["deity_name"]			<< custom_names["deity"]
-	S["prefered_security_department"] << prefered_security_department
+	WRITE_FILE(S["OOC_Notes"]			, metadata)
+	WRITE_FILE(S["real_name"]			, real_name)
+	WRITE_FILE(S["name_is_always_random"] , be_random_name)
+	WRITE_FILE(S["body_is_always_random"] , be_random_body)
+	WRITE_FILE(S["gender"]				, gender)
+	WRITE_FILE(S["age"]				, age)
+	WRITE_FILE(S["hair_color"]			, hair_color)
+	WRITE_FILE(S["facial_hair_color"]	, facial_hair_color)
+	WRITE_FILE(S["eye_color"]			, eye_color)
+	WRITE_FILE(S["skin_tone"]			, skin_tone)
+	WRITE_FILE(S["hair_style_name"]	, hair_style)
+	WRITE_FILE(S["facial_style_name"]	, facial_hair_style)
+	WRITE_FILE(S["underwear"]			, underwear)
+	WRITE_FILE(S["undershirt"]			, undershirt)
+	WRITE_FILE(S["socks"]				, socks)
+	WRITE_FILE(S["backbag"]			, backbag)
+	WRITE_FILE(S["uplink_loc"]			, uplink_spawn_loc)
+	WRITE_FILE(S["species"]			, pref_species.id)
+	WRITE_FILE(S["feature_mcolor"]					, features["mcolor"])
+	WRITE_FILE(S["feature_lizard_tail"]			, features["tail_lizard"])
+	WRITE_FILE(S["feature_human_tail"]				, features["tail_human"])
+	WRITE_FILE(S["feature_lizard_snout"]			, features["snout"])
+	WRITE_FILE(S["feature_lizard_horns"]			, features["horns"])
+	WRITE_FILE(S["feature_human_ears"]				, features["ears"])
+	WRITE_FILE(S["feature_lizard_frills"]			, features["frills"])
+	WRITE_FILE(S["feature_lizard_spines"]			, features["spines"])
+	WRITE_FILE(S["feature_lizard_body_markings"]	, features["body_markings"])
+	WRITE_FILE(S["feature_lizard_legs"]			, features["legs"])
+	WRITE_FILE(S["clown_name"]			, custom_names["clown"])
+	WRITE_FILE(S["mime_name"]			, custom_names["mime"])
+	WRITE_FILE(S["ai_name"]			, custom_names["ai"])
+	WRITE_FILE(S["cyborg_name"]		, custom_names["cyborg"])
+	WRITE_FILE(S["religion_name"]		, custom_names["religion"])
+	WRITE_FILE(S["deity_name"]			, custom_names["deity"])
+	WRITE_FILE(S["prefered_security_department"] , prefered_security_department)

 	//Jobs
-	S["joblessrole"]		<< joblessrole
-	S["job_civilian_high"]	<< job_civilian_high
-	S["job_civilian_med"]	<< job_civilian_med
-	S["job_civilian_low"]	<< job_civilian_low
-	S["job_medsci_high"]	<< job_medsci_high
-	S["job_medsci_med"]		<< job_medsci_med
-	S["job_medsci_low"]		<< job_medsci_low
-	S["job_engsec_high"]	<< job_engsec_high
-	S["job_engsec_med"]		<< job_engsec_med
-	S["job_engsec_low"]		<< job_engsec_low
+	WRITE_FILE(S["joblessrole"]		, joblessrole)
+	WRITE_FILE(S["job_civilian_high"]	, job_civilian_high)
+	WRITE_FILE(S["job_civilian_med"]	, job_civilian_med)
+	WRITE_FILE(S["job_civilian_low"]	, job_civilian_low)
+	WRITE_FILE(S["job_medsci_high"]	, job_medsci_high)
+	WRITE_FILE(S["job_medsci_med"]		, job_medsci_med)
+	WRITE_FILE(S["job_medsci_low"]		, job_medsci_low)
+	WRITE_FILE(S["job_engsec_high"]	, job_engsec_high)
+	WRITE_FILE(S["job_engsec_med"]		, job_engsec_med)
+	WRITE_FILE(S["job_engsec_low"]		, job_engsec_low)

 	//Citadel
 	S["feature_exhibitionist"]			<< features["exhibitionist"]
@@ -0,0 +1,10 @@
+diff a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm	(rejected hunks)
+@@ -193,7 +193,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
+ 		return 0
+ 	S.cd = "/"
+ 
+-	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date)
+	WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX)		//updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date
+ 
+ 	//general preferences
+ 	WRITE_FILE(S["ooccolor"], ooccolor)
@@ -229,7 +229,7 @@ TOGGLE_CHECKBOX(/datum/verbs/menu/Settings/Sound, toggleprayersounds)()
 	set name = "Stop Sounds"
 	set category = "Preferences"
 	set desc = "Stop Current Sounds"
-	usr << sound(null)
+	SEND_SOUND(usr, sound(null))
 	SSblackbox.add_details("preferences_verb","Stop Self Sounds") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!


@@ -253,6 +253,7 @@ BLIND     // can't see anything
 	slot_flags = SLOT_HEAD
 	var/blockTracking = 0 //For AI tracking
 	var/can_toggle = null
+	dynamic_hair_suffix = "+generic"

 /obj/item/clothing/head/Initialize()
 	. = ..()
@@ -14,6 +14,7 @@
 	name = "collectable slime cap!"
 	desc = "It just latches right in place!"
 	icon_state = "slime"
+	dynamic_hair_suffix = ""

 /obj/item/clothing/head/collectable/xenom
 	name = "collectable xenomorph helmet!"
@@ -25,6 +26,7 @@
 	desc = "A rare chef's hat meant for hat collectors!"
 	icon_state = "chef"
 	item_state = "chef"
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/chef

@@ -53,6 +55,7 @@
 	name = "collectable police officer's hat"
 	desc = "A collectable police officer's Hat. This hat emphasizes that you are THE LAW."
 	icon_state = "policehelm"
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/warden

@@ -95,6 +98,7 @@
 	desc = "The fur feels... a bit too realistic."
 	icon_state = "kitty"
 	item_state = "kitty"
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/kitty

@@ -103,6 +107,7 @@
 	desc = "Not as lucky as the feet!"
 	icon_state = "bunny"
 	item_state = "bunny"
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/rabbit

@@ -125,6 +130,7 @@
 	name = "collectable HoS hat"
 	desc = "Now you too can beat prisoners, set silly sentences, and arrest for no reason!"
 	icon_state = "hoscap"
+	dynamic_hair_suffix = ""

 /obj/item/clothing/head/collectable/HoP
 	name = "collectable HoP hat"
@@ -138,6 +144,7 @@
 	icon_state = "thunderdome"
 	item_state = "thunderdome"
 	resistance_flags = 0
+	flags_inv = HIDEHAIR

 /obj/item/clothing/head/collectable/swat
 	name = "collectable SWAT helmet"
@@ -145,3 +152,4 @@
 	icon_state = "swat"
 	item_state = "swat"
 	resistance_flags = 0
+	flags_inv = HIDEHAIR
@@ -0,0 +1,9 @@
+diff a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm	(rejected hunks)
+@@ -4,7 +4,6 @@
+ /obj/item/clothing/head/collectable
+ 	name = "collectable hat"
+ 	desc = "A rare collectable hat."
+-	dynamic_hair_suffix = "+detective"
+ 
+ 
+ /obj/item/clothing/head/collectable/petehat
@@ -10,6 +10,7 @@
 	flags_inv = 0
 	actions_types = list(/datum/action/item_action/toggle_helmet_light)
 	resistance_flags = FIRE_PROOF
+	dynamic_hair_suffix = "+generic"

 	dog_fashion = /datum/dog_fashion/head

@@ -12,6 +12,7 @@
 	strip_delay = 60
 	resistance_flags = 0
 	flags_cover = HEADCOVERSEYES
+	flags_inv = HIDEHAIR

 	dog_fashion = /datum/dog_fashion/head/helmet

@@ -7,6 +7,7 @@
 	desc = "The commander in chef's head wear."
 	strip_delay = 10
 	equip_delay_other = 10
+	dynamic_hair_suffix = ""
 	dog_fashion = /datum/dog_fashion/head/chef

 /obj/item/clothing/head/chefhat/suicide_act(mob/user)
@@ -62,6 +63,7 @@
 	item_state = "cage"
 	worn_x_dimension = 64
 	worn_y_dimension = 64
+	dynamic_hair_suffix = ""


 /obj/item/clothing/head/witchunter_hat
@@ -99,6 +101,7 @@
 	desc = "A beret, a mime's favorite headwear."
 	icon_state = "beret"
 	dog_fashion = /datum/dog_fashion/head/beret
+	dynamic_hair_suffix = ""

 /obj/item/clothing/head/beret/black
 	name = "black beret"
@@ -118,6 +121,7 @@
 	icon_state = "hoscap"
 	armor = list(melee = 40, bullet = 30, laser = 25, energy = 10, bomb = 25, bio = 10, rad = 0, fire = 50, acid = 60)
 	strip_delay = 80
+	dynamic_hair_suffix = ""

 /obj/item/clothing/head/HoS/syndicate
 	name = "syndicate cap"
@@ -1,287 +1,290 @@
-
-
-/obj/item/clothing/head/centhat
-	name = "\improper CentCom hat"
-	icon_state = "centcom"
-	desc = "It's good to be emperor."
-	item_state = "that"
-	flags_inv = 0
-	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
-	strip_delay = 80
-
-/obj/item/clothing/head/powdered_wig
-	name = "powdered wig"
-	desc = "A powdered wig."
-	icon_state = "pwig"
-	item_state = "pwig"
-
-/obj/item/clothing/head/that
-	name = "top-hat"
-	desc = "It's an amish looking hat."
-	icon_state = "tophat"
-	item_state = "that"
-	dog_fashion = /datum/dog_fashion/head
-	throwforce = 1
-
-/obj/item/clothing/head/canada
-	name = "striped red tophat"
-	desc = "it smells like fresh donut holes / <i>il sent comme des trous de beignets frais</i>"
-	icon_state = "canada"
-	item_state = "canada"
-
-/obj/item/clothing/head/redcoat
-	name = "redcoat's hat"
-	icon_state = "redcoat"
-	desc = "<i>'I guess it's a redhead.'</i>"
-
-/obj/item/clothing/head/mailman
-	name = "mailman's hat"
-	icon_state = "mailman"
-	desc = "<i>'Right-on-time'</i> mail service head wear."
-
-/obj/item/clothing/head/plaguedoctorhat
-	name = "plague doctor's hat"
-	desc = "These were once used by plague doctors. They're pretty much useless."
-	icon_state = "plaguedoctor"
-	permeability_coefficient = 0.01
-
-/obj/item/clothing/head/hasturhood
-	name = "hastur's hood"
-	desc = "It's <i>unspeakably</i> stylish."
-	icon_state = "hasturhood"
-	flags_inv = HIDEHAIR
-	flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/nursehat
-	name = "nurse's hat"
-	desc = "It allows quick identification of trained medical personnel."
-	icon_state = "nursehat"
-
-	dog_fashion = /datum/dog_fashion/head/nurse
-
-/obj/item/clothing/head/syndicatefake
-	name = "black space-helmet replica"
-	icon_state = "syndicate-helm-black-red"
-	item_state = "syndicate-helm-black-red"
-	desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/cueball
-	name = "cueball helmet"
-	desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
-	icon_state = "cueball"
-	item_state="cueball"
-	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/snowman
-	name = "Snowman Head"
-	desc = "A ball of white styrofoam. So festive."
-	icon_state = "snowman_h"
-	item_state = "snowman_h"
-	flags_cover = HEADCOVERSEYES
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/justice
-	name = "justice hat"
-	desc = "Fight for what's righteous!"
-	icon_state = "justicered"
-	item_state = "justicered"
-	flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
-	flags_cover = HEADCOVERSEYES
-
-/obj/item/clothing/head/justice/blue
-	icon_state = "justiceblue"
-	item_state = "justiceblue"
-
-/obj/item/clothing/head/justice/yellow
-	icon_state = "justiceyellow"
-	item_state = "justiceyellow"
-
-/obj/item/clothing/head/justice/green
-	icon_state = "justicegreen"
-	item_state = "justicegreen"
-
-/obj/item/clothing/head/justice/pink
-	icon_state = "justicepink"
-	item_state = "justicepink"
-
-/obj/item/clothing/head/rabbitears
-	name = "rabbit ears"
-	desc = "Wearing these makes you look useless, and only good for your sex appeal."
-	icon_state = "bunny"
-
-	dog_fashion = /datum/dog_fashion/head/rabbit
-
-
-/obj/item/clothing/head/flatcap
-	name = "flat cap"
-	desc = "A working man's cap."
-	icon_state = "flat_cap"
-	item_state = "detective"
-
-/obj/item/clothing/head/pirate
-	name = "pirate hat"
-	desc = "Yarr."
-	icon_state = "pirate"
-	item_state = "pirate"
-	dog_fashion = /datum/dog_fashion/head/pirate
-
-/obj/item/clothing/head/pirate/captain
-	icon_state = "hgpiratecap"
-	item_state = "hgpiratecap"
-
-/obj/item/clothing/head/bandana
-	name = "pirate bandana"
-	desc = "Yarr."
-	icon_state = "bandana"
-	item_state = "bandana"
-
-/obj/item/clothing/head/bowler
-	name = "bowler-hat"
-	desc = "Gentleman, elite aboard!"
-	icon_state = "bowler"
-	item_state = "bowler"
-
-/obj/item/clothing/head/witchwig
-	name = "witch costume wig"
-	desc = "Eeeee~heheheheheheh!"
-	icon_state = "witch"
-	item_state = "witch"
-	flags_inv = HIDEHAIR
-
-/obj/item/clothing/head/chicken
-	name = "chicken suit head"
-	desc = "Bkaw!"
-	icon_state = "chickenhead"
-	item_state = "chickensuit"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/griffin
-	name = "griffon head"
-	desc = "Why not 'eagle head'? Who knows."
-	icon_state = "griffinhat"
-	item_state = "griffinhat"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/bearpelt
-	name = "bear pelt hat"
-	desc = "Fuzzy."
-	icon_state = "bearpelt"
-	item_state = "bearpelt"
-
-/obj/item/clothing/head/xenos
-	name = "xenos helmet"
-	icon_state = "xenos"
-	item_state = "xenos_helm"
-	desc = "A helmet made out of chitinous alien hide."
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-
-/obj/item/clothing/head/fedora
-	name = "fedora"
-	icon_state = "fedora"
-	item_state = "fedora"
-	armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50)
-	desc = "A really cool hat if you're a mobster. A really lame hat if you're not."
-	dynamic_hair_suffix = "+detective"
-	pockets = /obj/item/weapon/storage/internal/pocket/small
-
-/obj/item/clothing/head/fedora/suicide_act(mob/user)
-	if(user.gender == FEMALE)
-		return 0
-	var/mob/living/carbon/human/H = user
-	user.visible_message("<span class='suicide'>[user] is donning [src]! It looks like they're trying to be nice to girls.</span>")
-	user.say("M'lady.")
-	sleep(10)
-	H.facial_hair_style = "Neckbeard"
-	return(BRUTELOSS)
-
-/obj/item/clothing/head/sombrero
-	name = "sombrero"
-	icon_state = "sombrero"
-	item_state = "sombrero"
-	desc = "You can practically taste the fiesta."
-	flags_inv = HIDEHAIR
-
-	dog_fashion = /datum/dog_fashion/head/sombrero
-
-/obj/item/clothing/head/sombrero/green
-	name = "green sombrero"
-	icon_state = "greensombrero"
-	item_state = "greensombrero"
-	desc = "As elegant as a dancing cactus."
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
-	dog_fashion = null
-
-/obj/item/clothing/head/sombrero/shamebrero
-	name = "shamebrero"
-	icon_state = "shamebrero"
-	item_state = "shamebrero"
-	desc = "Once it's on, it never comes off."
-	flags = NODROP
-	dog_fashion = null
-
-/obj/item/clothing/head/cone
-	desc = "This cone is trying to warn you of something!"
-	name = "warning cone"
-	icon = 'icons/obj/janitor.dmi'
-	icon_state = "cone"
-	item_state = "cone"
-	force = 1
-	throwforce = 3
-	throw_speed = 2
-	throw_range = 5
-	w_class = WEIGHT_CLASS_SMALL
-	attack_verb = list("warned", "cautioned", "smashed")
-	resistance_flags = 0
-
-/obj/item/clothing/head/santa
-	name = "santa hat"
-	desc = "On the first day of christmas my employer gave to me!"
-	icon_state = "santahatnorm"
-	item_state = "that"
-	cold_protection = HEAD
-	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
-	dog_fashion = /datum/dog_fashion/head/santa
-
-/obj/item/clothing/head/jester
-	name = "jester hat"
+/obj/item/clothing/head/centhat
+	name = "\improper Centcom hat"
+	icon_state = "centcom"
+	desc = "It's good to be emperor."
+	item_state = "that"
+	flags_inv = 0
+	armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
+	strip_delay = 80
+
+/obj/item/clothing/head/powdered_wig
+	name = "powdered wig"
+	desc = "A powdered wig."
+	icon_state = "pwig"
+	item_state = "pwig"
+
+/obj/item/clothing/head/that
+	name = "top-hat"
+	desc = "It's an amish looking hat."
+	icon_state = "tophat"
+	item_state = "that"
+	dog_fashion = /datum/dog_fashion/head
+	throwforce = 1
+
+/obj/item/clothing/head/canada
+	name = "striped red tophat"
+	desc = "it smells like fresh donut holes / <i>il sent comme des trous de beignets frais</i>"
+	icon_state = "canada"
+	item_state = "canada"
+
+/obj/item/clothing/head/redcoat
+	name = "redcoat's hat"
+	icon_state = "redcoat"
+	desc = "<i>'I guess it's a redhead.'</i>"
+
+/obj/item/clothing/head/mailman
+	name = "mailman's hat"
+	icon_state = "mailman"
+	desc = "<i>'Right-on-time'</i> mail service head wear."
+
+/obj/item/clothing/head/plaguedoctorhat
+	name = "plague doctor's hat"
+	desc = "These were once used by plague doctors. They're pretty much useless."
+	icon_state = "plaguedoctor"
+	permeability_coefficient = 0.01
+
+/obj/item/clothing/head/hasturhood
+	name = "hastur's hood"
+	desc = "It's <i>unspeakably</i> stylish."
+	icon_state = "hasturhood"
+	flags_inv = HIDEHAIR
+	flags_cover = HEADCOVERSEYES
+
+/obj/item/clothing/head/nursehat
+	name = "nurse's hat"
+	desc = "It allows quick identification of trained medical personnel."
+	icon_state = "nursehat"
+	dynamic_hair_suffix = ""
+
+	dog_fashion = /datum/dog_fashion/head/nurse
+
+/obj/item/clothing/head/syndicatefake
+	name = "black space-helmet replica"
+	icon_state = "syndicate-helm-black-red"
+	item_state = "syndicate-helm-black-red"
+	desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/cueball
+	name = "cueball helmet"
+	desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?"
+	icon_state = "cueball"
+	item_state="cueball"
+	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/snowman
+	name = "Snowman Head"
+	desc = "A ball of white styrofoam. So festive."
+	icon_state = "snowman_h"
+	item_state = "snowman_h"
+	flags_cover = HEADCOVERSEYES
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/justice
+	name = "justice hat"
+	desc = "Fight for what's righteous!"
+	icon_state = "justicered"
+	item_state = "justicered"
+	flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
+	flags_cover = HEADCOVERSEYES
+
+/obj/item/clothing/head/justice/blue
+	icon_state = "justiceblue"
+	item_state = "justiceblue"
+
+/obj/item/clothing/head/justice/yellow
+	icon_state = "justiceyellow"
+	item_state = "justiceyellow"
+
+/obj/item/clothing/head/justice/green
+	icon_state = "justicegreen"
+	item_state = "justicegreen"
+
+/obj/item/clothing/head/justice/pink
+	icon_state = "justicepink"
+	item_state = "justicepink"
+
+/obj/item/clothing/head/rabbitears
+	name = "rabbit ears"
+	desc = "Wearing these makes you look useless, and only good for your sex appeal."
+	icon_state = "bunny"
+	dynamic_hair_suffix = ""
+
+	dog_fashion = /datum/dog_fashion/head/rabbit
+
+
+/obj/item/clothing/head/flatcap
+	name = "flat cap"
+	desc = "A working man's cap."
+	icon_state = "flat_cap"
+	item_state = "detective"
+
+/obj/item/clothing/head/pirate
+	name = "pirate hat"
+	desc = "Yarr."
+	icon_state = "pirate"
+	item_state = "pirate"
+	dog_fashion = /datum/dog_fashion/head/pirate
+
+/obj/item/clothing/head/pirate/captain
+	icon_state = "hgpiratecap"
+	item_state = "hgpiratecap"
+
+/obj/item/clothing/head/bandana
+	name = "pirate bandana"
+	desc = "Yarr."
+	icon_state = "bandana"
+	item_state = "bandana"
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/bowler
+	name = "bowler-hat"
+	desc = "Gentleman, elite aboard!"
+	icon_state = "bowler"
+	item_state = "bowler"
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/witchwig
+	name = "witch costume wig"
+	desc = "Eeeee~heheheheheheh!"
+	icon_state = "witch"
+	item_state = "witch"
+	flags_inv = HIDEHAIR
+
+/obj/item/clothing/head/chicken
+	name = "chicken suit head"
+	desc = "Bkaw!"
+	icon_state = "chickenhead"
+	item_state = "chickensuit"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/griffin
+	name = "griffon head"
+	desc = "Why not 'eagle head'? Who knows."
+	icon_state = "griffinhat"
+	item_state = "griffinhat"
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/bearpelt
+	name = "bear pelt hat"
+	desc = "Fuzzy."
+	icon_state = "bearpelt"
+	item_state = "bearpelt"
+
+/obj/item/clothing/head/xenos
+	name = "xenos helmet"
+	icon_state = "xenos"
+	item_state = "xenos_helm"
+	desc = "A helmet made out of chitinous alien hide."
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+
+/obj/item/clothing/head/fedora
+	name = "fedora"
+	icon_state = "fedora"
+	item_state = "fedora"
+	armor = list(melee = 25, bullet = 5, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 30, acid = 50)
+	desc = "A really cool hat if you're a mobster. A really lame hat if you're not."
+	pockets = /obj/item/weapon/storage/internal/pocket/small
+
+/obj/item/clothing/head/fedora/suicide_act(mob/user)
+	if(user.gender == FEMALE)
+		return 0
+	var/mob/living/carbon/human/H = user
+	user.visible_message("<span class='suicide'>[user] is donning [src]! It looks like they're trying to be nice to girls.</span>")
+	user.say("M'lady.")
+	sleep(10)
+	H.facial_hair_style = "Neckbeard"
+	return(BRUTELOSS)
+
+/obj/item/clothing/head/sombrero
+	name = "sombrero"
+	icon_state = "sombrero"
+	item_state = "sombrero"
+	desc = "You can practically taste the fiesta."
+	flags_inv = HIDEHAIR
+
+	dog_fashion = /datum/dog_fashion/head/sombrero
+
+/obj/item/clothing/head/sombrero/green
+	name = "green sombrero"
+	icon_state = "greensombrero"
+	item_state = "greensombrero"
+	desc = "As elegant as a dancing cactus."
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+	dog_fashion = null
+
+/obj/item/clothing/head/sombrero/shamebrero
+	name = "shamebrero"
+	icon_state = "shamebrero"
+	item_state = "shamebrero"
+	desc = "Once it's on, it never comes off."
+	flags = NODROP
+	dog_fashion = null
+
+/obj/item/clothing/head/cone
+	desc = "This cone is trying to warn you of something!"
+	name = "warning cone"
+	icon = 'icons/obj/janitor.dmi'
+	icon_state = "cone"
+	item_state = "cone"
+	force = 1
+	throwforce = 3
+	throw_speed = 2
+	throw_range = 5
+	w_class = WEIGHT_CLASS_SMALL
+	attack_verb = list("warned", "cautioned", "smashed")
+	resistance_flags = 0
+
+/obj/item/clothing/head/santa
+	name = "santa hat"
+	desc = "On the first day of christmas my employer gave to me!"
+	icon_state = "santahatnorm"
+	item_state = "that"
+	cold_protection = HEAD
+	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	dog_fashion = /datum/dog_fashion/head/santa
+
+/obj/item/clothing/head/jester
+	name = "jester hat"
 	desc = "A hat with bells, to add some merriness to the suit."
-	icon_state = "jester_hat"
-
-/obj/item/clothing/head/rice_hat
-	name = "rice hat"
-	desc = "Welcome to the rice fields, motherfucker."
-	icon_state = "rice_hat"
-
-/obj/item/clothing/head/lizard
-	name = "lizardskin cloche hat"
-	desc = "How many lizards died to make this hat? Not enough."
-	icon_state = "lizard"
-
-/obj/item/clothing/head/papersack
-	name = "paper sack hat"
-	desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
-	icon_state = "papersack"
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
-
-/obj/item/clothing/head/papersack/smiley
-	name = "paper sack hat"
-	desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
-	icon_state = "papersack_smile"
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
-
-/obj/item/clothing/head/crown
-	name = "crown"
-	desc = "A crown fit for a king, a petty king maybe."
-	icon_state = "crown"
-	armor = list(melee = 15, bullet = 0, laser = 0,energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
-	resistance_flags = FIRE_PROOF
-
-/obj/item/clothing/head/crown/fancy
-	name = "magnificent crown"
-	desc = "A crown worn by only the highest emperors of the land."
-	icon_state = "fancycrown"
+	icon_state = "jester_hat"
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/rice_hat
+	name = "rice hat"
+	desc = "Welcome to the rice fields, motherfucker."
+	icon_state = "rice_hat"
+
+/obj/item/clothing/head/lizard
+	name = "lizardskin cloche hat"
+	desc = "How many lizards died to make this hat? Not enough."
+	icon_state = "lizard"
+
+/obj/item/clothing/head/papersack
+	name = "paper sack hat"
+	desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
+	icon_state = "papersack"
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+
+/obj/item/clothing/head/papersack/smiley
+	name = "paper sack hat"
+	desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
+	icon_state = "papersack_smile"
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+
+/obj/item/clothing/head/crown
+	name = "crown"
+	desc = "A crown fit for a king, a petty king maybe."
+	icon_state = "crown"
+	armor = list(melee = 15, bullet = 0, laser = 0,energy = 15, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
+	resistance_flags = FIRE_PROOF
+	dynamic_hair_suffix = ""
+
+/obj/item/clothing/head/crown/fancy
+	name = "magnificent crown"
+	desc = "A crown worn by only the highest emperors of the land."
+	icon_state = "fancycrown"

 /obj/item/clothing/head/scarecrow_hat
 	name = "scarecrow hat"
@@ -297,4 +300,5 @@
 /obj/item/clothing/head/jester/alt
 	name = "jester hat"
 	desc = "A hat with bells, to add some merriness to the suit."
-	icon_state = "jester_hat2"
+	icon_state = "jester_hat2"
+	dynamic_hair_suffix = ""
@@ -0,0 +1,16 @@
+diff a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm	(rejected hunks)
+@@ -250,7 +250,7 @@
+ 	name = "jester hat"
+ 	desc = "A hat with bells, to add some merriness to the suit."
+ 	icon_state = "jester_hat"
+-	dynamic_hair_suffix = "null"
+	dynamic_hair_suffix = ""
+ 
+ /obj/item/clothing/head/rice_hat
+ 	name = "rice hat"
+@@ -302,4 +302,4 @@
+ 	name = "jester hat"
+ 	desc = "A hat with bells, to add some merriness to the suit."
+ 	icon_state = "jester_hat2"
+-	dynamic_hair_suffix = "null"
+	dynamic_hair_suffix = ""
@@ -125,6 +125,7 @@
 	desc = "A pair of kitty ears. Meow!"
 	icon_state = "kitty"
 	color = "#999999"
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/kitty

@@ -150,6 +151,7 @@
 	flags_inv = 0
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
 	brightness_on = 1 //luminosity when on
+	dynamic_hair_suffix = ""

 	dog_fashion = /datum/dog_fashion/head/reindeer

@@ -338,7 +338,7 @@
 	name = "Death Commando"

 	uniform = /obj/item/clothing/under/color/green
-	suit = /obj/item/clothing/suit/space/hardsuit/shielded/swat
+	suit = /obj/item/clothing/suit/space/hardsuit/deathsquad
 	shoes = /obj/item/clothing/shoes/combat/swat
 	gloves = /obj/item/clothing/gloves/combat
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -200,7 +200,7 @@
 	item_color = "mining"
 	max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF
-	heat_protection = CHEST|GROIN|LEGS|ARMS
+	heat_protection = HEAD
 	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 75)
 	brightness_on = 7
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/weapon/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/weapon/gun/energy/kinetic_accelerator)
@@ -216,6 +216,7 @@
 	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50, fire = 50, acid = 75)
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/weapon/storage/bag/ore, /obj/item/weapon/pickaxe)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
+	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS

 	//Syndicate hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi
@@ -17,19 +17,16 @@
 	if(M.wear_suit)
 		fibertext = "Material from \a [M.wear_suit]."
 		if(prob(10*item_multiplier) && !(fibertext in suit_fibers))
-			//world.log << "Added fibertext: [fibertext]"
 			suit_fibers += fibertext
 		if(!(M.wear_suit.body_parts_covered & CHEST))
 			if(M.w_uniform)
 				fibertext = "Fibers from \a [M.w_uniform]."
 				if(prob(12*item_multiplier) && !(fibertext in suit_fibers)) //Wearing a suit means less of the uniform exposed.
-					//world.log << "Added fibertext: [fibertext]"
 					suit_fibers += fibertext
 		if(!(M.wear_suit.body_parts_covered & HANDS))
 			if(M.gloves)
 				fibertext = "Material from a pair of [M.gloves.name]."
 				if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
-					//world.log << "Added fibertext: [fibertext]"
 					suit_fibers += fibertext
 	else if(M.w_uniform)
 		fibertext = "Fibers from \a [M.w_uniform]."
@@ -39,12 +36,10 @@
 		if(M.gloves)
 			fibertext = "Material from a pair of [M.gloves.name]."
 			if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
-				//world.log << "Added fibertext: [fibertext]"
 				suit_fibers += "Material from a pair of [M.gloves.name]."
 	else if(M.gloves)
 		fibertext = "Material from a pair of [M.gloves.name]."
 		if(prob(20*item_multiplier) && !(fibertext in suit_fibers))
-			//world.log << "Added fibertext: [fibertext]"
 			suit_fibers += "Material from a pair of [M.gloves.name]."


@@ -55,7 +55,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 			var/skipcount = abs(error_cooldown[erroruid]) - 1
 			error_cooldown[erroruid] = 0
 			if(skipcount > 0)
-				world.log << "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line]."
+				SEND_TEXT(world.log, "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].")
 				GLOB.error_cache.log_error(E, skip_count = skipcount)

 	error_last_seen[erroruid] = world.time
@@ -92,9 +92,9 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(GLOB.error_cache)
 		GLOB.error_cache.log_error(E, desclines)

-	world.log << "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]"
+	SEND_TEXT(world.log, "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]")
 	for(var/line in desclines)
-		world.log << line
+		SEND_TEXT(world.log, line)

 /* This logs the runtime in the old format */

@@ -70,7 +70,7 @@
 		if(!H.client || !istype(H))
 			return
 		to_chat(H, "<span class='danger'>Honk...</span>")
-		H << 'sound/spookoween/scary_clown_appear.ogg'
+		SEND_SOUND(H, sound('sound/spookoween/scary_clown_appear.ogg'))
 		var/turf/T = get_turf(H)
 		if(T)
 			new /obj/effect/hallucination/simple/clown(T, H, 50)
@@ -68,11 +68,11 @@

 /datum/round_event/portal_storm/announce()
 	set waitfor = 0
-	playsound_global('sound/magic/lightning_chargeup.ogg', repeat=0, channel=1, volume=100)
+	sound_to_playing_players('sound/magic/lightning_chargeup.ogg')
 	sleep(80)
 	priority_announce("Massive bluespace anomaly detected en route to [station_name()]. Brace for impact.")
 	sleep(20)
-	playsound_global('sound/magic/lightningbolt.ogg', repeat=0, channel=1, volume=100)
+	sound_to_playing_players('sound/magic/lightningbolt.ogg')

 /datum/round_event/portal_storm/tick()
 	spawn_effects()
@@ -6,6 +6,5 @@
 	earliest_start = 0

 /datum/round_event/wizard/fake_explosion/start()
-	for(var/mob/M in GLOB.player_list)
-		M << 'sound/machines/alarm.ogg'
+	sound_to_playing_players('sound/machines/alarm.ogg')
 	addtimer(CALLBACK(SSticker, /datum/controller/subsystem/ticker/.proc/station_explosion_cinematic, 1, "fake"), 100) //:o)
@@ -55,4 +55,4 @@

 		I.log_message("<font color='red'>Is an imposter!</font>", INDIVIDUAL_ATTACK_LOG)
 		to_chat(I, "<B>You are an imposter! Trick and confuse the crew to misdirect malice from your handsome original!</B>")
-		I << sound('sound/effects/magic.ogg')
+		SEND_SOUND(I, sound('sound/effects/magic.ogg'))
@@ -165,7 +165,57 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic
 	log_world("\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: [(src.owner.key ? src.owner.key : src.owner)] triggered JS error: [error]")

 //Global chat procs
+//Converts an icon to base64. Operates by putting the icon in the iconCache savefile,
+// exporting it as text, and then parsing the base64 from that.
+// (This relies on byond automatically storing icons in savefiles as base64)
+/proc/icon2base64(icon/icon, iconKey = "misc")
+	if (!isicon(icon))
+		return FALSE
+	WRITE_FILE(GLOB.iconCache[iconKey], icon)
+	var/iconData = GLOB.iconCache.ExportText(iconKey)
+	var/list/partial = splittext(iconData, "{")
+	return replacetext(copytext(partial[2], 3, -5), "\n", "")

+/proc/bicon(thing)
+	if (!thing)
+		return
+	var/static/list/bicon_cache = list()
+	if (isicon(thing))
+		var/icon/I = thing
+		var/icon_md5 = md5(I)
+		if (!bicon_cache[icon_md5]) // Doesn't exist yet, make it.
+			I = icon(I) //copy it
+			I.Scale(16,16) //scale it
+			bicon_cache[icon_md5] = icon2base64(thing) //base64 it
+		return "<img class='icon misc' src='data:image/png;base64,[bicon_cache[icon_md5]]'>"
+
+	// Either an atom or somebody fucked up and is gonna get a runtime, which I'm fine with.
+	var/atom/A = thing
+	var/key = "[istype(A.icon, /icon) ? "\ref[A.icon]" : A.icon]:[A.icon_state]"
+
+
+	if (!bicon_cache[key]) // Doesn't exist, make it.
+		var/icon/I = icon(A.icon, A.icon_state, SOUTH, 1)
+		I.Scale(16,16)
+		if (ishuman(thing)) // Shitty workaround for a BYOND issue.
+			var/icon/temp = I
+			I = icon()
+			I.Insert(temp, dir = SOUTH)
+		bicon_cache[key] = icon2base64(I, key)
+
+	return "<img class='icon [A.icon_state]' src='data:image/png;base64,[bicon_cache[key]]'>"
+
+//Costlier version of bicon() that uses getFlatIcon() to account for overlays, underlays, etc. Use with extreme moderation, ESPECIALLY on mobs.
+/proc/costly_bicon(thing)
+	if (!thing)
+		return
+
+	if (isicon(thing))
+		return bicon(thing)
+
+	var/icon/I = getFlatIcon(thing)
+	return bicon(I)
+  
 /proc/to_chat(target, message)
 	if(!target)
 		return
@@ -32,7 +32,7 @@
 		CRASH("Debug Error Handling encountered an error! This is highly ironic! File: '[fileName]' has exceeded the filesize limit of: [src.logFileLimit] bytes")

 	message = "\[[time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")]\] Client: \[[C && C.key ? C.key : "Unknown Client"]\] triggered: [message]"
-	logFile << message
+	WRITE_FILE(logFile, message)
 	return 1

 /datum/debugFileOutput/proc/clear(fileName)
@@ -71,21 +71,21 @@
 	name = "ghost chili"
 	desc = "It seems to be vibrating gently."
 	icon_state = "ghostchilipepper"
-	var/mob/held_mob
+	var/mob/living/carbon/human/held_mob
 	filling_color = "#F8F8FF"
 	bitesize_mod = 4
 	origin_tech = "biotech=4;magnets=5"

 /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user)
 	..()
-	if( ismob(src.loc) )
-		held_mob = src.loc
+	if( ismob(loc) )
+		held_mob = loc
 		START_PROCESSING(SSobj, src)

 /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/process()
-	if(held_mob && src.loc == held_mob)
+	if(held_mob && loc == held_mob)
 		if(held_mob.is_holding(src))
-			if(hasvar(held_mob,"gloves") && held_mob:gloves)
+			if(istype(held_mob) && held_mob.gloves)
 				return
 			held_mob.bodytemperature += 15 * TEMPERATURE_DAMAGE_COEFFICIENT
 			if(prob(10))
@@ -284,7 +284,7 @@
 		L.adjustBruteLoss(bonus_value)

 /obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user)
-	if(!target.anchored || ismegafauna(target)) //megafauna will always be pushed
+	if(!QDELETED(target) && !QDELETED(user) && (!target.anchored || ismegafauna(target))) //megafauna will always be pushed
 		step(target, get_dir(user, target))

 //bubblegum
@@ -464,7 +464,6 @@
 /datum/sprite_accessory/mam_tails/rabbit
 	name = "Rabbit"
 	icon_state = "rabbit"
-	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'

 /datum/sprite_accessory/mam_ears/rabbit
@@ -595,6 +594,13 @@
 	extra2 = 1
 	icon = 'icons/mob/mam_body_markings.dmi'

+	/datum/sprite_accessory/mam_body_markings/xeno
+	name = "Xeno"
+	icon_state = "xeno"
+	color_src = MUTCOLORS2
+	extra_color_src = MUTCOLORS3
+	gender_specific = 1
+
 /******************************************
 ************ Taur Bodies ******************
 *******************************************/
@@ -673,49 +679,67 @@

 //Xeno Dorsal Tubes
 /datum/sprite_accessory/xeno_dorsal
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 /datum/sprite_accessory/xeno_dorsal/none
 	name = "None"

-/datum/sprite_accessory/xeno_dorsal/normal
-	name = "Dorsal Tubes"
-	icon_state = "dortubes"
+/datum/sprite_accessory/xeno_dorsal/standard
+	name = "Standard"
+	icon_state = "standard"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_dorsal/royal
+	name = "Royal"
+	icon_state = "royal"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_dorsal/down
+	name = "Dorsal Down"
+	icon_state = "down"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 //Xeno Tail
 /datum/sprite_accessory/xeno_tail
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 /datum/sprite_accessory/xeno_tail/none
 	name = "None"

-/datum/sprite_accessory/xeno_tail/normal
+/datum/sprite_accessory/xeno_tail/standard
 	name = "Xenomorph Tail"
 	icon_state = "xeno"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 //Xeno Caste Heads
 //unused as of October 3, 2016
 /datum/sprite_accessory/xeno_head
-	icon = 'icons/mob/exotic_bodyparts.dmi'
-	color_src = 0
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

 /datum/sprite_accessory/xeno_head/none
 	name = "None"

+/datum/sprite_accessory/xeno_head/standard
+	name = "Standard"
+	icon_state = "standard"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

-/datum/sprite_accessory/xeno_head/hunter
-	name = "Hunter"
-	icon_state = "hunter"

-/datum/sprite_accessory/xeno_head/drone
-	name = "Drone"
-	icon_state = "drone"
+/datum/sprite_accessory/xeno_head/royal
+	name = "royal"
+	icon_state = "royal"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_head/hollywood
+	name = "hollywood"
+	icon_state = "hollywood"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'
+
+/datum/sprite_accessory/xeno_head/warrior
+	name = "warrior"
+	icon_state = "warrior"
+	icon = 'icons/mob/xeno_parts_greyscale.dmi'

-/datum/sprite_accessory/xeno_head/sentinel
-	name = "Sentinel"
-	icon_state = "sentinel"
 /*
 //Slimecoon Parts
 /datum/sprite_accessory/slimecoon_ears
@@ -351,7 +351,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 				source.plane = old_plane
 	to_chat(src, "<span class='ghostalert'><a href=?src=\ref[src];reenter=1>(Click to re-enter)</a></span>")
 	if(sound)
-		src << sound(sound)
+		SEND_SOUND(src, sound(sound))

 /mob/dead/observer/proc/dead_tele()
 	set category = "Ghost"
@@ -87,7 +87,7 @@
 	var/atom/xeno_loc = get_turf(owner)
 	var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc)
 	new_xeno.key = ghost.key
-	new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100)	//To get the player's attention
+	SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))	//To get the player's attention
 	new_xeno.canmove = 0 //so we don't move during the bursting animation
 	new_xeno.notransform = 1
 	new_xeno.invisibility = INVISIBILITY_MAXIMUM
@@ -51,9 +51,10 @@

 	var/obj/item/item_in_hand = src.get_active_held_item()
 	if(item_in_hand) //this segment checks if the item in your hand is twohanded.
-		if(istype(item_in_hand, /obj/item/weapon/twohanded))
-			if(item_in_hand:wielded == 1)
-				to_chat(usr, "<span class='warning'>Your other hand is too busy holding the [item_in_hand.name]</span>")
+		var/obj/item/weapon/twohanded/TH = item_in_hand
+		if(istype(TH))
+			if(TH.wielded == 1)
+				to_chat(usr, "<span class='warning'>Your other hand is too busy holding [TH]</span>")
 				return
 	var/oindex = active_hand_index
 	active_hand_index = held_index
@@ -240,6 +241,12 @@
 /mob/living/carbon/is_muzzled()
 	return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))

+/mob/living/carbon/hallucinating()
+	if(hallucination)
+		return TRUE
+	else
+		return FALSE
+
 /mob/living/carbon/resist_buckle()
 	if(restrained())
 		changeNext_move(CLICK_CD_BREAKOUT)
@@ -812,3 +819,4 @@
 	.["Make AI"] = "?_src_=vars;makeai=\ref[src]"
 	.["Modify bodypart"] = "?_src_=vars;editbodypart=\ref[src]"
 	.["Modify organs"] = "?_src_=vars;editorgans=\ref[src]"
+	.["Hallucinate"] = "?_src_=vars;hallucinate=\ref[src]"
@@ -337,7 +337,7 @@
 					// you need earmuffs, inacusiate, or replacement
 			else if(ears.ear_damage >= 5)
 				to_chat(src, "<span class='warning'>Your ears start to ring!</span>")
-			src << sound('sound/weapons/flash_ring.ogg',0,1,0,250)
+			SEND_SOUND(src, sound('sound/weapons/flash_ring.ogg',0,1,0,250))
 		return effect_amount //how soundbanged we are


@@ -143,7 +143,7 @@
 	var/protection = (prot["head"] + prot["arms"] + prot["feet"] + prot["legs"] + prot["groin"] + prot["chest"] + prot["hands"])/7
 	return protection

-/mob/living/carbon/human/can_use_guns(var/obj/item/weapon/gun/G)
+/mob/living/carbon/human/can_use_guns(var/obj/item/weapon/G)
 	. = ..()

 	if(G.trigger_guard == TRIGGER_GUARD_NORMAL)
@@ -97,7 +97,7 @@
 	if(voice_saved)
 		return
 	var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
-	S["knownStrings"] << knownStrings
+	WRITE_FILE(S["knownStrings"], knownStrings)

 //botPool funcs
 /mob/living/carbon/human/interactive/proc/takeDelegate(mob/living/carbon/human/interactive/from,doReset=TRUE)
@@ -79,6 +79,30 @@ datum/species/mammal
 	return TRUE
 //HERBIVOROUS//

+//Alien//
+/datum/species/xeno
+	// A cloning mistake, crossing human and xenomorph DNA
+	name = "xeno"
+	id = "xeno"
+	say_mod = "hisses"
+	default_color = "00FF00"
+	species_traits = list(MUTCOLORS,LIPS,DIGITIGRADE,PIERCEIMMUNE)
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "taur","mam_body_markings")
+	default_features = list("xenotail"="xeno","xenohead"="standard","xenodorsal"="standard","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None","mam_body_markings" = "xeno")
+	armor = 15
+	heatmod = 1.7
+	no_equip = list(slot_head)
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+	exotic_bloodtype = "L"
+	damage_overlay_type = "xeno"
+	roundstart = 1
+
+//Praise the Omnissiah, A challange worthy of my skills - HS
+
 //EXOTIC//
 //These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
 /*
@@ -378,8 +378,7 @@
 		adjust_drugginess(-1)

 	if(hallucination)
-		spawn handle_hallucinations()
-		hallucination = max(hallucination-2,0)
+		handle_hallucinations()

 //used in human and monkey handle_environment()
 /mob/living/carbon/proc/natural_bodytemperature_stabilization()
@@ -140,7 +140,7 @@
 		return 0
 	return 1

-/mob/living/carbon/monkey/can_use_guns(var/obj/item/weapon/gun/G)
+/mob/living/carbon/monkey/can_use_guns(var/obj/item/weapon/G)
 	return 1

 /mob/living/carbon/monkey/angry
@@ -51,23 +51,23 @@
 /mob/living/carbon/monkey/punpun/proc/Write_Memory(dead, gibbed)
 	var/savefile/S = new /savefile("data/npc_saves/Punpun.sav")
 	if(gibbed)
-		S["ancestor_name"] 		<< null
-		S["ancestor_chain"]		<< 1
-		S["relic_hat"]			<< null
-		S["relic_mask"]			<< null
+		WRITE_FILE(S["ancestor_name"], null)
+		WRITE_FILE(S["ancestor_chain"], 1)
+		WRITE_FILE(S["relic_hat"], null)
+		WRITE_FILE(S["relic_mask"], null)
 		return
 	if(dead)
-		S["ancestor_name"] 		<< ancestor_name
-		S["ancestor_chain"]		<< ancestor_chain + 1
+		WRITE_FILE(S["ancestor_name"], ancestor_name)
+		WRITE_FILE(S["ancestor_chain"], ancestor_chain + 1)
 	if(!ancestor_name)	//new monkey name this round
-		S["ancestor_name"] 		<< name
+		WRITE_FILE(S["ancestor_name"], name)
 	if(head)
-		S["relic_hat"]			<< head.type
+		WRITE_FILE(S["relic_hat"], head.type)
 	else
-		S["relic_hat"]			<< null
+		WRITE_FILE(S["relic_hat"], null)
 	if(wear_mask)
-		S["relic_mask"]			<< wear_mask.type
+		WRITE_FILE(S["relic_mask"], wear_mask.type)
 	else
-		S["relic_mask"]			<< null
+		WRITE_FILE(S["relic_mask"], null)
 	if(!dead)
 		memory_saved = 1
@@ -795,7 +795,7 @@
 	else
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 	return
-/mob/living/proc/can_use_guns(var/obj/item/weapon/gun/G)
+/mob/living/proc/can_use_guns(var/obj/item/weapon/G)
 	if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return 0
@@ -316,7 +316,7 @@
 		GLOB.cult_narsie.souls += 1
 		if((GLOB.cult_narsie.souls == GLOB.cult_narsie.soul_goal) && (GLOB.cult_narsie.resolved == FALSE))
 			GLOB.cult_narsie.resolved = TRUE
-			world << sound('sound/machines/alarm.ogg')
+			sound_to_playing_players('sound/machines/alarm.ogg')
 			addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, 1), 120)
 			addtimer(CALLBACK(GLOBAL_PROC, .proc/ending_helper), 270)
 	if(client)
@@ -163,9 +163,9 @@
 				if(M.client && M.can_hear() && (M.client.prefs.toggles & SOUND_ANNOUNCEMENTS))
 					var/turf/T = get_turf(M)
 					if(T.z == z_level)
-						M << voice
+						SEND_SOUND(M, voice)
 		else
-			only_listener << voice
+			SEND_SOUND(only_listener, voice)
 		return 1
 	return 0

@@ -17,12 +17,12 @@
 	var/savefile/F = new /savefile(src.savefile_path(user))


-	F["name"] << src.name
-	F["description"] << src.description
-	F["role"] << src.role
-	F["comments"] << src.comments
+	WRITE_FILE(F["name"], name)
+	WRITE_FILE(F["description"], description)
+	WRITE_FILE(F["role"], role)
+	WRITE_FILE(F["comments"], comments)

-	F["version"] << 1
+	WRITE_FILE(F["version"], 1)

 	return 1

@@ -619,7 +619,8 @@
 			src.paiInterface()
 		if(hackprogress >= 100)
 			src.hackprogress = 0
-			src.cable.machine:open()
+			var/obj/machinery/door/D = cable.machine
+			D.open()
 		sleep(50)			// Update every 5 seconds

 // Digital Messenger
@@ -130,7 +130,7 @@
 				family[C.type] += 1
 			else
 				family[C.type] = 1
-	S["family"]				<< family
+	WRITE_FILE(S["family"], family)
 	memory_saved = 1

 /mob/living/simple_animal/pet/cat/Runtime/proc/Deploy_The_Cats()
@@ -344,14 +344,14 @@
 /mob/living/simple_animal/pet/dog/corgi/Ian/proc/Write_Memory(dead)
 	var/savefile/S = new /savefile("data/npc_saves/Ian.sav")
 	if(!dead)
-		S["age"] 				<< age + 1
+		WRITE_FILE(S["age"], age + 1)
 		if((age + 1) > record_age)
-			S["record_age"]		<< record_age + 1
+			WRITE_FILE(S["record_age"], record_age + 1)
 		if(inventory_head)
-			S["saved_head"] << inventory_head.type
+			WRITE_FILE(S["saved_head"], inventory_head.type)
 	else
-		S["age"] 		<< 0
-		S["saved_head"] << null
+		WRITE_FILE(S["age"], 0)
+		WRITE_FILE(S["saved_head"], null)
 	memory_saved = 1


@@ -176,7 +176,7 @@
 	else
 		..()

-/mob/living/simple_animal/drone/cogscarab/can_use_guns(obj/item/weapon/gun/G)
+/mob/living/simple_animal/drone/cogscarab/can_use_guns(obj/item/weapon/G)
 	return GLOB.ratvar_awakens

 /mob/living/simple_animal/drone/cogscarab/get_armor_effectiveness()
@@ -21,7 +21,7 @@
 /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget()
 	. = ..()
 	if(. && ishuman(target) && target != summoner)
-		new /obj/effect/hallucination/delusion(target.loc,target,"custom",200,0, icon_state,icon)
+		new /datum/hallucination/delusion(target,TRUE,"custom",200,0, icon_state,icon)

 /mob/living/simple_animal/hostile/guardian/fire/Crossed(AM as mob|obj)
 	..()
@@ -283,7 +283,7 @@ Difficulty: Very Hard
 	for(var/obj/O in (contents-component_parts))
 		stored_items += O.type

-	S["stored_items"]				<< stored_items
+	WRITE_FILE(S["stored_items"], stored_items)
 	memory_saved = TRUE

 /obj/machinery/smartfridge/black_box/proc/ReadMemory()
@@ -57,6 +57,7 @@ Difficulty: Hard
 	ranged_cooldown_time = 40
 	aggro_vision_range = 21 //so it can see to one side of the arena to the other
 	loot = list(/obj/item/weapon/hierophant_club)
+	crusher_loot = list(/obj/item/weapon/hierophant_club)
 	wander = FALSE
 	var/burst_range = 3 //range on burst aoe
 	var/beam_range = 5 //range on cross blast beams
@@ -936,10 +936,10 @@
 /mob/living/simple_animal/parrot/Poly/proc/Write_Memory()
 	var/savefile/S = new /savefile("data/npc_saves/Poly.sav")
 	if(islist(speech_buffer))
-		S["phrases"] 			<< speech_buffer
-	S["roundssurvived"]		<< rounds_survived
-	S["longestsurvival"]	<< longest_survival
-	S["longestdeathstreak"] << longest_deathstreak
+		WRITE_FILE(S["phrases"], speech_buffer)
+	WRITE_FILE(S["roundssurvived"], rounds_survived)
+	WRITE_FILE(S["longestsurvival"], longest_survival)
+	WRITE_FILE(S["longestdeathstreak"], longest_deathstreak)
 	memory_saved = 1

 /mob/living/simple_animal/parrot/Poly/ghost
@@ -325,6 +325,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return	B.eye_blind
 	return 0

+/mob/proc/hallucinating()
+	return FALSE
+
 /proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
 	if(!SSticker.HasRoundStarted())
 		return 0
@@ -384,7 +387,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		if(O.client)
 			to_chat(O, "<span class='ghostalert'>[message][(enter_link) ? " [enter_link]" : ""]<span>")
 			if(ghost_sound)
-				O << sound(ghost_sound)
+				SEND_SOUND(O, sound(ghost_sound))
 			if(flashwindow)
 				window_flash(O.client)
 			if(source)
@@ -110,7 +110,7 @@
 			if(!channel)
 				return
 			var/mob/living/user = usr
-			var/logname = input(user,"Enter desired logfile name (.log) or leave blank to cancel:")
+			var/logname = stripped_input(user,"Enter desired logfile name (.log) or leave blank to cancel:")
 			if(!logname || !channel)
 				return 1
 			var/datum/computer_file/data/logfile = new/datum/computer_file/data/logfile()
@@ -70,7 +70,7 @@
 	addtimer(CALLBACK(src, .proc/deinitialize_three, delay, U), delay)

 /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_three(delay, mob/living/carbon/human/U)
-	to_chat(U, "<span class='notice'>Logging off, [U:real_name]. Shutting down <B>SpiderOS</B>.</span>")
+	to_chat(U, "<span class='notice'>Logging off, [U.real_name]. Shutting down <B>SpiderOS</B>.</span>")
 	addtimer(CALLBACK(src, .proc/deinitialize_four, delay, U), delay)

 /obj/item/clothing/suit/space/space_ninja/proc/deinitialize_four(delay, mob/living/carbon/human/U)
@@ -222,8 +222,9 @@
 		var/offX = 32 * (A.x - center.x) + A.pixel_x + 33
 		var/offY = 32 * (A.y - center.y) + A.pixel_y + 33
 		if(ismovableatom(A))
-			offX += A:step_x
-			offY += A:step_y
+			var/atom/movable/AM = A
+			offX += AM.step_x
+			offY += AM.step_y

 		res.Blend(img, blendMode2iconMode(A.blend_mode), offX, offY)

@@ -120,8 +120,8 @@
 	if(auto_name)
 		name = "\improper [get_area(src)] APC"

-	pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 24 : -24)
-	pixel_y = (src.tdir & 3)? (src.tdir ==1 ? 24 : -24) : 0
+	pixel_x = (src.tdir & 3)? 0 : (src.tdir == 4 ? 24 : -25)
+	pixel_y = (src.tdir & 3)? (src.tdir ==1 ? 23 : -24) : 0
 	if (building)
 		area = get_area(src)
 		opened = 1
@@ -892,7 +892,7 @@
 	transfer_in_progress = TRUE
 	user.visible_message("<span class='notice'>[user] slots [card] into [src]...</span>", "<span class='notice'>Transfer process initiated. Sending request for AI approval...</span>")
 	playsound(src, 'sound/machines/click.ogg', 50, 1)
-	occupier << sound('sound/misc/notice2.ogg') //To alert the AI that someone's trying to card them if they're tabbed out
+	SEND_SOUND(occupier, sound('sound/misc/notice2.ogg')) //To alert the AI that someone's trying to card them if they're tabbed out
 	if(alert(occupier, "[user] is attempting to transfer you to \a [card.name]. Do you consent to this?", "APC Transfer", "Yes - Transfer Me", "No - Keep Me Here") == "No - Keep Me Here")
 		to_chat(user, "<span class='danger'>AI denied transfer request. Process terminated.</span>")
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1)
@@ -986,9 +986,6 @@
 	else
 		main_status = 2

-	//if(debug)
-	//	world.log << "Status: [main_status] - Excess: [excess] - Last Equip: [lastused_equip] - Last Light: [lastused_light] - Longterm: [longtermpower]"
-
 	if(cell && !shorted)
 		// draw power from cell as before to power the area
 		var/cellused = min(cell.charge, GLOB.CELLRATE * lastused_total)	// clamp deduction to a max, amount left in cell
@@ -216,7 +216,6 @@

 //remove the old powernet and replace it with a new one throughout the network.
 /proc/propagate_network(obj/O, datum/powernet/PN)
-	//world.log << "propagating new network"
 	var/list/worklist = list()
 	var/list/found_machines = list()
 	var/index = 1
@@ -71,7 +71,7 @@
 	sleep(1150)
 	if(resolved == FALSE)
 		resolved = TRUE
-		world << sound('sound/machines/alarm.ogg')
+		sound_to_playing_players('sound/machines/alarm.ogg')
 		addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 120)
 		addtimer(CALLBACK(GLOBAL_PROC, .proc/ending_helper), 220)

@@ -26,7 +26,7 @@
 	var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
 	var/last_warning
 	var/consumedSupermatter = 0 //If the singularity has eaten a supermatter shard and can go to stage six
-	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
 	dangerous_possession = TRUE

 /obj/singularity/Initialize(mapload, starting_energy = 50)
@@ -219,7 +219,7 @@
 	var/turf/T = get_turf(src)
 	for(var/mob/M in GLOB.mob_list)
 		if(M.z == z)
-			M << 'sound/magic/charge.ogg'
+			SEND_SOUND(M, 'sound/magic/charge.ogg')
 			to_chat(M, "<span class='boldannounce'>You feel reality distort for a moment...</span>")
 	if(combined_gas > MOLE_PENALTY_THRESHOLD)
 		investigate_log("has collapsed into a singularity.", INVESTIGATE_SUPERMATTER)
@@ -457,7 +457,7 @@
 	visible_message("<span class='userdanger'>[src] is consumed by the singularity!</span>")
 	for(var/mob/M in GLOB.mob_list)
 		if(M.z == z)
-			M << 'sound/effects/supermatter.ogg' //everyone goan know bout this
+			SEND_SOUND(M, 'sound/effects/supermatter.ogg') //everyone goan know bout this
 			to_chat(M, "<span class='boldannounce'>A horrible screeching fills your ears, and a wave of dread washes over you...</span>")
 	qdel(src)
 	return gain
@@ -27,7 +27,7 @@
 	var/recoil = 0						//boom boom shake the room
 	var/clumsy_check = 1
 	var/obj/item/ammo_casing/chambered = null
-	var/trigger_guard = TRIGGER_GUARD_NORMAL	//trigger guard on the weapon, hulks can't fire them with their big meaty fingers
+	trigger_guard = TRIGGER_GUARD_NORMAL	//trigger guard on the weapon, hulks can't fire them with their big meaty fingers
 	var/sawn_desc = null				//description change if weapon is sawn-off
 	var/sawn_state = SAWN_INTACT
 	var/burst_size = 1					//how large a burst is
@@ -188,12 +188,10 @@



-/obj/item/weapon/gun/proc/can_trigger_gun(var/mob/living/user)
-
-	if(!handle_pins(user) || !user.can_use_guns(src))
-		return 0
-
-	return 1
+/obj/item/weapon/gun/can_trigger_gun(mob/living/user)
+	. = ..()
+	if(!handle_pins(user))
+		return FALSE

 /obj/item/weapon/gun/proc/handle_pins(mob/living/user)
 	if(pin)
@@ -387,3 +387,232 @@
 		var/obj/effect/ebeam/B = b
 		animate(B, alpha = 0, time = 32)
 	return ..()
+
+/obj/item/projectile/hallucination
+	name = "bullet"
+	icon = null
+	icon_state = null
+	hitsound = ""
+	suppressed = TRUE
+	ricochets_max = 0
+	ricochet_chance = 0
+	damage = 0
+	nodamage = TRUE
+	projectile_type = /obj/item/projectile/hallucination
+	log_override = TRUE
+	var/hal_icon_state
+	var/image/fake_icon
+	var/mob/living/carbon/hal_target
+	var/hal_fire_sound
+	var/hal_hitsound
+	var/hal_hitsound_wall
+	var/hal_impact_effect
+	var/hal_impact_effect_wall
+	var/hit_duration
+	var/hit_duration_wall
+
+/obj/item/projectile/hallucination/fire()
+	..()
+	fake_icon = image('icons/obj/projectiles.dmi', src, hal_icon_state, ABOVE_MOB_LAYER)
+	if(hal_target.client)
+		hal_target.client.images += fake_icon
+
+/obj/item/projectile/hallucination/Destroy()
+	if(hal_target.client)
+		hal_target.client.images -= fake_icon
+	QDEL_NULL(fake_icon)
+	return ..()
+
+/obj/item/projectile/hallucination/Collide(atom/A)
+	if(!ismob(A))
+		if(hal_hitsound_wall)
+			hal_target.playsound_local(loc, hal_hitsound_wall, 40, 1)
+		if(hal_impact_effect_wall)
+			spawn_hit(A, TRUE)
+	else if(A == hal_target)
+		if(hal_hitsound)
+			hal_target.playsound_local(A, hal_hitsound, 100, 1)
+		target_on_hit(A)
+	qdel(src)
+	return TRUE
+
+/obj/item/projectile/hallucination/proc/target_on_hit(mob/M)
+	if(M == hal_target)
+		to_chat(hal_target, "<span class='userdanger'>[M] is hit by \a [src] in the chest!</span>")
+		hal_apply_effect()
+	else if(M in view(hal_target))
+		to_chat(hal_target, "<span class='danger'>[M] is hit by \a [src] in the chest!!</span>")
+	if(damage_type == BRUTE)
+		var/splatter_dir = dir
+		if(starting)
+			splatter_dir = get_dir(starting, get_turf(M))
+		spawn_blood(M, splatter_dir)
+	else if(hal_impact_effect)
+		spawn_hit(M, FALSE)
+
+/obj/item/projectile/hallucination/proc/spawn_blood(mob/M, set_dir)
+	set waitfor = 0
+	if(!hal_target.client)
+		return
+
+	var/splatter_icon_state
+	if(set_dir in GLOB.diagonals)
+		splatter_icon_state = "splatter[pick(1, 2, 6)]"
+	else
+		splatter_icon_state = "splatter[pick(3, 4, 5)]"
+
+	var/image/blood = image('icons/effects/blood.dmi', M, splatter_icon_state, ABOVE_MOB_LAYER)
+	var/target_pixel_x = 0
+	var/target_pixel_y = 0
+	switch(set_dir)
+		if(NORTH)
+			target_pixel_y = 16
+		if(SOUTH)
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+		if(EAST)
+			target_pixel_x = 16
+		if(WEST)
+			target_pixel_x = -16
+		if(NORTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = 16
+		if(NORTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = 16
+		if(SOUTHEAST)
+			target_pixel_x = 16
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+		if(SOUTHWEST)
+			target_pixel_x = -16
+			target_pixel_y = -16
+			layer = ABOVE_MOB_LAYER
+	hal_target.client.images += blood
+	animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 5)
+	sleep(5)
+	hal_target.client.images -= blood
+	qdel(blood)
+
+/obj/item/projectile/hallucination/proc/spawn_hit(atom/A, is_wall)
+	set waitfor = 0
+	if(!hal_target.client)
+		return
+
+	var/image/hit_effect = image('icons/effects/blood.dmi', A, is_wall ? hal_impact_effect_wall : hal_impact_effect, ABOVE_MOB_LAYER)
+	hit_effect.pixel_x = A.pixel_x + rand(-4,4)
+	hit_effect.pixel_y = A.pixel_y + rand(-4,4)
+	hal_target.client.images += hit_effect
+	sleep(is_wall ? hit_duration_wall : hit_duration)
+	hal_target.client.images -= hit_effect
+	qdel(hit_effect)
+
+
+/obj/item/projectile/hallucination/proc/hal_apply_effect()
+	return
+
+/obj/item/projectile/hallucination/bullet
+	name = "bullet"
+	hal_icon_state = "bullet"
+	hal_fire_sound = "gunshot"
+	hal_hitsound = 'sound/weapons/pierce.ogg'
+	hal_hitsound_wall = "ricochet"
+	hal_impact_effect = "impact_bullet"
+	hal_impact_effect_wall = "impact_bullet"
+	hit_duration = 5
+	hit_duration_wall = 5
+
+/obj/item/projectile/hallucination/bullet/hal_apply_effect()
+	hal_target.adjustStaminaLoss(60)
+
+/obj/item/projectile/hallucination/laser
+	name = "laser"
+	damage_type = BURN
+	hal_icon_state = "laser"
+	hal_fire_sound = 'sound/weapons/laser.ogg'
+	hal_hitsound = 'sound/weapons/sear.ogg'
+	hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
+	hal_impact_effect = "impact_laser"
+	hal_impact_effect_wall = "impact_laser_wall"
+	hit_duration = 4
+	hit_duration_wall = 10
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+
+/obj/item/projectile/hallucination/laser/hal_apply_effect()
+	hal_target.adjustStaminaLoss(20)
+	hal_target.blur_eyes(2)
+
+/obj/item/projectile/hallucination/taser
+	name = "electrode"
+	damage_type = BURN
+	hal_icon_state = "spark"
+	color = "#FFFF00"
+	hal_fire_sound = 'sound/weapons/taser.ogg'
+	hal_hitsound = 'sound/weapons/taserhit.ogg'
+	hal_hitsound_wall = null
+	hal_impact_effect = null
+	hal_impact_effect_wall = null
+
+/obj/item/projectile/hallucination/taser/hal_apply_effect()
+	hal_target.Knockdown(100)
+	hal_target.stuttering += 20
+	if(hal_target.dna && hal_target.dna.check_mutation(HULK))
+		hal_target.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+	else if(hal_target.status_flags & CANKNOCKDOWN)
+		addtimer(CALLBACK(hal_target, /mob/living/carbon.proc/do_jitter_animation, 20), 5)
+
+/obj/item/projectile/hallucination/disabler
+	name = "disabler beam"
+	damage_type = STAMINA
+	hal_icon_state = "omnilaser"
+	hal_fire_sound = 'sound/weapons/taser2.ogg'
+	hal_hitsound = 'sound/weapons/tap.ogg'
+	hal_hitsound_wall = 'sound/weapons/effects/searwall.ogg'
+	hal_impact_effect = "impact_laser_blue"
+	hal_impact_effect_wall = null
+	hit_duration = 4
+	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
+
+/obj/item/projectile/hallucination/disabler/hal_apply_effect()
+	hal_target.adjustStaminaLoss(25)
+
+/obj/item/projectile/hallucination/ebow
+	name = "bolt"
+	damage_type = TOX
+	hal_icon_state = "cbbolt"
+	hal_fire_sound = 'sound/weapons/genhit.ogg'
+	hal_hitsound = null
+	hal_hitsound_wall = null
+	hal_impact_effect = null
+	hal_impact_effect_wall = null
+
+/obj/item/projectile/hallucination/ebow/hal_apply_effect()
+	hal_target.Knockdown(100)
+	hal_target.stuttering += 5
+	hal_target.adjustStaminaLoss(8)
+
+/obj/item/projectile/hallucination/change
+	name = "bolt of change"
+	damage_type = BURN
+	hal_icon_state = "ice_1"
+	hal_fire_sound = 'sound/magic/staff_change.ogg'
+	hal_hitsound = null
+	hal_hitsound_wall = null
+	hal_impact_effect = null
+	hal_impact_effect_wall = null
+
+/obj/item/projectile/hallucination/change/hal_apply_effect()
+	new /datum/hallucination/self_delusion(hal_target, TRUE, wabbajack = FALSE)
+
+/obj/item/projectile/hallucination/death
+	name = "bolt of death"
+	damage_type = BURN
+	hal_icon_state = "pulse1_bl"
+	hal_fire_sound = 'sound/magic/wandodeath.ogg'
+	hal_hitsound = null
+	hal_hitsound_wall = null
+	hal_impact_effect = null
+	hal_impact_effect_wall = null
+
+/obj/item/projectile/hallucination/death/hal_apply_effect()
+	new /datum/hallucination/death(hal_target, TRUE)
@@ -101,9 +101,11 @@
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "chem_dispenser", name, 550, 550, master_ui, state)
+		if(user.hallucinating())
+			ui.set_autoupdate(FALSE) //to not ruin the immersion by constantly changing the fake chemicals
 		ui.open()

-/obj/machinery/chem_dispenser/ui_data()
+/obj/machinery/chem_dispenser/ui_data(mob/user)
 	var/data = list()
 	data["amount"] = amount
 	data["energy"] = cell.charge ? cell.charge * powerefficiency : "0" //To prevent NaN in the UI.
@@ -128,10 +130,16 @@
 		data["beakerTransferAmounts"] = null

 	var chemicals[0]
+	var/is_hallucinating = FALSE
+	if(user.hallucinating())
+		is_hallucinating = TRUE
 	for(var/re in dispensable_reagents)
 		var/datum/reagent/temp = GLOB.chemical_reagents_list[re]
 		if(temp)
-			chemicals.Add(list(list("title" = temp.name, "id" = temp.id)))
+			var/chemname = temp.name
+			if(is_hallucinating && prob(5))
+				chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
+			chemicals.Add(list(list("title" = chemname, "id" = temp.id)))
 	data["chemicals"] = chemicals
 	return data

@@ -390,7 +390,7 @@
 	T.MakeSlippery(min_wet_time = 10, wet_time_to_add = reac_volume*2)
 	var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in T)
 	if(hotspot)
-		var/datum/gas_mixture/lowertemp = T.remove_air( T:air:total_moles() )
+		var/datum/gas_mixture/lowertemp = T.remove_air(T.air.total_moles())
 		lowertemp.temperature = max( min(lowertemp.temperature-2000,lowertemp.temperature / 2) ,0)
 		lowertemp.react()
 		T.assume_air(lowertemp)
@@ -73,7 +73,7 @@ GLOBAL_PROTECT(reboot_mode)
 			if(rtod - last_irc_status < IRC_STATUS_THROTTLE)
 				return
 			last_irc_status = rtod
-			return "[GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [config.server ? config.server : "[world.internet_address]:[world.port]"]" 
+			return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [config.server ? config.server : "[world.internet_address]:[world.port]"]" 
 		if(SERVICE_CMD_ADMIN_MSG)
 			return IrcPm(params[SERVICE_CMD_PARAM_TARGET], params[SERVICE_CMD_PARAM_MESSAGE], params[SERVICE_CMD_PARAM_SENDER])

@@ -13,7 +13,7 @@
 	action_icon_state = "knock"

 /obj/effect/proc_holder/spell/aoe_turf/knock/cast(list/targets,mob/user = usr)
-	user << sound('sound/magic/knock.ogg')
+	SEND_SOUND(user, sound('sound/magic/knock.ogg'))
 	for(var/turf/T in targets)
 		for(var/obj/machinery/door/door in T.contents)
 			INVOKE_ASYNC(src, .proc/open_door, door)
@@ -75,5 +75,5 @@ Also, you never added distance checking after target is selected. I've went ahea
 	//Here we knock both mobs out for a time.
 	caster.Unconscious(unconscious_amount_caster)
 	victim.Unconscious(unconscious_amount_victim)
-	caster << sound('sound/magic/mandswap.ogg')
-	victim << sound('sound/magic/mandswap.ogg')// only the caster and victim hear the sounds, that way no one knows for sure if the swap happened
+	SEND_SOUND(caster, sound('sound/magic/mandswap.ogg'))
+	SEND_SOUND(victim, sound('sound/magic/mandswap.ogg'))// only the caster and victim hear the sounds, that way no one knows for sure if the swap happened
@@ -290,9 +290,8 @@
 	//HALLUCINATE
 	else if((findtext(message, hallucinate_words)))
 		cooldown = COOLDOWN_MEME
-		for(var/V in listeners)
-			var/mob/living/L = V
-			new /obj/effect/hallucination/delusion(get_turf(L),L,null,150 * power_multiplier,0)
+		for(var/mob/living/carbon/C in listeners)
+			new /datum/hallucination/delusion(C, TRUE, null,150 * power_multiplier,0)

 	//WAKE UP
 	else if((findtext(message, wakeup_words)))
@@ -13,7 +13,7 @@

 /obj/vehicle/bicycle/buckle_mob(mob/living/M, force = 0, check_loc = 1)
 	if(prob(easter_egg_chance) || (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
-		M << sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = CHANNEL_BICYCLE)
+		SEND_SOUND(M, sound(pick(bike_music), repeat = 1, wait = 0, volume = 80, channel = CHANNEL_BICYCLE))
 	. = ..()

 /obj/vehicle/bicycle/unbuckle_mob(mob/living/buckled_mob,force = 0)