Merge branch 'master' into upstream-merge-29651

2017-08-14 19:37:09 -05:00
parent 9b57f5fd62 65a7e9978c
commit 77025ae8a2
235 changed files with 3377 additions and 1056 deletions
@@ -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,10 @@
+diff a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm	(rejected hunks)
+@@ -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_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_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)
@@ -17,6 +17,7 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
 	/client/proc/cmd_admin_pm_context,	/*right-click adminPM interface*/
 	/client/proc/cmd_admin_pm_panel,		/*admin-pm list*/
 	/client/proc/cmd_admin_ticket_panel,
+	/client/proc/panicbunker,
 	/client/proc/stop_sounds
 	)
 GLOBAL_PROTECT(admin_verbs_admin)
@@ -114,7 +115,6 @@ GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 	/client/proc/toggle_random_events,
 	/client/proc/forcerandomrotate,
 	/client/proc/adminchangemap,
-	/client/proc/panicbunker,
 	/client/proc/toggle_hub
 	)
 GLOBAL_PROTECT(admin_verbs_debug)
@@ -296,7 +296,8 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 		/client/proc/startSinglo,
 		/client/proc/set_server_fps,
 		/client/proc/cmd_admin_grantfullaccess,
-		/client/proc/cmd_admin_areatest,
+		/client/proc/cmd_admin_areatest_all,
+		/client/proc/cmd_admin_areatest_station,
 		/client/proc/readmin
 		)
 	if(holder)
@@ -214,7 +214,7 @@
 		if("moveferry")
 			if(!check_rights(R_ADMIN))
 				return
-			SSblackbox.add_details("admin_secrets_fun_used","Send Centcom Ferry")
+			SSblackbox.add_details("admin_secrets_fun_used","Send CentCom Ferry")
 			if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
 				message_admins("[key_name_admin(usr)] moved the centcom ferry")
 				log_admin("[key_name(usr)] moved the centcom ferry")
@@ -457,7 +457,7 @@
 				if(W.z == ZLEVEL_STATION && !istype(get_area(W), /area/bridge) && !istype(get_area(W), /area/crew_quarters) && !istype(get_area(W), /area/security/prison))
 					W.req_access = list()
 			message_admins("[key_name_admin(usr)] activated Egalitarian Station mode")
-			priority_announce("Centcom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')
+			priority_announce("CentCom airlock control override activated. Please take this time to get acquainted with your coworkers.", null, 'sound/ai/commandreport.ogg')

 		if("guns")
 			if(!check_rights(R_FUN))
@@ -517,14 +517,14 @@
 				return
 			SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One")
 			usr.client.only_one()
-			send_to_playing_players('sound/misc/highlander.ogg')
+			sound_to_playing_players('sound/misc/highlander.ogg')

 		if("delayed_onlyone")
 			if(!check_rights(R_FUN))
 				return
 			SSblackbox.add_details("admin_secrets_fun_used","There Can Be Only One")
 			usr.client.only_one_delayed()
-			send_to_playing_players('sound/misc/highlander_delayed.ogg')
+			sound_to_playing_players('sound/misc/highlander_delayed.ogg')

 		if("onlyme")
 			if(!check_rights(R_FUN))
@@ -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"]
@@ -102,13 +102,13 @@
 					message_admins("[key_name(usr)] tried to create gangs. Unfortunately, there were not enough candidates available.")
 					log_admin("[key_name(usr)] failed create gangs.")
 			if("centcom")
-				message_admins("[key_name(usr)] is creating a Centcom response team...")
+				message_admins("[key_name(usr)] is creating a CentCom response team...")
 				if(src.makeEmergencyresponseteam())
-					message_admins("[key_name(usr)] created a Centcom response team.")
-					log_admin("[key_name(usr)] created a Centcom response team.")
+					message_admins("[key_name(usr)] created a CentCom response team.")
+					log_admin("[key_name(usr)] created a CentCom response team.")
 				else
-					message_admins("[key_name_admin(usr)] tried to create a Centcom response team. Unfortunately, there were not enough candidates available.")
-					log_admin("[key_name(usr)] failed to create a Centcom response team.")
+					message_admins("[key_name_admin(usr)] tried to create a CentCom response team. Unfortunately, there were not enough candidates available.")
+					log_admin("[key_name(usr)] failed to create a CentCom response team.")
 			if("abductors")
 				message_admins("[key_name(usr)] is creating an abductor team...")
 				if(src.makeAbductorTeam())
@@ -1710,8 +1710,8 @@

 		usr.client.smite(H)

-	else if(href_list["CentcommReply"])
-		var/mob/living/carbon/human/H = locate(href_list["CentcommReply"]) in GLOB.mob_list
+	else if(href_list["CentComReply"])
+		var/mob/living/carbon/human/H = locate(href_list["CentComReply"]) in GLOB.mob_list
 		if(!istype(H))
 			to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human")
 			return
@@ -1719,15 +1719,15 @@
 			to_chat(usr, "The person you are trying to contact is not wearing a headset.")
 			return

-		message_admins("[src.owner] has started answering [key_name(H)]'s Centcomm request.")
-		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcom", "")
+		message_admins("[src.owner] has started answering [key_name(H)]'s CentCom request.")
+		var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from CentCom", "")
 		if(!input)
-			message_admins("[src.owner] decided not to answer [key_name(H)]'s Centcomm request.")
+			message_admins("[src.owner] decided not to answer [key_name(H)]'s CentCom request.")
 			return

 		to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
-		log_admin("[src.owner] replied to [key_name(H)]'s Centcom message with the message [input].")
-		message_admins("[src.owner] replied to [key_name(H)]'s Centcom message with: \"[input]\"")
+		log_admin("[src.owner] replied to [key_name(H)]'s CentCom message with the message [input].")
+		message_admins("[src.owner] replied to [key_name(H)]'s CentCom message with: \"[input]\"")
 		to_chat(H, "You hear something crackle in your ears for a moment before a voice speaks.  \"Please stand by for a message from Central Command.  Message as follows. [input].  Message ends.\"")

 	else if(href_list["SyndicateReply"])
@@ -194,7 +194,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		AddInteraction("<font color='blue'>[key_name_admin(usr)] PM'd [LinkedReplyName()]</font>")
 		message_admins("<font color='blue'>Ticket [TicketHref("#[id]")] created</font>")
 	else
-		MessageNoRecipient(parsed_message)
+		MessageNoRecipient(msg, parsed_message)

 		//send it to irc if nobody is on and tell us how many were on
 		var/admin_number_present = send2irc_adminless_only(initiator_ckey, "Ticket #[id]: [name]")
@@ -249,18 +249,19 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)

 //message from the initiator without a target, all admins will see this
 //won't bug irc
-/datum/admin_help/proc/MessageNoRecipient(msg)
+/datum/admin_help/proc/MessageNoRecipient(msg, parsed_msg)
 	var/ref_src = "\ref[src]"
-	var/chat_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [msg]</span>"
+	//Message to be sent to all admins
+	var/admin_msg = "<span class='adminnotice'><span class='adminhelp'>Ticket [TicketHref("#[id]", ref_src)]</span><b>: [LinkedReplyName(ref_src)] [FullMonty(ref_src)]:</b> [parsed_msg]</span>"

 	AddInteraction("<font color='red'>[LinkedReplyName(ref_src)]: [msg]</font>")
+	
 	//send this msg to all admins
-
 	for(var/client/X in GLOB.admins)
 		if(X.prefs.toggles & SOUND_ADMINHELP)
 			X << 'sound/effects/adminhelp.ogg'
 		window_flash(X, ignorepref = TRUE)
-		to_chat(X, chat_msg)
+		to_chat(X, admin_msg)

 	//show it to the person adminhelping too
 	to_chat(initiator, "<span class='adminnotice'>PM to-<b>Admins</b>: [msg]</span>")
@@ -495,9 +495,9 @@ GLOBAL_PROTECT(AdminProcCallCount)
 		qdel(adminmob)
 	SSblackbox.add_details("admin_verb","Assume Direct Control") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

-/client/proc/cmd_admin_areatest()
+/client/proc/cmd_admin_areatest(on_station)
 	set category = "Mapping"
-	set name = "Test areas"
+	set name = "Test Areas"

 	var/list/areas_all = list()
 	var/list/areas_with_APC = list()
@@ -509,11 +509,16 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	var/list/areas_with_camera = list()

 	for(var/area/A in world)
-		if(!(A.type in areas_all))
+		if(on_station)
+			var/turf/picked = safepick(get_area_turfs(A.type))
+			if(picked && (picked.z == ZLEVEL_STATION))
+				if(!(A.type in areas_all))
+					areas_all.Add(A.type)
+		else if(!(A.type in areas_all))
 			areas_all.Add(A.type)

 	for(var/obj/machinery/power/apc/APC in GLOB.apcs_list)
-		var/area/A = get_area(APC)
+		var/area/A = APC.area
 		if(!(A.type in areas_with_APC))
 			areas_with_APC.Add(A.type)

@@ -583,6 +588,16 @@ GLOBAL_PROTECT(AdminProcCallCount)
 	for(var/areatype in areas_without_camera)
 		to_chat(world, "* [areatype]")

+/client/proc/cmd_admin_areatest_station()
+	set category = "Mapping"
+	set name = "Test Areas (STATION Z)"
+	cmd_admin_areatest(TRUE)
+
+/client/proc/cmd_admin_areatest_all()
+	set category = "Mapping"
+	set name = "Test Areas (ALL)"
+	cmd_admin_areatest(FALSE)
+
 /client/proc/cmd_admin_dress(mob/living/carbon/human/M in GLOB.mob_list)
 	set category = "Fun"
 	set name = "Select equipment"
@@ -13,7 +13,17 @@
 		return

 	message_admins("[key_name_admin(src)] accessed file: [path]")
-	src << ftp(file(path))
+	//this is copypasta because making it a proc would mean locking out adminproccalls,
+	//	and that system is buggy enough with false positives that I don't want to risk locking admins out of legit calls.
+	switch(alert("View (in game), Open (in your system's text editor), or Download file [path]?", "Log File Opening", "View", "Open", "Download"))
+		if ("View")
+			src << browse("<pre style='word-wrap: break-word;'>[html_encode(file2text(file(path)))]</pre>", list2params(list("window" = "viewfile.[path]")))
+		if ("Open")
+			src << run(file(path))
+		if ("Download")
+			src << ftp(file(path))
+		else
+			return
 	to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.")
 	return

@@ -27,7 +37,15 @@
 	set desc = "Shows server log for this round."

 	if(fexists("[GLOB.world_game_log]"))
-		src << ftp(GLOB.world_game_log)
+		switch(alert("View (in game), Open (in your system's text editor), or Download file [GLOB.world_game_log]?", "Log File Opening", "View", "Open", "Download"))
+			if ("View")
+				src << browse("<pre style='word-wrap: break-word;'>[html_encode(file2text(GLOB.world_game_log))]</pre>", list2params(list("window" = "viewfile.[GLOB.world_game_log]")))
+			if ("Open")
+				src << run(GLOB.world_game_log)
+			if ("Download")
+				src << ftp(GLOB.world_game_log)
+			else
+				return
 	else
 		to_chat(src, "<font color='red'>Server log not found, try using .getserverlog.</font>")
 		return
@@ -41,7 +59,15 @@
 	set desc = "Shows server attack log for this round."

 	if(fexists("[GLOB.world_attack_log]"))
-		src << ftp(GLOB.world_attack_log)
+		switch(alert("View (in game), Open (in your system's text editor), or Download file [GLOB.world_attack_log]?", "Log File Opening", "View", "Open", "Download"))
+			if ("View")
+				src << browse("<pre style='word-wrap: break-word;'>[html_encode(file2text(GLOB.world_attack_log))]</pre>", list2params(list("window" = "viewfile.[GLOB.world_attack_log]")))
+			if ("Open")
+				src << run(GLOB.world_attack_log)
+			if ("Download")
+				src << ftp(GLOB.world_attack_log)
+			else
+				return
 	else
 		to_chat(src, "<font color='red'>Server attack log not found, try using .getserverlog.</font>")
 		return
@@ -34,7 +34,8 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/startSinglo,
 	/client/proc/set_server_fps,	//allows you to set the ticklag.
 	/client/proc/cmd_admin_grantfullaccess,
-	/client/proc/cmd_admin_areatest,
+	/client/proc/cmd_admin_areatest_all,
+	/client/proc/cmd_admin_areatest_station,
 	/client/proc/cmd_admin_rejuvenate,
 	/datum/admins/proc/show_traitor_panel,
 	/client/proc/disable_communication,
@@ -20,7 +20,7 @@
 		<a href='?src=\ref[src];makeAntag=gangs'>Make Gangsters</a><br>
 		<a href='?src=\ref[src];makeAntag=wizard'>Make Wizard (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=nukeops'>Make Nuke Team (Requires Ghosts)</a><br>
-		<a href='?src=\ref[src];makeAntag=centcom'>Make Centcom Response Team (Requires Ghosts)</a><br>
+		<a href='?src=\ref[src];makeAntag=centcom'>Make CentCom Response Team (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=abductors'>Make Abductor Team (Requires Ghosts)</a><br>
 		<a href='?src=\ref[src];makeAntag=revenant'>Make Revenant (Requires Ghost)</a><br>
 		"}
@@ -397,7 +397,7 @@

 /datum/admins/proc/makeOfficial()
 	var/mission = input("Assign a task for the official", "Assign Task", "Conduct a routine preformance review of [station_name()] and its Captain.")
-	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a Centcom Official?", "deathsquad")
+	var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered to be a CentCom Official?", "deathsquad")

 	if(candidates.len)
 		var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -408,7 +408,7 @@
 		newmob.real_name = newmob.dna.species.random_name(newmob.gender,1)
 		newmob.dna.update_dna_identity()
 		newmob.key = chosen_candidate.key
-		newmob.mind.assigned_role = "Centcom Official"
+		newmob.mind.assigned_role = "CentCom Official"
 		newmob.equipOutfit(/datum/outfit/centcom_official)

 		//Assign antag status and the mission
@@ -424,12 +424,12 @@
 			newmob.set_species(/datum/species/human)

 		//Greet the official
-		to_chat(newmob, "<B><font size=3 color=red>You are a Centcom Official.</font></B>")
+		to_chat(newmob, "<B><font size=3 color=red>You are a CentCom Official.</font></B>")
 		to_chat(newmob, "<BR>Central Command is sending you to [station_name()] with the task: [mission]")

 		//Logging and cleanup
-		message_admins("Centcom Official [key_name_admin(newmob)] has spawned with the task: [mission]")
-		log_game("[key_name(newmob)] has been selected as a Centcom Official")
+		message_admins("CentCom Official [key_name_admin(newmob)] has spawned with the task: [mission]")
+		log_game("[key_name(newmob)] has been selected as a CentCom Official")

 		return 1

@@ -437,7 +437,7 @@

 // CENTCOM RESPONSE TEAM
 /datum/admins/proc/makeEmergencyresponseteam()
-	var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
+	var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: CentCom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
 	if(!alert)
 		return
 	switch(alert)
@@ -449,7 +449,7 @@
 			alert = "Amber"
 		if("Blue: Light ERT (No Armoury Access)")
 			alert = "Blue"
-		if("Green: Centcom Official")
+		if("Green: CentCom Official")
 			return makeOfficial()
 	var/teamcheck = input("Maximum size of team? (7 max)", "Select Team Size",4) as null|num
 	if(isnull(teamcheck))
@@ -46,7 +46,7 @@
 	SSblackbox.add_details("admin_verb","Prayer") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	//log_admin("HELP: [key_name(src)]: [msg]")

-/proc/Centcomm_announce(text , mob/Sender)
+/proc/CentCom_announce(text , mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	msg = "<span class='adminnotice'><b><font color=orange>CENTCOM:</font>[ADMIN_FULLMONTY(Sender)] [ADMIN_CENTCOM_REPLY(Sender)]:</b> [msg]</span>"
 	to_chat(GLOB.admins, msg)
@@ -1208,6 +1208,6 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	if(!message)
 		return

-	message_admins("[key_name_admin(usr)] triggered a Centcom recall, with the admiral message of: [message]")
-	log_game("[key_name(usr)] triggered a Centcom recall, with the message of: [message]")
+	message_admins("[key_name_admin(usr)] triggered a CentCom recall, with the admiral message of: [message]")
+	log_game("[key_name(usr)] triggered a CentCom recall, with the message of: [message]")
 	SSshuttle.centcom_recall(SSshuttle.emergency.timer, message)
@@ -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

@@ -66,7 +66,7 @@

 /obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/gerald
 	name = "Personal Log - Gerald Rosswell"
-	info = "Personal Log for Research Director Gerald Rosswell<br><br>Entry One - 17/05/2554:<br>You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.<br><br>Entry Two - 25/05/2554:<br>Well, we all expected it at the outpost, CentComm has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.<br><br>Entry Three - 27/05/2554:<br>The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.<br><br>Entry Four - 06/06/2554:<br>My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.<br><br>Entry Five - 10/06/2554:<br>Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.<br><br>Entry Six - 17/06/2554:<br>The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."
+	info = "Personal Log for Research Director Gerald Rosswell<br><br>Entry One - 17/05/2554:<br>You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of it's outposts and thought it would be a cakewalk, there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that me and my science staff would have to pull double duty as medical staff and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3 point fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.<br><br>Entry Two - 25/05/2554:<br>Well, we all expected it at the outpost, CentCom has decided to completely change what research we are doing. They've decided that we should be research the species known as 'xenomporphs'. They announced this change 4 days ago and along with it, sadly, the termination of our current science staff barring me. Not to mention the constant noise made by the construction detail they sent to staple on an xenobiology lab ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse our current security guard actually died of a heart attack today. Just goes to show that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.<br><br>Entry Three - 27/05/2554:<br>The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.<br><br>Entry Four - 06/06/2554:<br>My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field, a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under equipped and under staffed, we are inevitably going to be destroyed unless we get the equipment and staff we need.<br><br>Entry Five - 10/06/2554:<br>Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap with naught but a force field keeping those xenomorphs in.<br><br>Entry Six - 17/06/2554:<br>The reactions from the specimens today has shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind, while nothing is certain this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, to test this hypothesis would require many complicated procedures which we will not be able to undertake. But we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resend my request for additional security measures along with this new found information."

 /obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/food_specials
 	name = "Specials This Week"
@@ -122,7 +122,7 @@
 				return
 			else
 				SSshuttle.shuttle_loan.loan_shuttle()
-				say("The supply shuttle has been loaned to Centcom.")
+				say("The supply shuttle has been loaned to CentCom.")
 				. = TRUE
 		if("add")
 			var/id = text2path(params["id"])
@@ -1,5 +1,5 @@
 /* How it works:
- The shuttle arrives at Centcom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored.
+ The shuttle arrives at CentCom dock and calls sell(), which recursively loops through all the shuttle contents that are unanchored.
 The loop only checks contents of storage types, see supply.dm shuttle code.

 Each object in the loop is checked for applies_to() of various export datums, except the invalid ones.
@@ -19,8 +19,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	//game-preferences
 	var/lastchangelog = ""				//Saved changlog filesize to detect if there was a change
 	var/ooccolor = null
-	var/enable_tips = TRUE
-	var/tip_delay = 500 //tip delay in milliseconds
+	var/enable_tips = TRUE
+	var/tip_delay = 500 //tip delay in milliseconds

 	//Antag preferences
 	var/list/be_special = list()		//Special role selection
@@ -30,7 +30,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)


 	var/UI_style = "Midnight"
-	var/buttons_locked = FALSE
+	var/buttons_locked = FALSE
 	var/hotkeys = FALSE
 	var/tgui_fancy = TRUE
 	var/tgui_lock = TRUE
@@ -130,7 +130,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"womb_cum_rate"		= CUM_RATE,
 		"womb_cum_mult"		= CUM_RATE_MULT,
 		"womb_efficiency"	= CUM_EFFICIENCY,
-		"womb_fluid" 		= "femcum"
+		"womb_fluid" 		= "femcum",
+		"flavor_text"		= ""
 		)//MAKE SURE TO UPDATE THE LIST IN MOBS.DM IF YOU'RE GOING TO ADD TO THIS LIST, OTHERWISE THINGS MIGHT GET FUCKEY

 	var/list/custom_names = list("clown", "mime", "ai", "cyborg", "religion", "deity")
@@ -175,7 +176,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 	//citadel code
 	var/arousable = TRUE //Allows players to disable arousal from the character creation menu
-	var/flavor_text = ""

 /datum/preferences/New(client/C)
 	parent = C
@@ -279,7 +279,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<h2>General Settings</h2>"
 			dat += "<b>UI Style:</b> <a href='?_src_=prefs;task=input;preference=ui'>[UI_style]</a><br>"
 			dat += "<b>Keybindings:</b> <a href='?_src_=prefs;preference=hotkeys'>[(hotkeys) ? "Hotkeys" : "Default"]</a><br>"
-			dat += "<b>Action Buttons:</b> <a href='?_src_=prefs;preference=action_buttons'>[(buttons_locked) ? "Locked In Place" : "Unlocked"]</a><br>"
+			dat += "<b>Action Buttons:</b> <a href='?_src_=prefs;preference=action_buttons'>[(buttons_locked) ? "Locked In Place" : "Unlocked"]</a><br>"
 			dat += "<b>tgui Style:</b> <a href='?_src_=prefs;preference=tgui_fancy'>[(tgui_fancy) ? "Fancy" : "No Frills"]</a><br>"
 			dat += "<b>tgui Monitors:</b> <a href='?_src_=prefs;preference=tgui_lock'>[(tgui_lock) ? "Primary" : "All"]</a><br>"
 			dat += "<b>Window Flashing:</b> <a href='?_src_=prefs;preference=winflash'>[(windowflashing) ? "Yes" : "No"]</a><br>"
@@ -394,13 +394,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<div class='statusDisplay'><img src=previewicon.png width=[preview_icon.Width()] height=[preview_icon.Height()]></div><br>"
 			dat += "<a href='byond://?src=\ref[user];preference=flavor_text;task=input'><b>Set Flavor Text</b></a><br>"
-			if(lentext(flavor_text) <= 40)
-				if(!lentext(flavor_text))
+			if(lentext(features["flavor_text"]) <= 40)
+				if(!lentext(features["flavor_text"]))
 					dat += "\[...\]"
 				else
-					dat += "[flavor_text]"
+					dat += "[features["flavor_text"]]"
 			else
-				dat += "[TextPreview(flavor_text)]...<BR>"
+				dat += "[TextPreview(features["flavor_text"])]...<BR>"
 			if(config.mutant_races)//really don't need this check, but fuck un-tabbing all those lines
 				dat += "<h2>Body</h2>"
 				dat += "<b>Gender:</b> <a href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : "Female"]</a><BR>"
@@ -916,11 +916,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)

 				if("flavor_text")
-					var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
+					var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(features["flavor_text"])) as message
 					if(msg != null)
 						msg = copytext(msg, 1, MAX_MESSAGE_LEN)
 						msg = html_encode(msg)
-						flavor_text = msg
+						features["flavor_text"] = msg

 				if("metadata")
 					var/new_metadata = input(user, "Enter any information you'd like others to see, such as Roleplay-preferences:", "Game Preference" , metadata)  as message|null
@@ -1499,8 +1499,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 				if("hotkeys")
 					hotkeys = !hotkeys
-				if("action_buttons")
-					buttons_locked = !buttons_locked
+				if("action_buttons")
+					buttons_locked = !buttons_locked
 				if("tgui_fancy")
 					tgui_fancy = !tgui_fancy
 				if("tgui_lock")
@@ -1628,7 +1628,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 	character.backbag = backbag

-	character.dna.features = features.Copy()
+	character.dna.features = features.Copy() //Flavor text is now a DNA feature
 	character.dna.real_name = character.real_name
 	var/datum/species/chosen_species
 	if(pref_species != /datum/species/human && config.mutant_races)
@@ -1639,10 +1639,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 	//citadel code
 	character.give_genitals()
-	character.flavor_text = flavor_text
+	character.flavor_text = features["flavor_text"] //Let's update their flavor_text at least initially
 	character.canbearoused = arousable

 	if(icon_updates)
 		character.update_body()
 		character.update_hair()
 		character.update_body_parts()
+		character.update_genitals()
@@ -342,9 +342,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["job_engsec_med"]		>> job_engsec_med
 	S["job_engsec_low"]		>> job_engsec_low

-
 	//Citadel code
-	S["flavor_text"]					>> flavor_text
 	S["feature_exhibitionist"]			>> features["exhibitionist"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
@@ -382,6 +380,17 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_vag_color"]				>> features["vag_color"]
 	//womb features
 	S["feature_has_womb"]				>> features["has_womb"]
+	//flavor text
+	//Let's make our players NOT cry desperately as we wipe their savefiles of their special snowflake texts:
+	if((S["flavor_text"] != "") && (S["flavor_text"] != null) && S["flavor_text"]) //If old text isn't null and isn't "" but still exists.
+		S["flavor_text"]				>> features["flavor_text"] //Load old flavortext as current dna-based flavortext
+
+		S["feature_flavor_text"]		<< features["flavor_text"] //Save it in our new type of flavor-text
+		S["flavor_text"]				<< "" //Remove old flavortext, completing the cut-and-paste into the new format.
+
+	else //We have no old flavortext, default to new
+		S["feature_flavor_text"]		>> features["flavor_text"]
+

 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -441,7 +450,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	job_engsec_low = sanitize_integer(job_engsec_low, 0, 65535, initial(job_engsec_low))

 	//Citadel
-	flavor_text		= sanitize_text(flavor_text, initial(flavor_text))
+	features["flavor_text"]		= sanitize_text(features["flavor_text"], initial(features["flavor_text"]))
 	if(!features["mcolor2"] || features["mcolor"] == "#000")
 		features["mcolor2"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
 	if(!features["mcolor3"] || features["mcolor"] == "#000")
@@ -510,7 +519,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["job_engsec_low"]		<< job_engsec_low

 	//Citadel
-	S["flavor_text"]			<< flavor_text
 	S["feature_exhibitionist"]			<< features["exhibitionist"]
 	S["feature_mcolor2"]				<< features["mcolor2"]
 	S["feature_mcolor3"]				<< features["mcolor3"]
@@ -548,7 +556,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_vag_color"]				<< features["vag_color"]
 	//womb features
 	S["feature_has_womb"]				<< features["has_womb"]
-
+	//flavor text
+	S["feature_flavor_text"]			<< features["flavor_text"]
 	return 1

 #undef SAVEFILE_VERSION_MAX
@@ -9,9 +9,19 @@
 	if(!mob)
 		return

-	if(IsGuestKey(key))
-		to_chat(src, "Guests may not use OOC.")
-		return
+	if(!holder)
+		if(!GLOB.ooc_allowed)
+			to_chat(src, "<span class='danger'>OOC is globally muted.</span>")
+			return
+		if(!GLOB.dooc_allowed && (mob.stat == DEAD))
+			to_chat(usr, "<span class='danger'>OOC for dead mobs has been turned off.</span>")
+			return
+		if(prefs.muted & MUTE_OOC)
+			to_chat(src, "<span class='danger'>You cannot use OOC (muted).</span>")
+			return
+		if(jobban_isbanned(src.mob, "OOC"))
+			to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
+			return

 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
 	var/raw_msg = msg
@@ -25,24 +35,7 @@
 		if(alert("Your message \"[raw_msg]\" looks like it was meant for in game communication, say it in OOC?", "Meant for OOC?", "No", "Yes") != "Yes")
 			return

-	if(!(prefs.chat_toggles & CHAT_OOC))
-		to_chat(src, "<span class='danger'>You have OOC muted.</span>")
-		return
-
 	if(!holder)
-		if(!GLOB.ooc_allowed)
-			to_chat(src, "<span class='danger'>OOC is globally muted.</span>")
-			return
-		if(!GLOB.dooc_allowed && (mob.stat == DEAD))
-			to_chat(usr, "<span class='danger'>OOC for dead mobs has been turned off.</span>")
-			return
-		if(prefs.muted & MUTE_OOC)
-			to_chat(src, "<span class='danger'>You cannot use OOC (muted).</span>")
-			return
-		if(src.mob)
-			if(jobban_isbanned(src.mob, "OOC"))
-				to_chat(src, "<span class='danger'>You have been banned from OOC.</span>")
-				return
 		if(handle_spam_prevention(msg,MUTE_OOC))
 			return
 		if(findtext(msg, "byond://"))
@@ -51,6 +44,11 @@
 			message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]")
 			return

+	if(!(prefs.chat_toggles & CHAT_OOC))
+		to_chat(src, "<span class='danger'>You have OOC muted.</span>")
+		return
+
+
 	log_talk(mob,"[key_name(src)] : [raw_msg]",LOGOOC)
 	mob.log_message("[key]: [raw_msg]", INDIVIDUAL_OOC_LOG)

@@ -539,13 +539,15 @@ BLIND     // can't see anything
 		if(accessory_overlay)
 			. += accessory_overlay

-/obj/item/clothing/under/attackby(obj/item/W, mob/user, params)
-	if((has_sensor == BROKEN_SENSORS) && istype(W, /obj/item/stack/cable_coil))
-		var/obj/item/stack/cable_coil/C = W
+/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
+	if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
+		var/obj/item/stack/cable_coil/C = I
 		C.use(1)
 		has_sensor = HAS_SENSORS
 		to_chat(user,"<span class='notice'>You repair the suit sensors on [src] with [C].</span>")
 		return 1
+	if(!attach_accessory(I, user))
+		return ..()

 /obj/item/clothing/under/update_clothes_damaged_state(damaging = TRUE)
 	..()
@@ -592,10 +594,6 @@ BLIND     // can't see anything

 	..()

-/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
-	if(!attach_accessory(I, user))
-		..()
-
 /obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
 	. = FALSE
 	if(istype(I, /obj/item/clothing/accessory))
@@ -1,5 +1,3 @@
-
-
 /obj/item/clothing/head/centhat
 	name = "\improper Centcom hat"
 	icon_state = "centcom"
@@ -161,7 +161,7 @@


 /datum/outfit/centcom_official
-	name = "Centcom Official"
+	name = "CentCom Official"

 	uniform = /obj/item/clothing/under/rank/centcom_officer
 	shoes = /obj/item/clothing/shoes/sneakers/black
@@ -181,13 +181,13 @@

 	var/obj/item/device/pda/heads/pda = H.r_store
 	pda.owner = H.real_name
-	pda.ownjob = "Centcom Official"
+	pda.ownjob = "CentCom Official"
 	pda.update_label()

 	var/obj/item/weapon/card/id/W = H.wear_id
 	W.icon_state = "centcom"
-	W.access = get_centcom_access("Centcom Official")
+	W.access = get_centcom_access("CentCom Official")
 	W.access += ACCESS_WEAPONS
-	W.assignment = "Centcom Official"
+	W.assignment = "CentCom Official"
 	W.registered_name = H.real_name
 	W.update_label()
@@ -182,7 +182,7 @@
 	W.update_label(H.real_name)

 /datum/outfit/centcom_commander
-	name = "Centcom Commander"
+	name = "CentCom Commander"

 	uniform = /obj/item/clothing/under/rank/centcom_commander
 	suit = /obj/item/clothing/suit/armor/bulletproof
@@ -205,8 +205,8 @@
 	var/obj/item/weapon/card/id/W = H.wear_id
 	W.icon_state = "centcom"
 	W.access = get_all_accesses()
-	W.access += get_centcom_access("Centcom Commander")
-	W.assignment = "Centcom Commander"
+	W.access += get_centcom_access("CentCom Commander")
+	W.assignment = "CentCom Commander"
 	W.registered_name = H.real_name
 	W.update_label()

@@ -374,7 +374,7 @@
 	var/obj/item/weapon/card/id/W = H.wear_id
 	W.icon_state = "centcom"
 	W.access = get_all_accesses()//They get full station access.
-	W.access += get_centcom_access("Death Commando")//Let's add their alloted Centcom access.
+	W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
 	W.assignment = "Death Commando"
 	W.registered_name = H.real_name
 	W.update_label(W.registered_name, W.assignment)
@@ -82,7 +82,7 @@ Contains:
 	//NASA Voidsuit
 /obj/item/clothing/head/helmet/space/nasavoid
 	name = "NASA Void Helmet"
-	desc = "An old, NASA Centcom branch designed, dark red space suit helmet."
+	desc = "An old, NASA CentCom branch designed, dark red space suit helmet."
 	icon_state = "void"
 	item_state = "void"

@@ -90,12 +90,12 @@ Contains:
 	name = "NASA Voidsuit"
 	icon_state = "void"
 	item_state = "void"
-	desc = "An old, NASA Centcom branch designed, dark red space suit."
+	desc = "An old, NASA CentCom branch designed, dark red space suit."
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/device/multitool)

 /obj/item/clothing/head/helmet/space/nasavoid/old
 	name = "Engineering Void Helmet"
-	desc = "A Centcom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
+	desc = "A CentCom engineering dark red space suit helmet. While old and dusty, it still gets the job done."
 	icon_state = "void"
 	item_state = "void"

@@ -103,7 +103,7 @@ Contains:
 	name = "Engineering Voidsuit"
 	icon_state = "void"
 	item_state = "void"
-	desc = "A Centcom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
+	desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
 	slowdown = 4
 	allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals, /obj/item/device/multitool)

@@ -341,7 +341,7 @@
 //All of the armor below is mostly unused

 /obj/item/clothing/suit/armor/centcom
-	name = "\improper Centcom armor"
+	name = "\improper CentCom armor"
 	desc = "A suit that protects against some damage."
 	icon_state = "centcom"
 	item_state = "centcom"
@@ -182,7 +182,7 @@

 /obj/item/clothing/accessory/medal/gold/heroism
 	name = "medal of exceptional heroism"
-	desc = "An extremely rare golden medal awarded only by Centcom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
+	desc = "An extremely rare golden medal awarded only by CentCom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."

 /obj/item/clothing/accessory/medal/plasma
 	name = "plasma medal"
@@ -104,16 +104,16 @@
 	can_adjust = 0

 /obj/item/clothing/under/rank/centcom_officer
-	desc = "It's a jumpsuit worn by Centcom Officers."
-	name = "\improper Centcom officer's jumpsuit"
+	desc = "It's a jumpsuit worn by CentCom Officers."
+	name = "\improper CentCom officer's jumpsuit"
 	icon_state = "officer"
 	item_state = "g_suit"
 	item_color = "officer"
 	alt_covers_chest = 1

 /obj/item/clothing/under/rank/centcom_commander
-	desc = "It's a jumpsuit worn by Centcom's highest-tier Commanders."
-	name = "\improper Centcom officer's jumpsuit"
+	desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders."
+	name = "\improper CentCom officer's jumpsuit"
 	icon_state = "centcom"
 	item_state = "dg_suit"
 	item_color = "centcom"
@@ -27,22 +27,22 @@
 	SSshuttle.shuttle_loan = src
 	switch(dispatch_type)
 		if(HIJACK_SYNDIE)
-			priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","Centcom Counter Intelligence")
+			priority_announce("Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache.","CentCom Counter Intelligence")
 		if(RUSKY_PARTY)
-			priority_announce("Cargo: A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","Centcom Russian Outreach Program")
+			priority_announce("Cargo: A group of angry russians want to have a party, can you send them your cargo shuttle then make them disappear?","CentCom Russian Outreach Program")
 		if(SPIDER_GIFT)
-			priority_announce("Cargo: The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","Centcom Diplomatic Corps")
+			priority_announce("Cargo: The Spider Clan has sent us a mysterious gift, can we ship it to you to see what's inside?","CentCom Diplomatic Corps")
 		if(DEPARTMENT_RESUPPLY)
-			priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","Centcom Supply Department")
+			priority_announce("Cargo: Seems we've ordered doubles of our department resupply packages this month. Can we send them to you?","CentCom Supply Department")
 			thanks_msg = "The cargo shuttle should return in 5 minutes."
 			bonus_points = 0
 		if(ANTIDOTE_NEEDED)
-			priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "Centcom Research Initiatives")
+			priority_announce("Cargo: Your station has been chosen for an epidemiological research project. Send us your cargo shuttle to receive your research samples.", "CentCom Research Initiatives")
 		if (PIZZA_DELIVERY)
-			priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead", "Centcom Spacepizza Division")
+			priority_announce("Cargo: It looks like a neighbouring station accidentally delivered their pizza to you instead", "CentCom Spacepizza Division")

 /datum/round_event/shuttle_loan/proc/loan_shuttle()
-	priority_announce(thanks_msg, "Cargo shuttle commandeered by Centcom.")
+	priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.")

 	dispatched = 1
 	SSshuttle.points += bonus_points
@@ -44,14 +44,14 @@

 /turf/open/floor/holofloor/asteroid/Initialize()
 	icon_state = "asteroid[rand(0, 12)]"
-	..()
+	. = ..()

 /turf/open/floor/holofloor/basalt
 	name = "basalt"
 	icon_state = "basalt0"

 /turf/open/floor/holofloor/basalt/Initialize()
-	..()
+	. = ..()
 	if(prob(15))
 		icon_state = "basalt[rand(0, 12)]"
 		set_basalt_light(src)
@@ -63,7 +63,7 @@

 /turf/open/floor/holofloor/space/Initialize()
 	icon_state = SPACE_ICON_STATE // so realistic
-	..()
+	. = ..()

 /turf/open/floor/holofloor/hyperspace
 	name = "hyperspace"
@@ -72,10 +72,10 @@

 /turf/open/floor/holofloor/hyperspace/Initialize()
 	icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"
-	..()
+	. = ..()

 /turf/open/floor/holofloor/hyperspace/ns/Initialize()
-	..()
+	. = ..()
 	icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]"

 /turf/open/floor/holofloor/carpet
@@ -89,7 +89,7 @@
 	canSmoothWith = null

 /turf/open/floor/holofloor/carpet/Initialize()
-	..()
+	. = ..()
 	addtimer(CALLBACK(src, .proc/update_icon), 1)

 /turf/open/floor/holofloor/carpet/update_icon()
@@ -23,7 +23,7 @@
 	var/yield = 3					// Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested.
 	var/potency = 10				// The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways.
 	var/growthstages = 6			// Amount of growth sprites the plant has.
-	var/rarity = 0					// How rare the plant is. Used for giving points to cargo when shipping off to Centcom.
+	var/rarity = 0					// How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
 	var/list/mutatelist = list()	// The type of plants that this plant can mutate into.
 	var/list/genes = list()			// Plant genes are stored here, see plant_genes.dm for more info.
 	var/list/reagents_add = list()
@@ -111,7 +111,7 @@
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
 		if("Thunderdome Overseer")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER)
-		if("Centcom Official")
+		if("CentCom Official")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING)
 		if("Medical Officer")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL)
@@ -123,7 +123,7 @@
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
 		if("Admiral")
 			return get_all_centcom_access()
-		if("Centcom Commander")
+		if("CentCom Commander")
 			return get_all_centcom_access()
 		if("Emergency Response Team Commander")
 			return get_ert_access("commander")
@@ -133,7 +133,7 @@
 			return get_ert_access("eng")
 		if("Medical Response Officer")
 			return get_ert_access("med")
-		if("Centcom Bartender")
+		if("CentCom Bartender")
 			return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_BAR)

 /proc/get_all_accesses()
@@ -370,7 +370,7 @@
 	return get_all_jobs() + list("Prisoner")

 /proc/get_all_centcom_jobs()
-	return list("VIP Guest","Custodian","Thunderdome Overseer","Centcom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","Centcom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","Centcom Bartender")
+	return list("VIP Guest","Custodian","Thunderdome Overseer","CentCom Official","Medical Officer","Death Commando","Research Officer","Special Ops Officer","Admiral","CentCom Commander","Emergency Response Team Commander","Security Response Officer","Engineer Response Officer", "Medical Response Officer","CentCom Bartender")

 /obj/item/proc/GetJobName() //Used in secHUD icon generation
 	var/obj/item/weapon/card/id/I = GetID()
@@ -379,6 +379,6 @@
 	var/jobName = I.assignment
 	if(jobName in get_all_job_icons()) //Check if the job has a hud icon
 		return jobName
-	if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a Centcom job
-		return "Centcom"
+	if(jobName in get_all_centcom_jobs()) //Return with the NT logo if it is a CentCom job
+		return "CentCom"
 	return "Unknown" //Return unknown if none of the above apply
@@ -4,7 +4,7 @@ Captain
 /datum/job/captain
 	title = "Captain"
 	flag = CAPTAIN
-	department_head = list("Centcom")
+	department_head = list("CentCom")
 	department_flag = ENGSEC
 	faction = "Station"
 	total_positions = 1
@@ -1,5 +1,5 @@
 /obj/item/weapon/book/manual/random/Initialize()
-	..()
+	. = ..()
 	var/static/banned_books = list(/obj/item/weapon/book/manual/random, /obj/item/weapon/book/manual/nuclear, /obj/item/weapon/book/manual/wiki)
 	var/newtype = pick(subtypesof(/obj/item/weapon/book/manual) - banned_books)
 	new newtype(loc)
@@ -10,7 +10,7 @@
 	var/category = null

 /obj/item/weapon/book/random/Initialize()
-	..()
+	. = ..()
 	create_random_books(amount, src.loc, TRUE, category)
 	qdel(src)

@@ -24,7 +24,7 @@
 	state = 2

 /obj/structure/bookcase/random/Initialize(mapload)
-	..()
+	. = ..()
 	if(!book_count || !isnum(book_count))
 		update_icon()
 		return
@@ -77,7 +77,7 @@
 	var/ref_book_prob = 20

 /obj/structure/bookcase/random/reference/Initialize(mapload)
-	..()
+	. = ..()
 	while(book_count > 0 && prob(ref_book_prob))
 		book_count--
 		new /obj/item/weapon/book/manual/random(src)
@@ -1,6 +1,6 @@
 /obj/item/soapstone
 	name = "soapstone"
-	desc = "Leave informative messages for the crew, including the crew of future shifts!\nEven if out of uses, it can still be used to remove messages.\n(Not suitable for engraving on shuttles, off station or on cats. Side effects may include beatings, bannings and orbital bombardment.)"
+	desc = "Leave informative messages for the crew, including the crew of future shifts!\nEven if out of uses, it can still be used to remove messages.\n(Not suitable for engraving on shuttles, off station or on cats. Side effects may include prompt beatings, psychotic clown incursions, and/or orbital bombardment.)"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "soapstone"
 	throw_speed = 3
@@ -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
@@ -170,6 +170,7 @@

 /datum/action/innate/minedrone
 	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_mecha.dmi'
 	background_icon_state = "bg_default"

 /datum/action/innate/minedrone/toggle_light
@@ -31,6 +31,16 @@
 	color_src = 0
 	icon = 'icons/mob/mam_bodyparts.dmi'

+/datum/sprite_accessory/tails/human/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/ears/human/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
 /datum/sprite_accessory/tails/human/catbig
 	name = "Cat, Big"
 	icon_state = "catbig"
@@ -234,6 +244,16 @@
 	extra = 1
 	extra_color_src = MUTCOLORS2

+/datum/sprite_accessory/mam_tails/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
+/datum/sprite_accessory/mam_ears/bear
+	name = "Bear"
+	icon_state = "bear"
+	icon = 'icons/mob/mam_bodyparts.dmi'
+
 /datum/sprite_accessory/mam_ears/catbig
 	name = "Cat, Big"
 	icon_state = "cat"
@@ -240,6 +240,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 +818,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]"
@@ -9,11 +9,11 @@
 	real_name = "Test Dummy"
 	status_flags = GODMODE|CANPUSH

-/mob/living/carbon/human/dummy/New(loc)
+INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
+
+/mob/living/carbon/human/dummy/Destroy()
 	..()
-	if(!initialized)
-		args[1] = FALSE
-		Initialize(arglist(args))
+	return QDEL_HINT_QUEUE

 /mob/living/carbon/human/dummy/Life()
 	return
@@ -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)
@@ -63,6 +63,7 @@
 	return list(
 		head,
 		wear_mask,
+		wear_neck,
 		glasses,
 		ears,
 		)
@@ -171,7 +172,7 @@
 				dropItemToGround(belt)
 		w_uniform = null
 		update_suit_sensors()
-		if(!QDELETED(src)) 
+		if(!QDELETED(src))
 			update_inv_w_uniform()
 	else if(I == gloves)
 		gloves = null
@@ -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
@@ -326,7 +326,7 @@
 /datum/emote/living/surrender
 	key = "surrender"
 	key_third_person = "surrenders"
-	message = "puts their hands on their head and falls to the ground, they surrender%s!"
+	message = "puts their hands on their head and falls to the ground, they surrender!"
 	emote_type = EMOTE_AUDIBLE

 /datum/emote/living/surrender/run_emote(mob/user, params)
@@ -754,7 +754,7 @@
 	var/turf/T = get_turf(src)
 	if(!T)
 		return 0
-	if(T.z == ZLEVEL_CENTCOM) //dont detect mobs on centcomm
+	if(T.z == ZLEVEL_CENTCOM) //dont detect mobs on centcom
 		return 0
 	if(T.z >= ZLEVEL_SPACEMAX)
 		return 0
@@ -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
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(

 	// Faction
 	"t" = "Syndicate",
-	"y" = "Centcom",
+	"y" = "CentCom",

 	// Species
 	"b" = "binary",
@@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(

 	// Faction
 	"å" = "Syndicate",
-	"í" = "Centcom",
+	"í" = "CentCom",

 	// Species
 	"è" = "binary",
@@ -331,7 +331,7 @@
 /mob/living/silicon/pai/proc/downloadSoftware()
 	var/dat = ""

-	dat += "<h2>Centcom pAI Module Subversion Network</h2><br>"
+	dat += "<h2>CentCom pAI Module Subversion Network</h2><br>"
 	dat += "<pre>Remaining Available Memory: [src.ram]</pre><br>"
 	dat += "<p style=\"text-align:center\"><b>Trunks available for checkout</b><br>"

@@ -44,7 +44,7 @@
 	desc = "It's Officer Beep O'sky's smaller, just-as aggressive cousin, Pipsqueak."

 /mob/living/simple_animal/bot/secbot/beepsky/jr/Initialize()
-	..()
+	. = ..()
 	resize = 0.8
 	update_transform()

@@ -63,7 +63,7 @@
 	radio_channel = "AI Private"

 /mob/living/simple_animal/bot/secbot/Initialize()
-	..()
+	. = ..()
 	icon_state = "secbot[on]"
 	spawn(3)
 		var/datum/job/detective/J = new/datum/job/detective
@@ -53,7 +53,7 @@
 			break

 /mob/living/simple_animal/pet/dog/corgi/Initialize()
-	..()
+	. = ..()
 	regenerate_icons()


@@ -296,7 +296,7 @@
 	var/saved_head //path

 /mob/living/simple_animal/pet/dog/corgi/Ian/Initialize()
-	..()
+	. = ..()
 	//parent call must happen first to ensure IAN
 	//is not in nullspace when child puppies spawn
 	Read_Memory()
@@ -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)
 	..()
@@ -29,7 +29,7 @@
 	loot = list(/obj/effect/decal/cleanable/robot_debris)

 /mob/living/simple_animal/hostile/hivebot/Initialize()
-	..()
+	. = ..()
 	deathmessage = "[src] blows apart!"

 /mob/living/simple_animal/hostile/hivebot/range
@@ -63,4 +63,4 @@

 /mob/living/simple_animal/hostile/hivebot/death(gibbed)
 	do_sparks(3, TRUE, src)
-	..(1)
+	..(1)
@@ -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
@@ -51,7 +51,7 @@
 	icon_dead = "stickdog_dead"

 /mob/living/simple_animal/hostile/stickman/Initialize(mapload, var/wizard_summoned)
-	..()
+	. = ..()
 	new /obj/effect/temp_visual/paper_scatter(src)
 	summoned_by_wizard = wizard_summoned

@@ -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
@@ -22,16 +22,12 @@
 	if(last_status != new_status)
 		last_status = new_status
 		ui_header = "smmon_[last_status].gif"
-		if(istype(computer) && !(computer.hardware_flag == PROGRAM_LAPTOP))
-			program_icon_state = "smmon_[last_status]"
-			if(istype(computer))
-				computer.update_icon()
+		program_icon_state = "smmon_[last_status]"
+		if(istype(computer))
+			computer.update_icon()

 /datum/computer_file/program/supermatter_monitor/run_program(mob/living/user)
 	. = ..(user)
-	if(istype(computer) && (computer.hardware_flag == PROGRAM_LAPTOP))
-		program_icon_state = "engine"
-		computer.update_icon()
 	refresh()

 /datum/computer_file/program/supermatter_monitor/kill_program(forced = FALSE)
@@ -36,7 +36,7 @@
 	if(M.mind == target && !M.owns_soul())
 		if(user.mind && (user.mind.assigned_role == "Lawyer"))
 			deconvert = TRUE
-		else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "Centcom Commander"))
+		else if (user.mind && (user.mind.assigned_role =="Head of Personnel") || (user.mind.assigned_role == "CentCom Commander"))
 			deconvert = prob (25) // the HoP doesn't have AS much legal training
 		else
 			deconvert = prob (5)
@@ -0,0 +1,23 @@
+diff a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm	(rejected hunks)
+@@ -91,18 +91,18 @@
+ 	info = "...EMPTY HALLS...USELESS SPACE..."
+ 
+ 
+-///////////	Centcom
+///////////	CentCom
+ 
+ /obj/item/weapon/paper/fluff/stations/centcom/disk_memo
+ 	name = "memo"
+ 	info = "GET DAT FUKKEN DISK"
+ 
+ /obj/item/weapon/paper/fluff/stations/centcom/broken_evac
+-	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>Centcom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
+	info = "Due to circumstances beyond our control, your Emergency Evacuation Shuttle is out of service.<br><br>We apologize for the inconvenience this may cause you.<br><br>Please enjoy the use of this complementary book.<br><br>Sincerely,<br>CentCom Operations Demolitions Examination Retribution Bugfixing Underlining Services"
+ 
+ /obj/item/weapon/paper/fluff/stations/centcom/bulletin
+ 	name = "paper- 'Official Bulletin'"
+-	info = "<BR>Centcom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>Centcom Port Commissioner"
+	info = "<BR>CentCom Security<BR>Port Division<BR>Official Bulletin<BR><BR>Inspector,<BR>There is an emergency shuttle arriving today.<BR><BR>Approval is restricted to Nanotrasen employees only. Deny all other entrants.<BR><BR>CentCom Port Commissioner"
+ 
+ 
+ ///////////	Lavaland
@@ -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
@@ -1,24 +1,6 @@
 #define TESLA_DEFAULT_POWER 1738260
 #define TESLA_MINI_POWER 869130

-GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmospherics,
-										/obj/machinery/power/emitter,
-										/obj/machinery/field/generator,
-										/mob/living/simple_animal,
-										/obj/machinery/particle_accelerator/control_box,
-										/obj/structure/particle_accelerator/fuel_chamber,
-										/obj/structure/particle_accelerator/particle_emitter/center,
-										/obj/structure/particle_accelerator/particle_emitter/left,
-										/obj/structure/particle_accelerator/particle_emitter/right,
-										/obj/structure/particle_accelerator/power_box,
-										/obj/structure/particle_accelerator/end_cap,
-										/obj/machinery/field/containment,
-										/obj/structure/disposalpipe,
-										/obj/structure/sign,
-										/obj/machinery/gateway,
-										/obj/structure/lattice,
-										/obj/structure/grille,
-										/obj/machinery/the_singularitygen/tesla)))
 /obj/singularity/energy_ball
 	name = "energy ball"
 	desc = "An energy ball."
@@ -183,8 +165,27 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 	var/obj/machinery/closest_machine
 	var/obj/structure/closest_structure
 	var/obj/structure/blob/closest_blob
+	var/static/things_to_shock = typecacheof(list(/obj/machinery, /mob/living, /obj/structure))
+	var/static/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
+										/obj/machinery/power/emitter,
+										/obj/machinery/field/generator,
+										/mob/living/simple_animal,
+										/obj/machinery/particle_accelerator/control_box,
+										/obj/structure/particle_accelerator/fuel_chamber,
+										/obj/structure/particle_accelerator/particle_emitter/center,
+										/obj/structure/particle_accelerator/particle_emitter/left,
+										/obj/structure/particle_accelerator/particle_emitter/right,
+										/obj/structure/particle_accelerator/power_box,
+										/obj/structure/particle_accelerator/end_cap,
+										/obj/machinery/field/containment,
+										/obj/structure/disposalpipe,
+										/obj/structure/sign,
+										/obj/machinery/gateway,
+										/obj/structure/lattice,
+										/obj/structure/grille,
+										/obj/machinery/the_singularitygen/tesla))

-	for(var/A in oview(source, zap_range+2))
+	for(var/A in typecache_filter_multi_list_exclusion(oview(source, zap_range+2), things_to_shock, blacklisted_tesla_types))
 		if(istype(A, /obj/machinery/power/tesla_coil))
 			var/dist = get_dist(source, A)
 			var/obj/machinery/power/tesla_coil/C = A
@@ -207,7 +208,7 @@ GLOBAL_LIST_INIT(blacklisted_tesla_types, typecacheof(list(/obj/machinery/atmosp
 				closest_atom = A
 				closest_dist = dist

-		else if(closest_grounding_rod || is_type_in_typecache(A, GLOB.blacklisted_tesla_types))
+		else if(closest_grounding_rod)
 			continue

 		else if(isliving(A))
@@ -37,16 +37,12 @@
 /datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
 	deleteturfs = FALSE

-/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs/New()
-	..()
-	ignore_typecache = typecacheof(list(/turf))
-
 /datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete
 	deleteturfs = FALSE

 /datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New()
 	..()
-	ignore_typecache = typecacheof(list(/mob, /turf))
+	ignore_typecache = typecacheof(list(/mob))

 //Only places atoms/turfs on area borders
 /datum/mapGeneratorModule/border
@@ -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

@@ -313,7 +313,7 @@
 /datum/reagent/blob/explosive_lattice/damage_reaction(obj/structure/blob/B, damage, damage_type, damage_flag)
 	if(damage_flag == "bomb")
 		return 0
-	else if(damage_flag != "melee" || damage_flag != "bullet" || damage_flag != "laser")
+	else if(damage_flag != "melee" && damage_flag != "bullet" && damage_flag != "laser")
 		return damage * 1.5
 	return ..()

@@ -20,7 +20,7 @@ this dire fate:
 it's data to every other device in the game. Each console has a "disconnect from network" option that'll will cause data base sync
 operations to skip that console. This is useful if you want to make a "public" R&D console or, for example, give the engineers
 a circuit imprinter with certain designs on it and don't want it accidentally updating. The downside of this method is that you have
-to have physical access to the other console to send data back. Note: An R&D console is on Centcom so if a random griffan happens to
+to have physical access to the other console to send data back. Note: An R&D console is on CentCom so if a random griffan happens to
 cause a ton of data to be lost, an admin can go send it back.
 - The second method is with Technology Disks and Design Disks. Each of these disks can hold technology or design datums in
 their entirety. You can then take the disk to any R&D console and upload it's data to it. This method is a lot more secure (since it
@@ -349,7 +349,7 @@ research holder datum.
 	max_tech_stored = 10

 /obj/item/weapon/disk/tech_disk/debug
-	name = "centcomm technology disk"
+	name = "centcom technology disk"
 	desc = "A debug item for research"
 	materials = list()
 	max_tech_stored = 0
@@ -133,7 +133,7 @@
 	return

 /obj/machinery/r_n_d/server/centcom
-	name = "Centcom Central R&D Database"
+	name = "CentCom Central R&D Database"
 	server_id = -1

 /obj/machinery/r_n_d/server/centcom/Initialize()
@@ -390,7 +390,7 @@
 					var/obj/docking_port/mobile/M = A
 					M.on_emergency_dock()

-				// now move the actual emergency shuttle to centcomm
+				// now move the actual emergency shuttle to centcom
 				// unless the shuttle is "hijacked"
 				var/destination_dock = "emergency_away"
 				if(is_hijacked())
@@ -29,5 +29,5 @@
 		if(last_request && (last_request + cooldown > world.time))
 			return
 		last_request = world.time
-		to_chat(usr, "<span class='notice'>Your request has been recieved by Centcom.</span>")
-		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to Centcom.</font>")
+		to_chat(usr, "<span class='notice'>Your request has been recieved by CentCom.</span>")
+		to_chat(GLOB.admins, "<b>FERRY: <font color='blue'>[ADMIN_LOOKUPFLW(usr)] (<A HREF='?_src_=holder;secrets=moveferry'>Move Ferry</a>)</b> is requesting to move the transport ferry to CentCom.</font>")
@@ -12,7 +12,7 @@

 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	anchored = TRUE
-// 
+//
 	var/id
 	// this should point -away- from the dockingport door, ie towards the ship
 	dir = NORTH
@@ -481,7 +481,7 @@

 	var/rotation = 0
 	if(new_dock.dir != dir) //Even when the dirs are the same rotation is coming out as not 0 for some reason
-		rotation = dir2angle(new_dock)-dir2angle(dir)
+		rotation = dir2angle(new_dock.dir)-dir2angle(dir)
 		if ((rotation % 90) != 0)
 			rotation += (rotation % 90) //diagonal rotations not allowed, round up
 		rotation = SimplifyDegrees(rotation)
@@ -527,7 +527,7 @@
 		return DOCKING_AREA_EMPTY

 	/*******************************************All onShuttleMove procs******************************************/
-	
+
 	for(var/i in 1 to old_turfs.len)
 		var/turf/oldT = old_turfs[i]
 		var/turf/newT = new_turfs[i]
@@ -550,9 +550,9 @@
 			var/atom/movable/moving_atom = thing
 			moving_atom.onShuttleMove(newT, oldT, rotation, movement_force, movement_direction)				//atoms
 			moved_atoms += moving_atom
-	
+
 	/******************************************All afterShuttleMove procs****************************************/
-	
+
 	for(var/i in 1 to new_turfs.len)
 		var/turf/oldT = old_turfs[i]
 		var/turf/newT = new_turfs[i]
@@ -767,7 +767,7 @@
 		return TRUE
 	return FALSE

-// Losing all initial engines should get you 2 
+// Losing all initial engines should get you 2
 // Adding another set of engines at 0.5 time
 /obj/docking_port/mobile/proc/alter_engines(mod)
 	if(mod == 0)
@@ -806,7 +806,7 @@
 		if(initial_engines > 0)
 			change_per_engine = (ENGINE_COEFF_MAX -  1) / initial_engines //just linear drop to max delay
 		return Clamp(1 + delta * change_per_engine,ENGINE_COEFF_MIN,ENGINE_COEFF_MAX)
-		
+

 /obj/docking_port/mobile/proc/in_flight()
 	switch(mode)
@@ -838,15 +838,15 @@

 //Called when emergency shuttle docks at centcom
 /obj/docking_port/mobile/proc/on_emergency_dock()
-	//Mapping a new docking point for each ship mappers could potentially want docking with centcomm would take up lots of space, just let them keep flying off into the sunset for their greentext
+	//Mapping a new docking point for each ship mappers could potentially want docking with centcom would take up lots of space, just let them keep flying off into the sunset for their greentext
 	if(launch_status == ENDGAME_LAUNCHED)
 		launch_status = ENDGAME_TRANSIT

 /obj/docking_port/mobile/pod/on_emergency_dock()
 	if(launch_status == ENDGAME_LAUNCHED)
-		dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcomm
+		dock(SSshuttle.getDock("[id]_away")) //Escape pods dock at centcom
 		mode = SHUTTLE_ENDGAME
-		
+
 /obj/docking_port/mobile/emergency/on_emergency_dock()
 	return

@@ -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)))
@@ -45,7 +45,8 @@

 				//Send messages
 				to_chat(owner, "<span class='warning'>[digest_alert_owner]</span>")
-				M.visible_message("<span class='notice'>You watch as [owner]'s form loses its additions.</span>", "<span class='warning'>[digest_alert_prey]</span>")
+				to_chat(M, "<span class='warning'>[digest_alert_prey]</span>")
+				M.visible_message("<span class='notice'>You watch as [owner]'s form loses its additions.</span>")

 				owner.nutrition += 400 // so eating dead mobs gives you *something*.
 				M.stop_sound_channel(CHANNEL_PRED)