Merge branch 'master' into upstream-merge-31877

code/modules/VR/vr_sleeper.dm

@@ -4,7 +4,7 @@
 // it's """VR"""
 /obj/machinery/vr_sleeper
 	name = "virtual reality sleeper"
-	desc = "a sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds"
+	desc = "A sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds."
 	icon = 'icons/obj/Cryogenic2.dmi'
 	icon_state = "sleeper"
 	state_open = TRUE

code/modules/admin/DB_ban/functions.dm

@@ -50,9 +50,12 @@
 			announceinirc = 1
 			blockselfban = 1
 			kickbannedckey = 1
-	if( !bantype_pass ) return
-	if( !istext(reason) ) return
-	if( !isnum(duration) ) return
+	if( !bantype_pass )
+		return
+	if( !istext(reason) )
+		return
+	if( !isnum(duration) )
+		return
 
 	var/ckey
 	var/computerid
@@ -174,7 +177,8 @@
 			if(BANTYPE_ANY_JOB)
 				bantype_str = "ANYJOB"
 				bantype_pass = 1
-		if( !bantype_pass ) return
+		if( !bantype_pass )
+			return
 
 	var/bantype_sql
 	if(bantype_str == "ANY")

code/modules/admin/NewBan.dm

@@ -65,7 +65,8 @@ GLOBAL_PROTECT(Banlist)
 	GLOB.Banlist = new("data/banlist.bdb")
 	log_admin("Loading Banlist")
 
-	if (!length(GLOB.Banlist.dir)) log_admin("Banlist is empty.")
+	if (!length(GLOB.Banlist.dir))
+		log_admin("Banlist is empty.")
 
 	if (!GLOB.Banlist.dir.Find("base"))
 		log_admin("Banlist missing base dir.")
@@ -89,8 +90,10 @@ GLOBAL_PROTECT(Banlist)
 			message_admins("Invalid Ban.")
 			continue
 
-		if (!GLOB.Banlist["temp"]) continue
-		if (GLOB.CMinutes >= GLOB.Banlist["minutes"]) RemoveBan(A)
+		if (!GLOB.Banlist["temp"])
+			continue
+		if (GLOB.CMinutes >= GLOB.Banlist["minutes"])
+			RemoveBan(A)
 
 	return 1
 
@@ -133,7 +136,8 @@ GLOBAL_PROTECT(Banlist)
 	GLOB.Banlist["id"] >> id
 	GLOB.Banlist.cd = "/base"
 
-	if (!GLOB.Banlist.dir.Remove(foldername)) return 0
+	if (!GLOB.Banlist.dir.Remove(foldername))
+		return 0
 
 	if(!usr)
 		log_admin_private("Ban Expired: [key]")

code/modules/admin/admin_verbs.dm

@@ -594,7 +594,8 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
 	set name = "Give Disease"
 	set desc = "Gives a Disease to a mob."
 	var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in SSdisease.diseases
-	if(!D) return
+	if(!D)
+		return
 	T.ForceContractDisease(new D)
 	SSblackbox.add_details("admin_verb","Give Disease") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")

code/modules/admin/banjob.dm

@@ -1,7 +1,7 @@
-//returns a reason if M is banned from rank, returns 0 otherwise
+//returns a reason if M is banned from rank, returns FALSE otherwise
 /proc/jobban_isbanned(mob/M, rank)
 	if(!M || !istype(M) || !M.ckey)
-		return 0
+		return FALSE
 
 	if(!M.client) //no cache. fallback to a datum/DBQuery
 		var/datum/DBQuery/query_jobban_check_ban = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("ban")] WHERE ckey = '[sanitizeSQL(M.ckey)]' AND (bantype = 'JOB_PERMABAN'  OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned) AND job = '[sanitizeSQL(rank)]'")
@@ -9,17 +9,17 @@
 			return
 		if(query_jobban_check_ban.NextRow())
 			var/reason = query_jobban_check_ban.item[1]
-			return reason ? reason : 1 //we don't want to return "" if there is no ban reason, as that would evaluate to false
+			return reason ? reason : TRUE //we don't want to return "" if there is no ban reason, as that would evaluate to false
 		else
-			return 0
+			return FALSE
 
 	if(!M.client.jobbancache)
 		jobban_buildcache(M.client)
 
 	if(rank in M.client.jobbancache)
 		var/reason = M.client.jobbancache[rank]
-		return (reason) ? reason : 1 //see above for why we need to do this
-	return 0
+		return (reason) ? reason : TRUE //see above for why we need to do this
+	return FALSE
 
 /proc/jobban_buildcache(client/C)
 	if(!SSdbcore.Connect())

code/modules/admin/create_poll.dm

@@ -6,7 +6,7 @@
 	if(!SSdbcore.Connect())
 		to_chat(src, "<span class='danger'>Failed to establish database connection.</span>")
 		return
-	var/polltype = input("Choose poll type.","Poll Type") in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting")|null
+	var/polltype = input("Choose poll type.","Poll Type") as null|anything in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting")
 	var/choice_amount = 0
 	switch(polltype)
 		if("Single Option")
@@ -18,10 +18,14 @@
 		if("Multiple Choice")
 			polltype = POLLTYPE_MULTI
 			choice_amount = input("How many choices should be allowed?","Select choice amount") as num|null
-			if(choice_amount == 0)
-				to_chat(src, "Multiple choice poll must have at least one choice allowed.")
-			else if (choice_amount == null)
-				return
+			switch(choice_amount)
+				if(0)
+					to_chat(src, "Multiple choice poll must have at least one choice allowed.")
+					return
+				if(1)
+					polltype = POLLTYPE_OPTION
+				if(null)
+					return
 		if ("Instant Runoff Voting")
 			polltype = POLLTYPE_IRV
 		else

code/modules/admin/fun_balloon.dm

@@ -104,7 +104,7 @@
 
 /obj/effect/shuttle_build
 	name = "shuttle_build"
-	desc = "Some assembly required"
+	desc = "Some assembly required."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "syndballoon"
 	anchored = TRUE

code/modules/admin/holder2.dm

@@ -101,7 +101,8 @@ if it doesn't return 1 and show_msg=1 it will prints a message explaining why th
 generally it would be used like so:
 
 /proc/admin_proc()
-	if(!check_rights(R_ADMIN)) return
+	if(!check_rights(R_ADMIN))
+		return
 	to_chat(world, "you have enough rights!")
 
 NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call

code/modules/admin/player_panel.dm

@@ -441,7 +441,7 @@
 					dat += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=\ref[N]'>[N.name]([N.key])</a><i>Head body destroyed!</i></td>"
 					dat += "<td><A href='?priv_msg=[N.key]'>PM</A></td></tr>"
 			dat += "</table>"
-      
+
 		if(SSticker.mode.changelings.len > 0)
 			dat += "<br><table cellspacing=5><tr><td><B>Changelings</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/changeling in SSticker.mode.changelings)
@@ -593,20 +593,15 @@
 		var/list/blob_minds = list()
 		for(var/mob/camera/blob/B in GLOB.mob_list)
 			blob_minds |= B.mind
-
-		if(istype(SSticker.mode, /datum/game_mode/blob) || blob_minds.len)
-			dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
-			if(istype(SSticker.mode, /datum/game_mode/blob))
-				var/datum/game_mode/blob/mode = SSticker.mode
-				blob_minds |= mode.blob_overminds
-				dat += "<tr><td><i>Progress: [GLOB.blobs_legit.len]/[mode.blobwincount]</i></td></tr>"
-
+			if(blob_minds.len)
+				dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
 			for(var/datum/mind/blob in blob_minds)
-				var/mob/M = blob.current
+				var/mob/camera/blob/M = blob.current
 				if(M)
 					dat += "<tr><td><a href='?_src_=holder;[HrefToken()];adminplayeropts=\ref[M]'>[M.real_name]</a>[M.client ? "" : " <i>(No Client)</i>"][M.stat == DEAD ? " <b><font color=red>(DEAD)</font></b>" : ""]</td>"
 					dat += "<td><A href='?priv_msg=[M.ckey]'>PM</A></td>"
 					dat += "<td><A href='?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[M]'>FLW</a></td></tr>"
+					dat += "<tr><td><i>Progress: [M.blobs_legit.len]/[M.blobwincount]</i></td></tr>"
 				else
 					dat += "<tr><td><a href='?_src_=vars;[HrefToken()];Vars=\ref[blob]'>[blob.name]([blob.key])</a><i>Blob not found!</i></td>"
 					dat += "<td><A href='?priv_msg=[blob.key]'>PM</A></td></tr>"

code/modules/admin/secrets.dm

@@ -215,8 +215,8 @@
 				return
 			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")
+				message_admins("[key_name_admin(usr)] moved the CentCom ferry")
+				log_admin("[key_name(usr)] moved the CentCom ferry")
 
 		if("togglearrivals")
 			if(!check_rights(R_ADMIN))
@@ -334,17 +334,19 @@
 				return
 			SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])")
 			for(var/mob/living/H in GLOB.player_list)
-				if(!(ishuman(H)||istype(H, /mob/living/silicon/))) continue
-				if(H.stat == DEAD || !H.client || !H.mind || ispAI(H)) continue
-				if(is_special_character(H)) continue
-				H.mind.add_antag_datum(ANTAG_DATUM_TRAITOR_CUSTOM)
-				var/datum/antagonist/traitor/traitordatum = H.mind.has_antag_datum(ANTAG_DATUM_TRAITOR) //original datum self deletes
+				if(!(ishuman(H)||istype(H, /mob/living/silicon/)))
+					continue
+				if(H.stat == DEAD || !H.client || !H.mind || ispAI(H))
+					continue
+				if(is_special_character(H))
+					continue
+				var/datum/antagonist/traitor/human/T = new(H.mind)
+				T.give_objectives = FALSE
 				var/datum/objective/new_objective = new
 				new_objective.owner = H
 				new_objective.explanation_text = objective
-				traitordatum.add_objective(new_objective)
-				traitordatum.equip(FALSE)
-				traitordatum.greet()
+				T.add_objective(new_objective)
+				H.mind.add_antag_datum(T)
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]</span>")
 			log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
 
@@ -546,7 +548,8 @@
 			if(!check_rights(R_DEBUG))
 				return
 			var/datum/job/J = SSjob.GetJob("Security Officer")
-			if(!J) return
+			if(!J)
+				return
 			J.total_positions = -1
 			J.spawn_positions = -1
 			message_admins("[key_name_admin(usr)] has removed the cap on security officers.")

code/modules/admin/topic.dm

@@ -165,6 +165,7 @@
 			return
 		var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevents.control
 		if(E)
+			E.admin_setup(usr)
 			var/datum/round_event/event = E.runEvent()
 			if(event.announceWhen>0)
 				event.processing = FALSE
@@ -2240,7 +2241,7 @@
 			if(!newname)
 				return
 			G.name = newname
-			var/description = input("Enter centcom message contents:") as message|null
+			var/description = input("Enter CentCom message contents:") as message|null
 			if(!description)
 				return
 			G.report_message = description

code/modules/admin/verbs/BrokenInhands.dm

@@ -2,7 +2,8 @@
 	var/text
 	for(var/A in typesof(/obj/item))
 		var/obj/item/O = new A( locate(1,1,1) )
-		if(!O) continue
+		if(!O)
+			continue
 		var/icon/IL = new(O.lefthand_file)
 		var/list/Lstates = IL.IconStates()
 		var/icon/IR = new(O.righthand_file)
@@ -28,7 +29,5 @@
 	if(text)
 		var/F = file("broken_icons.txt")
 		fdel(F)
-		WRITE_FILE(F, text)
+		WRITE_FILE(F, text)
 		to_chat(world, "Completely successfully and written to [F]")
-
-

code/modules/admin/verbs/adminhelp.dm

@@ -237,6 +237,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=icissue'>IC</A>)"
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=close'>CLOSE</A>)"
 	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=resolve'>RSLVE</A>)"
+	. += " (<A HREF='?_src_=holder;[HrefToken(TRUE)];ahelp=[ref_src];ahelp_action=handleissue'>HANDLE</A>)"
 
 //private
 /datum/admin_help/proc/LinkedReplyName(ref_src)
@@ -382,6 +383,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	AddInteraction("Marked as IC issue by [key_name]")
 	Resolve(silent = TRUE)
 
+//Let the initiator know their ahelp is being handled
+/datum/admin_help/proc/HandleIssue(key_name = key_name_admin(usr))
+	if(state != AHELP_ACTIVE)
+		return
+
+	var/msg = "<span class ='adminhelp'>Your ticket is now being handled by an admin. Please be patient.</span>"
+
+	if(initiator)
+		to_chat(initiator, msg)
+
+	SSblackbox.inc("ahelp_handleissue")
+	msg = "Ticket [TicketHref("#[id]")] is being handled by [key_name]"
+	message_admins(msg)
+	log_admin_private(msg)
+	AddInteraction("Being handled by [key_name]")
+
 //Show the ticket panel
 /datum/admin_help/proc/TicketPanel()
 	var/list/dat = list("<html><head><title>Ticket #[id]</title></head>")
@@ -442,6 +459,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 			Close()
 		if("resolve")
 			Resolve()
+		if("handleissue")
+			HandleIssue()
 		if("reopen")
 			Reopen()
 
@@ -489,9 +508,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 		return
 	if(handle_spam_prevention(msg,MUTE_ADMINHELP))
 		return
-	
+
 	msg = trim(msg)
-	
+
 	if(!msg)
 		return
 

code/modules/admin/verbs/buildmode.dm

@@ -181,7 +181,8 @@
 			if(varholder in locked && !check_rights(R_DEBUG,0))
 				return 1
 			var/thetype = input(user,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
-			if(!thetype) return 1
+			if(!thetype)
+				return 1
 			switch(thetype)
 				if("text")
 					valueholder = input(user,"Enter variable value:" ,"Value", "value") as text
@@ -200,7 +201,8 @@
 				var/datum/mapGenerator/MP = path
 				options[initial(MP.buildmode_name)] = path
 			var/type = input(user,"Select Generator Type","Type") as null|anything in options
-			if(!type) return
+			if(!type)
+				return
 
 			generator_path = options[type]
 			cornerA = null

code/modules/admin/verbs/debug.dm

@@ -31,7 +31,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	set name = "Advanced ProcCall"
 	set waitfor = 0
 
-	if(!check_rights(R_DEBUG)) return
+	if(!check_rights(R_DEBUG))
+		return
 
 	var/datum/target = null
 	var/targetselected = 0
@@ -261,10 +262,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
 	if(ishuman(M))
 		log_admin("[key_name(src)] has blobized [M.key].")
 		var/mob/living/carbon/human/H = M
-		spawn(0)
-			var/mob/camera/blob/B = H.become_overmind(FALSE)
-			B.place_blob_core(B.base_point_rate, -1) //place them wherever they are
-
+		H.become_overmind()
 	else
 		alert("Invalid mob")
 

code/modules/admin/verbs/manipulate_organs.dm

@@ -36,7 +36,8 @@
 
 			var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
 			organ = organs[organ]
-			if(!organ) return
+			if(!organ)
+				return
 			var/obj/item/organ/O
 			var/obj/item/implant/I
 

code/modules/admin/verbs/mapping.dm

@@ -194,15 +194,20 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	set category = "Mapping"
 	set name = "Count Objects On Level"
 	var/level = input("Which z-level?","Level?") as text
-	if(!level) return
+	if(!level)
+		return
 	var/num_level = text2num(level)
-	if(!num_level) return
-	if(!isnum(num_level)) return
+	if(!num_level)
+		return
+	if(!isnum(num_level))
+		return
 
 	var/type_text = input("Which type path?","Path?") as text
-	if(!type_text) return
+	if(!type_text)
+		return
 	var/type_path = text2path(type_text)
-	if(!type_path) return
+	if(!type_path)
+		return
 
 	var/count = 0
 
@@ -238,9 +243,11 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	set name = "Count Objects All"
 
 	var/type_text = input("Which type path?","") as text
-	if(!type_text) return
+	if(!type_text)
+		return
 	var/type_path = text2path(type_text)
-	if(!type_path) return
+	if(!type_path)
+		return
 
 	var/count = 0
 

code/modules/admin/verbs/randomverbs.dm

@@ -545,15 +545,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 	var/devastation = input("Range of total devastation. -1 to none", text("Input"))  as num|null
-	if(devastation == null) return
+	if(devastation == null)
+		return
 	var/heavy = input("Range of heavy impact. -1 to none", text("Input"))  as num|null
-	if(heavy == null) return
+	if(heavy == null)
+		return
 	var/light = input("Range of light impact. -1 to none", text("Input"))  as num|null
-	if(light == null) return
+	if(light == null)
+		return
 	var/flash = input("Range of flash. -1 to none", text("Input"))  as num|null
-	if(flash == null) return
+	if(flash == null)
+		return
 	var/flames = input("Range of flames. -1 to none", text("Input"))  as num|null
-	if(flames == null) return
+	if(flames == null)
+		return
 
 	if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
 		if ((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
@@ -577,9 +582,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		return
 
 	var/heavy = input("Range of heavy pulse.", text("Input"))  as num|null
-	if(heavy == null) return
+	if(heavy == null)
+		return
 	var/light = input("Range of light pulse.", text("Input"))  as num|null
-	if(light == null) return
+	if(light == null)
+		return
 
 	if (heavy || light)
 
@@ -960,7 +967,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	set name = "Toggle AntagHUD"
 	set desc = "Toggles the Admin AntagHUD"
 
-	if(!holder) return
+	if(!holder)
+		return
 
 	var/adding_hud = !has_antag_hud()
 

code/modules/assembly/signaler.dm

@@ -107,7 +107,8 @@ Code:
 	..()
 
 /obj/item/device/assembly/signaler/proc/signal()
-	if(!radio_connection) return
+	if(!radio_connection)
+		return
 
 	var/datum/signal/signal = new
 	signal.source = src
@@ -173,7 +174,8 @@ Code:
 	return "The radio receiver is [on?"on":"off"]."
 
 /obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal)
-	if(!on) return
+	if(!on)
+		return
 	return ..(signal)
 
 

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -14,10 +14,10 @@
 
 	var/oxy = air_contents.gases[/datum/gas/oxygen] ? air_contents.gases[/datum/gas/oxygen][MOLES] : 0
 	var/tox = air_contents.gases[/datum/gas/plasma] ? air_contents.gases[/datum/gas/plasma][MOLES] : 0
-
+	var/trit = air_contents.gases[/datum/gas/tritium] ? air_contents.gases[/datum/gas/tritium][MOLES] : 0
 	if(active_hotspot)
 		if(soh)
-			if(tox > 0.5 && oxy > 0.5)
+			if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
 				if(active_hotspot.temperature < exposed_temperature)
 					active_hotspot.temperature = exposed_temperature
 				if(active_hotspot.volume < exposed_volume)
@@ -26,11 +26,11 @@
 
 	var/igniting = 0
 
-	if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && tox > 0.5)
+	if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5))
 		igniting = 1
 
 	if(igniting)
-		if(oxy < 0.5 || tox < 0.5)
+		if(oxy < 0.5)
 			return 0
 
 		active_hotspot = new /obj/effect/hotspot(src)
@@ -112,7 +112,7 @@
 		qdel(src)
 		return
 
-	if(!(location.air) || !location.air.gases[/datum/gas/plasma] || !location.air.gases[/datum/gas/oxygen] || location.air.gases[/datum/gas/plasma][MOLES] < 0.5 || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
+	if(!(location.air) || !(location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/tritium]) || !location.air.gases[/datum/gas/oxygen] || (location.air.gases[/datum/gas/plasma][MOLES] < 0.5 && location.air.gases[/datum/gas/tritium][MOLES] < 0.5) || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
 		qdel(src)
 		return
 

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -6,7 +6,6 @@ What are the archived variables for?
 #define MINIMUM_HEAT_CAPACITY	0.0003
 #define QUANTIZE(variable)		(round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
 															once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
-
 GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm
 GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
@@ -401,6 +400,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 
 /datum/gas_mixture/react(turf/open/dump_location)
 	. = 0
+
 	reaction_results = new
 
 	var/list/cached_gases = gases
@@ -438,6 +438,9 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 			*/
 
 			. |= reaction.react(src, dump_location)
+			//to_chat(world,reaction.name)
+			if (. & STOP_REACTIONS)
+				break
 	if(.)
 		garbage_collect()
 		if(temperature < TCMB) //just for safety

code/modules/atmospherics/gasmixtures/gas_types.dm

@@ -58,7 +58,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 	specific_heat = 200
 	name = "Plasma"
 	gas_overlay = "plasma"
-	moles_visible = MOLES_PLASMA_VISIBLE
+	moles_visible = MOLES_GAS_VISIBLE
 	dangerous = TRUE
 
 /datum/gas/water_vapor
@@ -66,14 +66,14 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 	specific_heat = 40
 	name = "Water Vapor"
 	gas_overlay = "water_vapor"
-	moles_visible = MOLES_PLASMA_VISIBLE
+	moles_visible = MOLES_GAS_VISIBLE
 
-/datum/gas/freon
-	id = "freon"
+/datum/gas/hypernoblium
+	id = "nob"
 	specific_heat = 2000
-	name = "Freon"
+	name = "Hyper-noblium"
 	gas_overlay = "freon"
-	moles_visible = MOLES_PLASMA_VISIBLE
+	moles_visible = MOLES_GAS_VISIBLE
 	dangerous = TRUE
 
 /datum/gas/nitrous_oxide
@@ -84,15 +84,21 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 	moles_visible = 1
 	dangerous = TRUE
 
-/datum/gas/oxygen_agent_b
-	id = "agent_b"
-	specific_heat = 300
-	name = "Oxygen Agent B"
+/datum/gas/brown_gas //This is nitric oxide, but given generic name to avoid confusion with nitrous oxide(N20 vs. NO2)
+	id = "browns"
+	specific_heat = 20
+	name = "Brown Gas"
+	gas_overlay = "browns"
+	moles_visible = MOLES_GAS_VISIBLE
+	dangerous = TRUE
 
-/datum/gas/volatile_fuel
-	id = "v_fuel"
-	specific_heat = 30
-	name = "Volatile Fuel"
+/datum/gas/tritium
+	id = "tritium"
+	specific_heat = 10
+	name = "Tritium"
+	gas_overlay = "tritium"
+	moles_visible = MOLES_GAS_VISIBLE
+	dangerous = TRUE
 
 /datum/gas/bz
 	id = "bz"
@@ -100,6 +106,16 @@ GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /
 	name = "BZ"
 	dangerous = TRUE
 
+/datum/gas/stimulum
+	id = "stim"
+	specific_heat = 5
+	name = "Stimulum"
+
+/datum/gas/pluoxium
+	id = "pluox"
+	specific_heat = 80
+	name = "Pluoxium"
+
 /obj/effect/overlay/gas
 	icon = 'icons/effects/tile_effects.dmi'
 	mouse_opacity = MOUSE_OPACITY_TRANSPARENT

code/modules/atmospherics/gasmixtures/reactions.dm

@@ -1,6 +1,33 @@
 #define NO_REACTION	0
 #define REACTING	1
-
+//Plasma fire properties
+#define OXYGEN_BURN_RATE_BASE				1.4
+#define PLASMA_BURN_RATE_DELTA				9
+#define PLASMA_UPPER_TEMPERATURE			1370+T0C
+#define PLASMA_MINIMUM_OXYGEN_NEEDED		2
+#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO	30
+#define PLASMA_OXYGEN_FULLBURN				10
+#define FIRE_CARBON_ENERGY_RELEASED			100000	//Amount of heat released per mole of burnt carbon into the tile
+#define FIRE_PLASMA_ENERGY_RELEASED			3000000	//Amount of heat released per mole of burnt plasma into the tile
+//General assmos defines.
+#define WATER_VAPOR_FREEZE					200
+#define BROWNS_FORMATION_ENERGY				100000
+#define TRITIUM_BURN_OXY_FACTOR				100
+#define TRITIUM_BURN_TRIT_FACTOR			10
+#define SUPER_SATURATION_THRESHOLD			96
+#define STIMULUM_HEAT_SCALE					100000
+#define STIMULUM_FIRST_RISE					0.65
+#define STIMULUM_FIRST_DROP					0.065
+#define STIMULUM_SECOND_RISE				0.0009
+#define STIMULUM_ABSOLUTE_DROP				0.00000335
+#define REACTION_OPPRESSION_THRESHOLD		5
+	//Plasma fusion properties
+#define PLASMA_BINDING_ENERGY				3000000
+#define MAX_CATALYST_EFFICENCY				9
+#define PLASMA_FUSED_COEFFICENT				0.08
+#define CATALYST_COEFFICENT					0.01
+#define FUSION_PURITY_THRESHOLD				0.9
+#define FUSION_HEAT_DROPOFF					20000+T0C
 /datum/controller/subsystem/air/var/list/gas_reactions //this is our singleton of all reactions
 
 /proc/init_gas_reactions()
@@ -35,48 +62,15 @@
 /datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location)
 	return NO_REACTION
 
-//agent b: converts hot co2 and agent b to oxygen. requires plasma as a catalyst. endothermic
-/datum/gas_reaction/agent_b
-	priority = 2
-	name = "Agent B"
-	id = "agent_b"
+/datum/gas_reaction/nobliumsupression
+	priority = INFINITY
+	name = "Hyper-Noblium Reaction Supression"
+	id = "nobstop"
+/datum/gas_reaction/nobliumsupression/init_reqs()
+	min_requirements = list(/datum/gas/hypernoblium = REACTION_OPPRESSION_THRESHOLD)
 
-/datum/gas_reaction/agent_b/init_reqs()
-	min_requirements = list(
-		"TEMP" = 900,
-		/datum/gas/oxygen_agent_b = MINIMUM_HEAT_CAPACITY,
-		/datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
-		/datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
-	)
-
-
-/datum/gas_reaction/agent_b/react(datum/gas_mixture/air)
-	var/list/cached_gases = air.gases
-	var/reaction_rate = min(cached_gases[/datum/gas/carbon_dioxide][MOLES]*0.75, cached_gases[/datum/gas/plasma][MOLES]*0.25, cached_gases[/datum/gas/oxygen_agent_b][MOLES]*0.05)
-
-	cached_gases[/datum/gas/carbon_dioxide][MOLES] -= reaction_rate
-	cached_gases[/datum/gas/oxygen_agent_b][MOLES] -= reaction_rate*0.05
-
-	ASSERT_GAS(/datum/gas/oxygen, air) //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
-	cached_gases[/datum/gas/oxygen][MOLES] += reaction_rate
-
-	air.temperature -= (reaction_rate*20000)/air.heat_capacity()
-
-	return REACTING
-
-//freon: does a freezy thing?
-/datum/gas_reaction/freon
-	priority = 1
-	name = "Freon"
-	id = "freon"
-
-/datum/gas_reaction/freon/init_reqs()
-	min_requirements = list(/datum/gas/freon = MOLES_PLASMA_VISIBLE)
-
-/datum/gas_reaction/freon/react(datum/gas_mixture/air, turf/open/location)
-	. = NO_REACTION
-	if(location && location.freon_gas_act())
-		. = REACTING
+/datum/gas_reaction/nobliumsupression/react()
+	return STOP_REACTIONS
 
 //water vapor: puts out fires?
 /datum/gas_reaction/water_vapor
@@ -85,12 +79,15 @@
 	id = "vapor"
 
 /datum/gas_reaction/water_vapor/init_reqs()
-	min_requirements = list(/datum/gas/water_vapor = MOLES_PLASMA_VISIBLE)
+	min_requirements = list(/datum/gas/water_vapor = MOLES_GAS_VISIBLE)
 
 /datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, turf/open/location)
 	. = NO_REACTION
-	if(location && location.water_vapor_gas_act())
-		air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_PLASMA_VISIBLE
+	if (air.temperature <= WATER_VAPOR_FREEZE)
+		if(location && location.freon_gas_act())
+			. = REACTING
+	else if(location && location.water_vapor_gas_act())
+		air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_GAS_VISIBLE
 		. = REACTING
 
 //fire: combustion of plasma and volatile fuel (treated as hydrocarbons). creates hotspots. exothermic
@@ -100,7 +97,7 @@
 	id = "fire"
 
 /datum/gas_reaction/fire/init_reqs()
-	min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of volatile fuel stuff - consider finally axing volatile fuel
+	min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of other, rarer, burning gases.
 
 /datum/gas_reaction/fire/react(datum/gas_mixture/air, turf/open/location)
 	var/energy_released = 0
@@ -111,23 +108,23 @@
 	cached_results[id] = 0
 
 	//General volatile gas burn
-	if(cached_gases[/datum/gas/volatile_fuel] && cached_gases[/datum/gas/volatile_fuel][MOLES])
+	if(cached_gases[/datum/gas/tritium] && cached_gases[/datum/gas/tritium][MOLES])
 		var/burned_fuel
 		if(!cached_gases[/datum/gas/oxygen])
 			burned_fuel = 0
-		else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/volatile_fuel][MOLES])
-			burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]
-			cached_gases[/datum/gas/volatile_fuel][MOLES] -= burned_fuel
-			cached_gases[/datum/gas/oxygen][MOLES] = 0
+		else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/tritium][MOLES])
+			burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]/TRITIUM_BURN_OXY_FACTOR
+			cached_gases[/datum/gas/tritium][MOLES] -= burned_fuel
 		else
-			burned_fuel = cached_gases[/datum/gas/volatile_fuel][MOLES]
-			cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/volatile_fuel][MOLES]
+			burned_fuel = cached_gases[/datum/gas/tritium][MOLES]*TRITIUM_BURN_TRIT_FACTOR
+			cached_gases[/datum/gas/tritium][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]/TRITIUM_BURN_TRIT_FACTOR
+			cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]
 
 		if(burned_fuel)
 			energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel
 
 			ASSERT_GAS(/datum/gas/carbon_dioxide, air)
-			cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel
+			cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
 
 			cached_results[id] += burned_fuel
 
@@ -137,6 +134,7 @@
 		var/oxygen_burn_rate = 0
 		//more plasma released at higher temperatures
 		var/temperature_scale
+		var/super_saturation
 		if(temperature > PLASMA_UPPER_TEMPERATURE)
 			temperature_scale = 1
 		else
@@ -144,15 +142,25 @@
 		if(temperature_scale > 0)
 			var/o2 = cached_gases[/datum/gas/oxygen] ? cached_gases[/datum/gas/oxygen][MOLES] : 0
 			oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
+			if (o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
+				plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+			if(o2 / cached_gases[/datum/gas/plasma][MOLES] > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
+				super_saturation = TRUE
 			if(o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
 				plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
 			else
 				plasma_burn_rate = (temperature_scale*(o2/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+
 			if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
 				ASSERT_GAS(/datum/gas/carbon_dioxide, air) //don't need to assert o2, since if it isn't present we'll never reach this point anyway
 				cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate)
 				cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
-				cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
+				if (super_saturation)
+					ASSERT_GAS(/datum/gas/tritium,air)
+					cached_gases[/datum/gas/tritium][MOLES] += plasma_burn_rate
+				else
+					ASSERT_GAS(/datum/gas/carbon_dioxide,air)
+					cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
 
 				energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
 
@@ -175,9 +183,9 @@
 
 	return cached_results[id] ? REACTING : NO_REACTION
 
-//fusion: a terrible idea that was fun to try. turns co2 and plasma into REALLY HOT oxygen and nitrogen. super exothermic lol
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting.
 /datum/gas_reaction/fusion
-	exclude = TRUE
+	exclude = FALSE
 	priority = 2
 	name = "Plasmic Fusion"
 	id = "fusion"
@@ -186,35 +194,37 @@
 	min_requirements = list(
 		"ENER" = PLASMA_BINDING_ENERGY * 10,
 		/datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
-		/datum/gas/carbon_dioxide = MINIMUM_HEAT_CAPACITY
+		/datum/gas/tritium = MINIMUM_HEAT_CAPACITY
 	)
 
 /datum/gas_reaction/fusion/react(datum/gas_mixture/air)
 	var/list/cached_gases = air.gases
 	var/temperature = air.temperature
 
-	if((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD)
-		//Fusion wont occur if the level of impurities is too high.
+	if(((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD) || air.return_pressure() < 10*ONE_ATMOSPHERE)
+		//Fusion wont occur if the level of impurities is too high or if there is too little pressure.
 		return NO_REACTION
 
 	var/old_heat_capacity = air.heat_capacity()
-	var/carbon_efficency = min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/carbon_dioxide][MOLES],MAX_CARBON_EFFICENCY)
+	var/catalyst_efficency = max(min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],MAX_CATALYST_EFFICENCY)-(temperature/FUSION_HEAT_DROPOFF),1)
 	var/reaction_energy = THERMAL_ENERGY(air)
-	var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/carbon_dioxide][MOLES])
+	var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])
 
-	var/plasma_fused = (PLASMA_FUSED_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
-	var/carbon_catalyzed = (CARBON_CATALYST_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
-	var/oxygen_added = carbon_catalyzed
-	var/nitrogen_added = (plasma_fused-oxygen_added)-(THERMAL_ENERGY(air)/PLASMA_BINDING_ENERGY)
+	var/plasma_fused = (PLASMA_FUSED_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)*4
+	var/tritium_catalyzed = (CATALYST_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)
+	var/oxygen_added = tritium_catalyzed
+	var/waste_added = (plasma_fused-oxygen_added)-((air.total_moles()*air.heat_capacity())/PLASMA_BINDING_ENERGY)
+	reaction_energy = max(reaction_energy+((catalyst_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/catalyst_efficency)+2)*10)+((plasma_fused/((moles_impurities/catalyst_efficency)))*PLASMA_BINDING_ENERGY),0)
 
-	reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0)
-
-	air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
-
-	cached_gases[/datum/gas/plasma][MOLES] -= plasma_fused
-	cached_gases[/datum/gas/carbon_dioxide][MOLES] -= carbon_catalyzed
+	air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/brown_gas)
+	//Fusion produces an absurd amount of waste products now, requiring active filtration.
+	cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - plasma_fused,0)
+	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES] - tritium_catalyzed,0)
 	cached_gases[/datum/gas/oxygen][MOLES] += oxygen_added
-	cached_gases[/datum/gas/nitrogen][MOLES] += nitrogen_added
+	cached_gases[/datum/gas/nitrogen][MOLES] += waste_added
+	cached_gases[/datum/gas/water_vapor][MOLES] += waste_added
+	cached_gases[/datum/gas/nitrous_oxide][MOLES] += waste_added
+	cached_gases[/datum/gas/brown_gas][MOLES] += waste_added
 
 	if(reaction_energy > 0)
 		var/new_heat_capacity = air.heat_capacity()
@@ -223,5 +233,152 @@
 			//Prevents whatever mechanism is causing it to hit negative temperatures.
 		return REACTING
 
+/datum/gas_reaction/brownsformation //The formation of brown gas. Endothermic. Requires N2O as a catalyst.
+	priority = 3
+	name = "Brown Gas formation"
+	id = "brownsformation"
+
+/datum/gas_reaction/brownsformation/init_reqs()
+	min_requirements = list(
+		/datum/gas/oxygen = 20,
+		/datum/gas/nitrogen = 20,
+		/datum/gas/nitrous_oxide = 5,
+		"TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400
+	)
+
+/datum/gas_reaction/brownsformation/react(datum/gas_mixture/air)
+	var/list/cached_gases = air.gases
+	var/temperature = air.temperature
+
+	var/old_heat_capacity = air.heat_capacity()
+	var/heat_efficency = temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100)
+	var/energy_used = heat_efficency*BROWNS_FORMATION_ENERGY
+	ASSERT_GAS(/datum/gas/brown_gas,air)
+
+	cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficency
+	cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficency
+	cached_gases[/datum/gas/brown_gas][MOLES] += heat_efficency*2
+
+	if(energy_used > 0)
+		var/new_heat_capacity = air.heat_capacity()
+		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			air.temperature = max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)
+		return REACTING
+
+/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
+	priority = 4
+	name = "BZ Gas formation"
+	id = "bzformation"
+
+/datum/gas_reaction/bzformation/init_reqs()
+	min_requirements = list(
+		/datum/gas/tritium = 10,
+		/datum/gas/plasma = 10
+	)
+
+
+/datum/gas_reaction/bzformation/react(datum/gas_mixture/air)
+	var/list/cached_gases = air.gases
+	var/temperature = air.temperature
+	var/pressure = air.return_pressure()
+
+	var/old_heat_capacity = air.heat_capacity()
+	var/reaction_efficency = 1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],1)))
+	var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED
+
+	ASSERT_GAS(/datum/gas/bz,air)
+	cached_gases[/datum/gas/bz][MOLES]+= reaction_efficency
+	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 2*reaction_efficency,0)
+	cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - reaction_efficency,0)
+
+
+	if(energy_released > 0)
+		var/new_heat_capacity = air.heat_capacity()
+		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			air.temperature = max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)
+		return REACTING
+
+/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
+	priority = 5
+	name = "Stimulum formation"
+	id = "stimformation"
+/datum/gas_reaction/stimformation/init_reqs()
+	min_requirements = list(
+		/datum/gas/tritium = 30,
+		/datum/gas/plasma = 10,
+		/datum/gas/bz = 20,
+		/datum/gas/brown_gas = 30,
+		"TEMP" = STIMULUM_HEAT_SCALE/2)
+
+/datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
+	var/list/cached_gases = air.gases
+
+	var/old_heat_capacity = air.heat_capacity()
+	var/heat_scale = air.temperature/STIMULUM_HEAT_SCALE
+	var/stim_energy_change
+	stim_energy_change =heat_scale + (STIMULUM_FIRST_RISE(heat_scale**2)) - (STIMULUM_FIRST_DROP(heat_scale**3)) + (STIMULUM_SECOND_RISE(heat_scale**4)) - (STIMULUM_ABSOLUTE_DROP(heat_scale**5))
+
+	ASSERT_GAS(/datum/gas/stimulum,air)
+	cached_gases[/datum/gas/stimulum][MOLES]+= heat_scale/10
+	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- heat_scale,0)
+	cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES]- heat_scale,0)
+	cached_gases[/datum/gas/brown_gas][MOLES] = max(cached_gases[/datum/gas/brown_gas][MOLES]- heat_scale,0)
+
+	if(stim_energy_change)
+		var/new_heat_capacity = air.heat_capacity()
+		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			air.temperature = max(((air.temperature*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)
+		return REACTING
+
+/datum/gas_reaction/nobliumformation //Hyper-Nobelium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
+	priority = 6
+	name = "Hyper-Noblium condensation"
+	id = "nobformation"
+
+/datum/gas_reaction/nobliumformation/init_reqs()
+	min_requirements = list(
+		/datum/gas/nitrogen = 10,
+		/datum/gas/tritium = 5,
+		"TEMP" = 5000000)
+
+/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
+	var/list/cached_gases = air.gases
+	air.assert_gases(/datum/gas/hypernoblium,/datum/gas/bz)
+	var/old_heat_capacity = air.heat_capacity()
+	var/nob_formed = (cached_gases[/datum/gas/nitrogen][MOLES]*cached_gases[/datum/gas/tritium][MOLES])/100
+	var/energy_taken = nob_formed*(10000000/(max(cached_gases[/datum/gas/bz][MOLES],1)))
+	cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 10*nob_formed,0)
+	cached_gases[/datum/gas/nitrogen][MOLES] = max(cached_gases[/datum/gas/nitrogen][MOLES]- 20*nob_formed,0)
+	cached_gases[/datum/gas/hypernoblium][MOLES]+= nob_formed
+
+
+	if (nob_formed)
+		var/new_heat_capacity = air.heat_capacity()
+		if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+			air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
 #undef REACTING
 #undef NO_REACTION
+#undef OXYGEN_BURN_RATE_BASE
+#undef PLASMA_BURN_RATE_DELTA
+#undef PLASMA_UPPER_TEMPERATURE
+#undef PLASMA_MINIMUM_OXYGEN_NEEDED
+#undef PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO
+#undef PLASMA_OXYGEN_FULLBURN
+#undef FIRE_CARBON_ENERGY_RELEASED
+#undef FIRE_PLASMA_ENERGY_RELEASED
+#undef WATER_VAPOR_FREEZE
+#undef BROWNS_FORMATION_ENERGY
+#undef TRITIUM_BURN_OXY_FACTOR
+#undef SUPER_SATURATION_THRESHOLD
+#undef STIMULUM_HEAT_SCALE
+#undef STIMULUM_FIRST_RISE
+#undef STIMULUM_FIRST_DROP
+#undef STIMULUM_SECOND_RISE
+#undef STIMULUM_ABSOLUTE_DROP
+#undef REACTION_OPPRESSION_THRESHOLD
+#undef PLASMA_BINDING_ENERGY
+#undef MAX_CATALYST_EFFICENCY
+#undef PLASMA_FUSED_COEFFICENT
+#undef CATALYST_COEFFICENT
+#undef FUSION_PURITY_THRESHOLD
+#undef FUSION_HEAT_DROPOFF

code/modules/atmospherics/machinery/airalarm.dm

@@ -5,10 +5,10 @@
 	var/max2
 
 /datum/tlv/New(min2 as num, min1 as num, max1 as num, max2 as num)
-	src.min2 = min2
-	src.min1 = min1
-	src.max1 = max1
-	src.max2 = max2
+	if(min2) src.min2 = min2
+	if(min1) src.min1 = min1
+	if(max1) src.max1 = max1
+	if(max2) src.max2 = max2
 
 /datum/tlv/proc/get_danger_level(val as num)
 	if(max2 != -1 && val >= max2)
@@ -21,13 +21,25 @@
 		return 1
 	return 0
 
+/datum/tlv/no_checks
+	min2 = -1
+	min1 = -1
+	max1 = -1
+	max2 = -1
+
+/datum/tlv/dangerous
+	min2 = -1
+	min1 = -1
+	max1 = 0.2
+	max2 = 0.5
+
 /obj/item/electronics/airalarm
 	name = "air alarm electronics"
 	icon_state = "airalarm_electronics"
 
 /obj/item/wallframe/airalarm
 	name = "air alarm frame"
-	desc = "Used for building Air Alarms"
+	desc = "Used for building Air Alarms."
 	icon = 'icons/obj/monitors.dmi'
 	icon_state = "alarm_bitem"
 	result_path = /obj/machinery/airalarm
@@ -78,25 +90,33 @@
 		/datum/gas/oxygen			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
 		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
 		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
-		/datum/gas/plasma			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		/datum/gas/bz				= new/datum/tlv(-1, -1, 0.2, 0.5),
-		/datum/gas/freon			= new/datum/tlv(-1, -1, 0.2, 0.5),
-		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, 0.2, 0.5)
+		/datum/gas/plasma			= new/datum/tlv/dangerous, // Partial pressure, kpa
+		/datum/gas/nitrous_oxide	= new/datum/tlv/dangerous, // Partial pressure, kpa
+		/datum/gas/bz				= new/datum/tlv/dangerous,
+		/datum/gas/hypernoblium			= new/datum/tlv/dangerous,
+		/datum/gas/water_vapor		= new/datum/tlv/dangerous,
+		/datum/gas/tritium			= new/datum/tlv/dangerous,
+		/datum/gas/stimulum			= new/datum/tlv/dangerous,
+		/datum/gas/brown_gas			= new/datum/tlv/dangerous,
+		/datum/gas/pluoxium			= new/datum/tlv/dangerous
 	)
 
 /obj/machinery/airalarm/server // No checks here.
 	TLV = list(
-		"pressure"					= new/datum/tlv(-1, -1, -1, -1),
-		"temperature"				= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/oxygen			= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/plasma			= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/bz				= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/freon			= new/datum/tlv(-1, -1, -1, -1),
-		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, -1, -1)
+		"pressure"					= new/datum/tlv/no_checks,
+		"temperature"				= new/datum/tlv/no_checks,
+		/datum/gas/oxygen			= new/datum/tlv/no_checks,
+		/datum/gas/nitrogen			= new/datum/tlv/no_checks,
+		/datum/gas/carbon_dioxide	= new/datum/tlv/no_checks,
+		/datum/gas/plasma			= new/datum/tlv/no_checks,
+		/datum/gas/nitrous_oxide	= new/datum/tlv/no_checks,
+		/datum/gas/bz				= new/datum/tlv/no_checks,
+		/datum/gas/hypernoblium			= new/datum/tlv/no_checks,
+		/datum/gas/water_vapor		= new/datum/tlv/no_checks,
+		/datum/gas/tritium			= new/datum/tlv/no_checks,
+		/datum/gas/stimulum			= new/datum/tlv/no_checks,
+		/datum/gas/brown_gas			= new/datum/tlv/no_checks,
+		/datum/gas/pluoxium			= new/datum/tlv/no_checks
 	)
 
 /obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
@@ -106,11 +126,15 @@
 		/datum/gas/oxygen			= new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
 		/datum/gas/nitrogen			= new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
 		/datum/gas/carbon_dioxide	= new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
-		/datum/gas/plasma			= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		/datum/gas/nitrous_oxide	= new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
-		/datum/gas/bz				= new/datum/tlv(-1, -1, 0.2, 0.5),
-		/datum/gas/freon			= new/datum/tlv(-1, -1, 0.2, 0.5),
-		/datum/gas/water_vapor		= new/datum/tlv(-1, -1, 0.2, 0.5)
+		/datum/gas/plasma			= new/datum/tlv/dangerous, // Partial pressure, kpa
+		/datum/gas/nitrous_oxide	= new/datum/tlv/dangerous, // Partial pressure, kpa
+		/datum/gas/bz				= new/datum/tlv/dangerous,
+		/datum/gas/hypernoblium		= new/datum/tlv/dangerous,
+		/datum/gas/water_vapor		= new/datum/tlv/dangerous,
+		/datum/gas/tritium			= new/datum/tlv/dangerous,
+		/datum/gas/stimulum			= new/datum/tlv/dangerous,
+		/datum/gas/brown_gas		= new/datum/tlv/dangerous,
+		/datum/gas/pluoxium			= new/datum/tlv/dangerous
 	)
 
 /obj/machinery/airalarm/engine
@@ -256,8 +280,7 @@
 					"filter_co2"			= info["filter_co2"],
 					"filter_toxins"			= info["filter_toxins"],
 					"filter_n2o"			= info["filter_n2o"],
-					"filter_bz"				= info["filter_bz"],
-					"filter_freon"			= info["filter_freon"],
+					"filter_rare"			= info["filter_rare"],
 					"filter_water_vapor"	= info["filter_water_vapor"]
 				))
 		data["mode"] = mode
@@ -314,7 +337,7 @@
 			if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN))
 				locked = !locked
 				. = TRUE
-		if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "bz_scrub", "freon_scrub","water_vapor_scrub", "widenet", "scrubbing")
+		if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "rare_scrub","water_vapor_scrub", "widenet", "scrubbing")
 			send_signal(device_id, list("[action]" = text2num(params["val"])))
 			. = TRUE
 		if("excheck")
@@ -433,8 +456,7 @@
 					"co2_scrub" = 1,
 					"tox_scrub" = 0,
 					"n2o_scrub" = 0,
-					"bz_scrub"	= 0,
-					"freon_scrub"= 0,
+					"rare_scrub"= 0,
 					"water_vapor_scrub"= 0,
 					"scrubbing" = 1,
 					"widenet" = 0,
@@ -452,8 +474,7 @@
 					"co2_scrub" = 1,
 					"tox_scrub" = 1,
 					"n2o_scrub" = 1,
-					"bz_scrub"	= 1,
-					"freon_scrub"= 1,
+					"rare_scrub"= 1,
 					"water_vapor_scrub"= 1,
 					"scrubbing" = 1,
 					"widenet" = 1,
@@ -484,8 +505,7 @@
 					"co2_scrub" = 1,
 					"tox_scrub" = 0,
 					"n2o_scrub" = 0,
-					"bz_scrub"	= 0,
-					"freon_scrub"= 0,
+					"rare_scrub"= 0,
 					"water_vapor_scrub"= 0,
 					"scrubbing" = 1,
 					"widenet" = 0,

code/modules/atmospherics/machinery/atmosmachinery.dm

@@ -36,6 +36,9 @@ Pipelines + Other Objects -> Pipe network
 	var/device_type = 0
 	var/list/obj/machinery/atmospherics/nodes
 
+	var/construction_type
+	var/pipe_state //icon_state as a pipe item
+
 /obj/machinery/atmospherics/examine(mob/user)
 	..()
 	if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user))
@@ -239,7 +242,7 @@ Pipelines + Other Objects -> Pipe network
 /obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
 	if(!(flags_1 & NODECONSTRUCT_1))
 		if(can_unwrench)
-			var/obj/item/pipe/stored = new(loc, piping_layer, dir, src)
+			var/obj/item/pipe/stored = new construction_type(loc, null, dir, src)
 			stored.setPipingLayer(piping_layer)
 			if(!disassembled)
 				stored.obj_integrity = stored.max_integrity * 0.5
@@ -271,7 +274,7 @@ Pipelines + Other Objects -> Pipe network
 		if(unconnected & direction)
 			underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
 
-/obj/machinery/atmospherics/on_construction(pipe_type, obj_color, set_layer)
+/obj/machinery/atmospherics/on_construction(obj_color, set_layer)
 	if(can_unwrench)
 		add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
 		pipe_color = obj_color

code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm

@@ -21,6 +21,9 @@ Passive gate is similar to the regular pump except:
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+	construction_type = /obj/item/pipe/directional
+	pipe_state = "passivegate"
+
 /obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -167,4 +170,3 @@ Passive gate is similar to the regular pump except:
 	if(. && on)
 		to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		return FALSE
-

code/modules/atmospherics/machinery/components/binary_devices/pump.dm

@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+	construction_type = /obj/item/pipe/directional
+	pipe_state = "pump"
+
 /obj/machinery/atmospherics/components/binary/pump/on
 	on = TRUE
 

code/modules/atmospherics/machinery/components/binary_devices/valve.dm

@@ -15,6 +15,9 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
 	var/open = FALSE
 	var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes()
 
+	construction_type = /obj/item/pipe/binary
+	pipe_state = "mvalve"
+
 /obj/machinery/atmospherics/components/binary/valve/open
 	open = TRUE
 
@@ -65,6 +68,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
 	desc = "A digitally controlled valve."
 	icon_state = "dvalve_map"
 	valve_type = "d"
+	pipe_state = "dvalve"
 
 /obj/machinery/atmospherics/components/binary/valve/digital/attack_ai(mob/user)
 	return src.attack_hand(user)

code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm

@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
 	var/id = null
 	var/datum/radio_frequency/radio_connection
 
+	construction_type = /obj/item/pipe/directional
+	pipe_state = "volumepump"
+
 /obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()

code/modules/atmospherics/machinery/components/trinary_devices/filter.dm

@@ -10,6 +10,9 @@
 	var/frequency = 0
 	var/datum/radio_frequency/radio_connection
 
+	construction_type = /obj/item/pipe/trinary/flippable
+	pipe_state = "filter"
+
 /obj/machinery/atmospherics/components/trinary/filter/flipped
 	icon_state = "filter_off_f"
 	flipped = TRUE

code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm

@@ -12,6 +12,9 @@
 	var/node1_concentration = 0.5
 	var/node2_concentration = 0.5
 
+	construction_type = /obj/item/pipe/trinary/flippable
+	pipe_state = "mixer"
+
 	//node 3 is the outlet, nodes 1 & 2 are intakes
 
 /obj/machinery/atmospherics/components/trinary/mixer/flipped
@@ -171,4 +174,3 @@
 	if(. && on && is_operational())
 		to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		return FALSE
-

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -294,10 +294,15 @@
 		var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
 		log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
 		return
-	if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-o", "pod-off", I) || exchange_parts(user, I)) \
+	if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I) || exchange_parts(user, I)) \
 		|| default_change_direction_wrench(user, I) \
 		|| default_pry_open(I) \
 		|| default_deconstruction_crowbar(I))
+		update_icon()
+		return
+	else if(istype(I, /obj/item/screwdriver))
+		to_chat(user, "<span class='notice'>You can't access the maintenance panel while the pod is " \
+		+ (on ? "active" : (occupant ? "full" : "open")) + ".</span>")
 		return
 	return ..()
 

code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm

@@ -3,7 +3,7 @@
 	icon_state = "he_intact"
 
 	name = "heat exchanger"
-	desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
+	desc = "Exchanges heat between two input gases. Set up for fast heat transfer."
 
 	can_unwrench = TRUE
 
@@ -12,6 +12,8 @@
 	var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null
 	var/update_cycle
 
+	pipe_state = "heunary"
+
 /obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon()
 	if(NODE1)
 		icon_state = "he_intact"

code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm

@@ -1,6 +1,6 @@
 /obj/machinery/atmospherics/components/unary/outlet_injector
 	name = "air injector"
-	desc = "Has a valve and pump attached to it"
+	desc = "Has a valve and pump attached to it."
 	icon_state = "inje_map"
 	use_power = IDLE_POWER_USE
 	can_unwrench = TRUE
@@ -18,6 +18,8 @@
 	level = 1
 	layer = GAS_SCRUBBER_LAYER
 
+	pipe_state = "injector"
+
 /obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
 	SSradio.remove_object(src,frequency)
 	return ..()
@@ -188,4 +190,3 @@
 	if(. && on && is_operational())
 		to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		return FALSE
-

code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm

@@ -3,7 +3,7 @@
 	icon_state = "o2gen_map"
 
 	name = "oxygen generator"
-	desc = "Generates oxygen"
+	desc = "Generates oxygen."
 
 	dir = SOUTH
 	initialize_directions = SOUTH

code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm

@@ -9,6 +9,7 @@
 	level = 0
 	layer = GAS_FILTER_LAYER
 	pipe_flags = PIPING_ONE_PER_TURF
+	pipe_state = "connector"
 
 /obj/machinery/atmospherics/components/unary/portables_connector/New()
 	..()

code/modules/atmospherics/machinery/components/unary_devices/tank.dm

@@ -28,9 +28,6 @@
 	icon_state = "orange"
 	gas_type = /datum/gas/plasma
 
-/obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b
-	icon_state = "orange_2"
-	gas_type = /datum/gas/oxygen_agent_b
 
 /obj/machinery/atmospherics/components/unary/tank/oxygen
 	icon_state = "blue"

code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm

@@ -4,6 +4,7 @@
 	initialize_directions = SOUTH
 	device_type = UNARY
 	pipe_flags = PIPING_ONE_PER_TURF
+	construction_type = /obj/item/pipe/directional
 
 /obj/machinery/atmospherics/components/unary/SetInitDirections()
 	initialize_directions = dir

code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm

@@ -31,6 +31,8 @@
 	var/radio_filter_out
 	var/radio_filter_in
 
+	pipe_state = "uvent"
+
 /obj/machinery/atmospherics/components/unary/vent_pump/on
 	on = TRUE
 	icon_state = "vent_map_on"

code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm

@@ -20,8 +20,7 @@
 	var/scrub_CO2 = TRUE
 	var/scrub_Toxins = FALSE
 	var/scrub_N2O = FALSE
-	var/scrub_BZ = FALSE
-	var/scrub_Freon = FALSE
+	var/scrub_Rare = FALSE
 	var/scrub_WaterVapor = FALSE
 
 
@@ -34,6 +33,8 @@
 	var/radio_filter_out
 	var/radio_filter_in
 
+	pipe_state = "scrubber"
+
 /obj/machinery/atmospherics/components/unary/vent_scrubber/New()
 	..()
 	if(!id_tag)
@@ -70,9 +71,7 @@
 			amount += idle_power_usage
 		if(scrub_N2O)
 			amount += idle_power_usage
-		if(scrub_BZ)
-			amount += idle_power_usage
-		if(scrub_Freon)
+		if(scrub_Rare)
 			amount += idle_power_usage
 		if(scrub_WaterVapor)
 			amount += idle_power_usage
@@ -125,8 +124,7 @@
 		"filter_co2" = scrub_CO2,
 		"filter_toxins" = scrub_Toxins,
 		"filter_n2o" = scrub_N2O,
-		"filter_bz" = scrub_BZ,
-		"filter_freon" = scrub_Freon,
+		"filter_rare" =scrub_Rare,
 		"filter_water_vapor" = scrub_WaterVapor,
 		"sigtype" = "status"
 	)
@@ -198,37 +196,52 @@
 			filtered_out.temperature = removed.temperature
 
 			if(scrub_Toxins && removed_gases[/datum/gas/plasma])
-				ADD_GAS(/datum/gas/plasma, filtered_out.gases)
+				ADD_GAS(/datum/gas/plasma, filtered_gases)
 				filtered_gases[/datum/gas/plasma][MOLES] = removed_gases[/datum/gas/plasma][MOLES]
 				removed_gases[/datum/gas/plasma][MOLES] = 0
 
 			if(scrub_CO2 && removed_gases[/datum/gas/carbon_dioxide])
-				ADD_GAS(/datum/gas/carbon_dioxide, filtered_out.gases)
+				ADD_GAS(/datum/gas/carbon_dioxide, filtered_gases)
 				filtered_gases[/datum/gas/carbon_dioxide][MOLES] = removed_gases[/datum/gas/carbon_dioxide][MOLES]
 				removed_gases[/datum/gas/carbon_dioxide][MOLES] = 0
 
-			if(removed_gases[/datum/gas/oxygen_agent_b])
-				ADD_GAS(/datum/gas/oxygen_agent_b, filtered_out.gases)
-				filtered_gases[/datum/gas/oxygen_agent_b][MOLES] = removed_gases[/datum/gas/oxygen_agent_b][MOLES]
-				removed_gases[/datum/gas/oxygen_agent_b][MOLES] = 0
-
 			if(scrub_N2O && removed_gases[/datum/gas/nitrous_oxide])
-				ADD_GAS(/datum/gas/nitrous_oxide, filtered_out.gases)
+				ADD_GAS(/datum/gas/nitrous_oxide, filtered_gases)
 				filtered_gases[/datum/gas/nitrous_oxide][MOLES] = removed_gases[/datum/gas/nitrous_oxide][MOLES]
 				removed_gases[/datum/gas/nitrous_oxide][MOLES] = 0
 
-			if(scrub_BZ && removed_gases[/datum/gas/bz])
-				ADD_GAS(/datum/gas/bz, filtered_out.gases)
+			if(scrub_Rare && removed_gases[/datum/gas/bz])
+				ADD_GAS(/datum/gas/bz, filtered_gases)
 				filtered_gases[/datum/gas/bz][MOLES] = removed_gases[/datum/gas/bz][MOLES]
 				removed_gases[/datum/gas/bz][MOLES] = 0
 
-			if(scrub_Freon && removed_gases[/datum/gas/freon])
-				ADD_GAS(/datum/gas/freon, filtered_out.gases)
-				filtered_gases[/datum/gas/freon][MOLES] = removed_gases[/datum/gas/freon][MOLES]
-				removed_gases[/datum/gas/freon][MOLES] = 0
+			if(scrub_Rare && removed_gases[/datum/gas/hypernoblium])
+				ADD_GAS(/datum/gas/hypernoblium, filtered_gases)
+				filtered_gases[/datum/gas/hypernoblium][MOLES] = removed_gases[/datum/gas/hypernoblium][MOLES]
+				removed_gases[/datum/gas/hypernoblium][MOLES] = 0
+
+			if(scrub_Rare && removed_gases[/datum/gas/stimulum])
+				ADD_GAS(/datum/gas/stimulum, filtered_gases)
+				filtered_gases[/datum/gas/stimulum][MOLES] = removed_gases[/datum/gas/stimulum][MOLES]
+				removed_gases[/datum/gas/stimulum][MOLES] = 0
+
+			if(scrub_Rare && removed_gases[/datum/gas/pluoxium])
+				ADD_GAS(/datum/gas/pluoxium, filtered_gases)
+				filtered_gases[/datum/gas/pluoxium][MOLES] = removed_gases[/datum/gas/pluoxium][MOLES]
+				removed_gases[/datum/gas/pluoxium][MOLES] = 0
+
+			if(scrub_Rare && removed_gases[/datum/gas/brown_gas])
+				ADD_GAS(/datum/gas/brown_gas, filtered_gases)
+				filtered_gases[/datum/gas/brown_gas][MOLES] = removed_gases[/datum/gas/brown_gas][MOLES]
+				removed_gases[/datum/gas/brown_gas][MOLES] = 0
+
+			if(scrub_Rare && removed_gases[/datum/gas/tritium])
+				ADD_GAS(/datum/gas/tritium, filtered_gases)
+				filtered_gases[/datum/gas/tritium][MOLES] = removed_gases[/datum/gas/tritium][MOLES]
+				removed_gases[/datum/gas/tritium][MOLES] = 0
 
 			if(scrub_WaterVapor && removed_gases[/datum/gas/water_vapor])
-				ADD_GAS(/datum/gas/water_vapor, filtered_out.gases)
+				ADD_GAS(/datum/gas/water_vapor, filtered_gases)
 				filtered_gases[/datum/gas/water_vapor][MOLES] = removed_gases[/datum/gas/water_vapor][MOLES]
 				removed_gases[/datum/gas/water_vapor][MOLES] = 0
 
@@ -303,15 +316,10 @@
 	if("toggle_n2o_scrub" in signal.data)
 		scrub_N2O = !scrub_N2O
 
-	if("bz_scrub" in signal.data)
-		scrub_BZ = text2num(signal.data["bz_scrub"])
-	if("toggle_bz_scrub" in signal.data)
-		scrub_BZ = !scrub_BZ
-
-	if("freon_scrub" in signal.data)
-		scrub_Freon = text2num(signal.data["freon_scrub"])
-	if("toggle_freon_scrub" in signal.data)
-		scrub_Freon = !scrub_Freon
+	if("rare_scrub" in signal.data)
+		scrub_Rare = text2num(signal.data["rare_scrub"])
+	if("toggle_rare_scrub" in signal.data)
+		scrub_Rare = !scrub_Rare
 
 	if("water_vapor_scrub" in signal.data)
 		scrub_WaterVapor = text2num(signal.data["water_vapor_scrub"])

code/modules/atmospherics/machinery/other/miner.dm

@@ -173,21 +173,6 @@
 	overlay_color = "#FAFF00"
 	spawn_id = /datum/gas/bz
 
-/obj/machinery/atmospherics/miner/freon
-	name = "\improper Freon Gas Miner"
-	overlay_color = "#00FFE5"
-	spawn_id = /datum/gas/freon
-
-/obj/machinery/atmospherics/miner/volatile_fuel
-	name = "\improper Volatile Fuel Gas Miner"
-	overlay_color = "#564040"
-	spawn_id = /datum/gas/volatile_fuel
-
-/obj/machinery/atmospherics/miner/agent_b
-	name = "\improper Agent B Gas Miner"
-	overlay_color = "#E81E24"
-	spawn_id = /datum/gas/oxygen_agent_b
-
 /obj/machinery/atmospherics/miner/water_vapor
 	name = "\improper Water Vapor Gas Miner"
 	overlay_color = "#99928E"

code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm

@@ -3,7 +3,7 @@
 	icon_state = "intact"
 
 	name = "junction"
-	desc = "A one meter junction that connects regular and heat-exchanging pipe"
+	desc = "A one meter junction that connects regular and heat-exchanging pipe."
 
 	minimum_temperature_difference = 300
 	thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
@@ -13,6 +13,9 @@
 	initialize_directions_he = SOUTH
 
 	device_type = BINARY
+	
+	construction_type = /obj/item/pipe/directional
+	pipe_state = "junction"
 
 /obj/machinery/atmospherics/pipe/heat_exchanging/junction/SetInitDirections()
 	switch(dir)
@@ -43,4 +46,4 @@
 				return 0
 			init_dir = H.initialize_directions_he
 	if(init_dir & get_dir(target,src))
-		return 1
+		return 1

code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm

@@ -3,13 +3,16 @@
 	icon_state = "manifold"
 
 	name = "pipe manifold"
-	desc = "A manifold composed of regular pipes"
+	desc = "A manifold composed of regular pipes."
 
 	dir = SOUTH
 	initialize_directions_he = EAST|NORTH|WEST
 
 	device_type = TRINARY
 
+	construction_type = /obj/item/pipe/trinary
+	pipe_state = "he_manifold"
+
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold/SetInitDirections()
 	switch(dir)
 		if(NORTH)
@@ -38,12 +41,15 @@
 	icon_state = "manifold4w"
 
 	name = "4-way pipe manifold"
-	desc = "A manifold composed of heat-exchanging pipes"
+	desc = "A manifold composed of heat-exchanging pipes."
 
 	initialize_directions_he = NORTH|SOUTH|EAST|WEST
 
 	device_type = QUATERNARY
 
+	construction_type = /obj/item/pipe/quaternary
+	pipe_state = "he_manifold4w"
+
 /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections()
 	initialize_directions_he = initial(initialize_directions_he)
 
@@ -57,4 +63,4 @@
 	//Add non-broken pieces
 	for(DEVICE_TYPE_LOOP)
 		if(NODE_I)
-			add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))
+			add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))

code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm

@@ -2,13 +2,16 @@
 	icon_state = "intact"
 
 	name = "pipe"
-	desc = "A one meter section of heat-exchanging pipe"
+	desc = "A one meter section of heat-exchanging pipe."
 
 	dir = SOUTH
 	initialize_directions_he = SOUTH|NORTH
 
 	device_type = BINARY
 
+	construction_type = /obj/item/pipe/binary/bendable
+	pipe_state = "he"
+
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/SetInitDirections()
 	if(dir in GLOB.diagonals)
 		initialize_directions_he = dir
@@ -30,4 +33,4 @@
 
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_icon()
 	normalize_dir()
-	..()
+	..()

code/modules/atmospherics/machinery/pipes/layermanifold.dm

@@ -11,6 +11,8 @@
 	volume = 260
 	var/list/front_nodes
 	var/list/back_nodes
+	construction_type = /obj/item/pipe/binary
+	pipe_state = "layer_manifold"
 
 /obj/machinery/atmospherics/pipe/layer_manifold/Initialize()
 	front_nodes = list()
@@ -31,17 +33,7 @@
 		A.build_network()
 
 /obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes()
-	var/list/obj/machinery/atmospherics/all_connected = list()
-	for(var/obj/machinery/atmospherics/I in front_nodes)
-		all_connected[I] = I
-	for(var/obj/machinery/atmospherics/I in back_nodes)
-		all_connected[I] = I
-	for(var/obj/machinery/atmospherics/I in nodes)
-		all_connected[I] = I
-	var/list/obj/machinery/atmospherics/returnlist = list()
-	for(var/obj/machinery/atmospherics/A in all_connected)
-		returnlist += all_connected[A]
-	return returnlist
+	return front_nodes + back_nodes + nodes
 
 /obj/machinery/atmospherics/pipe/layer_manifold/update_icon()	//HEAVILY WIP FOR UPDATE ICONS!!
 	layer = (initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE))	//This is above everything else.

code/modules/atmospherics/machinery/pipes/manifold.dm

@@ -6,13 +6,16 @@
 	icon_state = "manifold"
 
 	name = "pipe manifold"
-	desc = "A manifold composed of regular pipes"
+	desc = "A manifold composed of regular pipes."
 
 	dir = SOUTH
 	initialize_directions = EAST|NORTH|WEST
 
 	device_type = TRINARY
 
+	construction_type = /obj/item/pipe/trinary
+	pipe_state = "manifold"
+
 /obj/machinery/atmospherics/pipe/manifold/SetInitDirections()
 	switch(dir)
 		if(NORTH)
@@ -168,4 +171,4 @@
 	layer = GAS_PIPE_VISIBLE_LAYER
 
 /obj/machinery/atmospherics/pipe/manifold/brown/hidden
-	level = PIPE_HIDDEN_LEVEL
+	level = PIPE_HIDDEN_LEVEL

code/modules/atmospherics/machinery/pipes/manifold4w.dm

@@ -6,12 +6,15 @@
 	icon_state = "manifold4w"
 
 	name = "4-way pipe manifold"
-	desc = "A manifold composed of regular pipes"
+	desc = "A manifold composed of regular pipes."
 
 	initialize_directions = NORTH|SOUTH|EAST|WEST
 
 	device_type = QUATERNARY
 
+	construction_type = /obj/item/pipe/quaternary
+	pipe_state = "manifold4w"
+
 /obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections()
 	initialize_directions = initial(initialize_directions)
 
@@ -160,4 +163,4 @@
 	layer = GAS_PIPE_VISIBLE_LAYER
 
 /obj/machinery/atmospherics/pipe/manifold4w/brown/hidden
-	level = PIPE_HIDDEN_LEVEL
+	level = PIPE_HIDDEN_LEVEL

code/modules/atmospherics/machinery/pipes/simple.dm

@@ -16,6 +16,9 @@ The regular pipe you see everywhere, including bent ones.
 
 	device_type = BINARY
 
+	construction_type = /obj/item/pipe/binary/bendable
+	pipe_state = "simple"
+
 /obj/machinery/atmospherics/pipe/simple/SetInitDirections()
 	normalize_cardinal_directions()
 	if(dir in GLOB.diagonals)
@@ -158,4 +161,4 @@ The regular pipe you see everywhere, including bent ones.
 	layer = GAS_PIPE_VISIBLE_LAYER
 
 /obj/machinery/atmospherics/pipe/simple/brown/hidden
-	level = PIPE_HIDDEN_LEVEL
+	level = PIPE_HIDDEN_LEVEL

code/modules/atmospherics/machinery/portable/canister.dm

@@ -43,7 +43,6 @@
 		"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
 		"bz" = /obj/machinery/portable_atmospherics/canister/bz,
 		"air" = /obj/machinery/portable_atmospherics/canister/air,
-		"freon" = /obj/machinery/portable_atmospherics/canister/freon,
 		"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
 		"caution" = /obj/machinery/portable_atmospherics/canister,
 	)
@@ -79,11 +78,6 @@
 	icon_state = "orange"
 	gas_type = /datum/gas/plasma
 
-/obj/machinery/portable_atmospherics/canister/agent_b
-	name = "agent b canister"
-	desc = "Oxygen Agent B. You're not quite sure what it does."
-	gas_type = /datum/gas/oxygen_agent_b
-
 /obj/machinery/portable_atmospherics/canister/bz
 	name = "BZ canister"
 	desc = "BZ, a powerful hallucinogenic nerve agent."
@@ -101,12 +95,30 @@
 	desc = "Pre-mixed air."
 	icon_state = "grey"
 
-/obj/machinery/portable_atmospherics/canister/freon
-	name = "freon canister"
-	desc = "Freon. Great for the atmosphere!"
-	icon_state = "freon"
-	gas_type = /datum/gas/freon
-	starter_temp = 120
+/obj/machinery/portable_atmospherics/canister/tritium
+	name = "tritium canister"
+	desc = "Tritium. Inhalation might cause irradiation."
+	gas_type = /datum/gas/tritium
+
+/obj/machinery/portable_atmospherics/canister/nob
+	name = "hyper-noblium canister"
+	desc = "Hyper-Noblium. More noble than all other gases."
+	gas_type = /datum/gas/hypernoblium
+
+/obj/machinery/portable_atmospherics/canister/browns
+	name = "brown gas canister"
+	desc = "Browns gas. Feels great 'til the acid eats your lungs."
+	gas_type = /datum/gas/brown_gas
+
+/obj/machinery/portable_atmospherics/canister/stimulum
+	name = "stimulum canister"
+	desc = "Stimulum. High energy gas, high energy people."
+	gas_type = /datum/gas/stimulum
+
+/obj/machinery/portable_atmospherics/canister/pluoxium
+	name = "pluoxium canister"
+	desc = "Pluoxium. Like oxygen, but more bang for your buck."
+	gas_type = /datum/gas/pluoxium
 
 /obj/machinery/portable_atmospherics/canister/water_vapor
 	name = "water vapor canister"
@@ -115,6 +127,7 @@
 	gas_type = /datum/gas/water_vapor
 	filled = 1
 
+
 /obj/machinery/portable_atmospherics/canister/proc/get_time_left()
 	if(timing)
 		. = round(max(0, valve_timer - world.time) / 10, 1)
@@ -402,7 +415,7 @@
 						var/gas = air_contents.gases[id]
 						if(!gas[GAS_META][META_GAS_DANGER])
 							continue
-						if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_PLASMA_VISIBLE)) //if moles_visible is undefined, default to plasma visibility
+						if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility
 							danger[gas[GAS_META][META_GAS_NAME]] = gas[MOLES] //ex. "plasma" = 20
 
 					if(danger.len)

code/modules/atmospherics/machinery/portable/scrubber.dm

@@ -7,7 +7,7 @@
 	var/volume_rate = 1000
 	volume = 1000
 
-	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/oxygen_agent_b, /datum/gas/bz, /datum/gas/freon, /datum/gas/water_vapor)
+	var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/brown_gas, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
 
 /obj/machinery/portable_atmospherics/scrubber/Destroy()
 	var/turf/T = get_turf(src)

code/modules/awaymissions/mission_code/Academy.dm

@@ -84,7 +84,7 @@
 
 /obj/structure/academy_wizard_spawner
 	name = "Academy Defensive System"
-	desc = "Made by Abjuration Inc"
+	desc = "Made by Abjuration, Inc."
 	icon = 'icons/obj/cult.dmi'
 	icon_state = "forge"
 	anchored = TRUE

code/modules/awaymissions/mission_code/Cabin.dm

@@ -18,7 +18,7 @@
 
 /obj/structure/firepit
 	name = "firepit"
-	desc = "warm and toasty"
+	desc = "Warm and toasty."
 	icon = 'icons/obj/fireplace.dmi'
 	icon_state = "firepit-active"
 	density = FALSE

code/modules/awaymissions/mission_code/challenge.dm

@@ -17,7 +17,7 @@
 
 /obj/machinery/power/emitter/energycannon
 	name = "Energy Cannon"
-	desc = "A heavy duty industrial laser"
+	desc = "A heavy duty industrial laser."
 	icon = 'icons/obj/singularity.dmi'
 	icon_state = "emitter"
 	anchored = TRUE

code/modules/awaymissions/mission_code/snowdin.dm

@@ -40,7 +40,7 @@
 /obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice
 	name = "scribbled note"
 	info = {"The gateway has been inactive for months, engineers think it's due to the recent drop in tempature fucking with the
-	circuitry or something. Without a constant supply of resources from central command, our stock is getting awfully low. Some of the security members have taken to
+	circuitry or something. Without a constant supply of resources from Central Command, our stock is getting awfully low. Some of the security members have taken to
 	using the sparse rifle ammo left to hunting some of the wildlife to try and keep our food supply from emptying. God forbid if the heating goes out, I don't want to
 	die as a fucking popsicle down here."}
 
@@ -65,9 +65,9 @@
 	The colder months are finally hitting, some of the machinery seems to be having trouble starting up sometimes. Central sent some portable heaters to help keep the airlocks from
 	freezing shut along with a couple storage crates with supplies. Nothing on the radio so far, what the hell do they even expect to hear down here, anyway?<br><br><b>September 15th</b>
 	<br>Another supply shipment through the gateway, they've sent some heavier sets of clothes for the coming winter months. Central said they might encounter issues with shipments
-	during December to Feburary, so we should try to be frugal with the next shipment.<br><br><b>November 20th</b><br>Final shipment from central for the next few months. Going outside
+	during December to Feburary, so we should try to be frugal with the next shipment.<br><br><b>November 20th</b><br>Final shipment from Central for the next few months. Going outside
 	for more than 10-15 minutes without losing feeling in your fingers is difficult. We've finally gotten a signal on the radio, it's mostly some weird static though. One of the researchers is trying to decypher it.
-	<br><br><b>December 10th</b><br>Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from central before investigating.<br><br>
+	<br><br><b>December 10th</b><br>Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from Central before investigating.<br><br>
 	<i>The rest of the paper seems to be a mixture of scribbles and smudged ink.</i>"}
 
 /obj/item/paper/fluff/awaymissions/snowdin/log2
@@ -85,7 +85,7 @@
 	info = {"You have been assigned a position on a listening outpost. Here you'll be watching over several crewmembers assigned to watching signals of the general area.
 	As not much is expected in terms of issues, we've only assigned one guard per outpost. Crewmembers are expected to keep to their regulated work schedules and may be
 	disciplined properly if found slacking. Food hoarding is heavily discouraged as all outposts will be sharing from the same shipment every 2-3 months. Hoarding of supplies
-	should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to central and dealt with swiftly. You're here to secure and protect
+	should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to Central and dealt with swiftly. You're here to secure and protect
 	Nanotrasen assets, not be a police officer. Do what you must, but make sure it's not messy."}
 
 /obj/item/paper/fluff/awaymissions/snowdin/syndienotice
@@ -199,7 +199,7 @@
 
 /obj/item/clothing/under/syndicate/coldres
 	name = "insulated tactical turtleneck"
-	desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection"
+	desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
 	armor = list(melee = 20, bullet = 10, laser = 0,energy = 5, bomb = 0, bio = 0, rad = 0, fire = 25, acid = 25)
 	cold_protection = CHEST|GROIN|ARMS|LEGS
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT

code/modules/awaymissions/mission_code/stationCollision.dm

@@ -136,18 +136,41 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
 /*
  * Modified Nar-Sie
  */
-/obj/singularity/narsie/mini
+/obj/singularity/narsie/sc_Narsie
 	desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
 	move_self = 0 //Contianed narsie does not move!
 	grav_pull = 0 //Contained narsie does not pull stuff in!
+	var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
 //Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/mini/admin_investigate_setup()
+/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
 	return
 
-/obj/singularity/narsie/mini/process()
+/obj/singularity/narsie/sc_Narsie/process()
 	eat()
 	if(prob(25))
 		mezzer()
 
-/obj/singularity/narsie/mini/ex_act()
+/obj/singularity/narsie/sc_Narsie/consume(atom/A)
+	if(is_type_in_list(A, uneatable))
+		return 0
+	if(isliving(A))
+		var/mob/living/L = A
+		L.gib()
+	else if(istype(A, /obj/))
+		var/obj/O = A
+		O.ex_act(EXPLODE_DEVASTATE)
+		if(O)
+			qdel(O)
+	else if(isturf(A))
+		var/turf/T = A
+		if(T.intact)
+			for(var/obj/O in T.contents)
+				if(O.level != 1)
+					continue
+				if(O.invisibility == INVISIBILITY_MAXIMUM)
+					src.consume(O)
+		T.ChangeTurf(/turf/open/space)
 	return
+
+/obj/singularity/narsie/sc_Narsie/ex_act()
+	return

code/modules/awaymissions/zlevel.dm

@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away
 
 /obj/effect/landmark/awaystart
 	name = "away mission spawn"
-	desc = "Randomly picked away mission spawn points"
+	desc = "Randomly picked away mission spawn points."
 
 /obj/effect/landmark/awaystart/New()
 	GLOB.awaydestinations += src

code/modules/cargo/packs.dm

@@ -937,23 +937,6 @@
 	crate_type = /obj/structure/closet/crate/secure/science
 	dangerous = TRUE
 
-/datum/supply_pack/science/bz_canister
-	name = "BZ Canister"
-	cost = 2000
-	access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
-	contains = list(/obj/machinery/portable_atmospherics/canister/bz)
-	crate_name = "bz canister crate"
-	crate_type = /obj/structure/closet/crate/secure/science
-	dangerous = TRUE
-
-/datum/supply_pack/science/freon_canister
-	name = "Freon Canister"
-	cost = 6000
-	access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
-	contains = list(/obj/machinery/portable_atmospherics/canister/freon)
-	crate_name = "freon canister crate"
-	crate_type = /obj/structure/closet/crate/secure/science
-	dangerous = TRUE
 
 /datum/supply_pack/science/research
 	name = "Machine Prototype Crate"

code/modules/client/preferences.dm

@@ -239,7 +239,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						S["real_name"] >> name
 						if(!name)
 							name = "Character[i]"
-						//if(i!=1) dat += " | "
+						/*if(i!=1)
+							dat += " | " */
 						dat += "<a style='white-space:nowrap;' href='?_src_=prefs;preference=changeslot;num=[i];' [i == default_slot ? "class='linkOn'" : ""]>[name]</a> "
 					dat += "</center>"
 

code/modules/client/preferences_toggles.dm

@@ -391,7 +391,8 @@ GLOBAL_LIST_INIT(ghost_orbits, list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
 	set name = "Show/Hide Radio Chatter"
 	set category = "Preferences"
 	set desc = "Toggle seeing radiochatter from nearby radios and speakers"
-	if(!holder) return
+	if(!holder)
+		return
 	prefs.chat_toggles ^= CHAT_RADIO
 	prefs.save_preferences()
 	to_chat(usr, "You will [(prefs.chat_toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from nearby radios or speakers")

code/modules/client/verbs/looc.dm

@@ -4,12 +4,12 @@
 	set category = "OOC"
 
 	if(GLOB.say_disabled)	//This is here to try to identify lag problems
-		usr << "<span class='danger'> Speech is currently admin-disabled.</span>"
+		to_chat(usr, "<span class='danger'> Speech is currently admin-disabled.</span>")
 		return
 
 	if(!mob)	return
 	if(IsGuestKey(key))
-		src << "Guests may not use OOC."
+		to_chat(src, "Guests may not use OOC.")
 		return
 
 	msg = copytext(sanitize(msg), 1, MAX_MESSAGE_LEN)
@@ -17,23 +17,23 @@
 		return
 
 	if(!(prefs.toggles & CHAT_OOC))
-		src << "<span class='danger'> You have OOC muted.</span>"
+		to_chat(src, "<span class='danger'> You have OOC muted.</span>")
 		return
 
 	if(!holder)
 		if(!GLOB.ooc_allowed)
-			src << "<span class='danger'> OOC is globally muted</span>"
+			to_chat(src, "<span class='danger'> OOC is globally muted</span>")
 			return
 		if(!GLOB.dooc_allowed && (mob.stat == DEAD))
-			usr << "<span class='danger'> OOC for dead mobs has been turned off.</span>"
+			to_chat(usr, "<span class='danger'> OOC for dead mobs has been turned off.</span>")
 			return
 		if(prefs.muted & MUTE_OOC)
-			src << "<span class='danger'> You cannot use OOC (muted).</span>"
+			to_chat(src, "<span class='danger'> You cannot use OOC (muted).</span>")
 			return
 		if(handle_spam_prevention(msg,MUTE_OOC))
 			return
 		if(findtext(msg, "byond://"))
-			src << "<B>Advertising other servers is not allowed.</B>"
+			to_chat(src, "<B>Advertising other servers is not allowed.</B>")
 			log_admin("[key_name(src)] has attempted to advertise in LOOC: [msg]")
 			return
 

code/modules/clothing/clothing.dm

@@ -180,23 +180,7 @@
 		damaged_clothes = 0
 		cut_overlay(damaged_clothes_icons[index], TRUE)
 
-//Glasses
-/obj/item/clothing/glasses
-	name = "glasses"
-	icon = 'icons/obj/clothing/glasses.dmi'
-	w_class = WEIGHT_CLASS_SMALL
-	flags_cover = GLASSESCOVERSEYES
-	slot_flags = SLOT_EYES
-	var/vision_flags = 0
-	var/darkness_view = 2//Base human is 2
-	var/invis_view = SEE_INVISIBLE_LIVING
-	var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
-	var/lighting_alpha
-	var/list/icon/current = list() //the current hud icons
-	var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
-	strip_delay = 20
-	equip_delay_other = 25
-	resistance_flags = 0
+
 /*
 SEE_SELF  // can see self, no matter what
 SEE_MOBS  // can see all mobs, no matter what
@@ -207,455 +191,6 @@ SEE_PIXELS// if an object is located on an unlit area, but some of its pixels ar
 BLIND     // can't see anything
 */
 
-
-//Gloves
-/obj/item/clothing/gloves
-	name = "gloves"
-	gender = PLURAL //Carn: for grammarically correct text-parsing
-	w_class = WEIGHT_CLASS_SMALL
-	icon = 'icons/obj/clothing/gloves.dmi'
-	siemens_coefficient = 0.5
-	body_parts_covered = HANDS
-	slot_flags = SLOT_GLOVES
-	attack_verb = list("challenged")
-	var/transfer_prints = FALSE
-	strip_delay = 20
-	equip_delay_other = 40
-
-
-/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
-
-/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_gloves()
-
-// Called just before an attack_hand(), in mob/UnarmedAttack()
-/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
-	return 0 // return 1 to cancel attack_hand()
-
-//Head
-/obj/item/clothing/head
-	name = "head"
-	icon = 'icons/obj/clothing/hats.dmi'
-	icon_state = "top_hat"
-	item_state = "that"
-	body_parts_covered = HEAD
-	slot_flags = SLOT_HEAD
-	var/blockTracking = 0 //For AI tracking
-	var/can_toggle = null
-	dynamic_hair_suffix = "+generic"
-
-/obj/item/clothing/head/Initialize()
-	. = ..()
-	if(ishuman(loc) && dynamic_hair_suffix)
-		var/mob/living/carbon/human/H = loc
-		H.update_hair()
-
-/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
-
-/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_head()
-
-//Neck
-/obj/item/clothing/neck
-	name = "necklace"
-	icon = 'icons/obj/clothing/neck.dmi'
-	body_parts_covered = NECK
-	slot_flags = SLOT_NECK
-	strip_delay = 40
-	equip_delay_other = 40
-
-/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(body_parts_covered & HEAD)
-			if(damaged_clothes)
-				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
-			if(blood_DNA)
-				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
-
-
-//Mask
-/obj/item/clothing/mask
-	name = "mask"
-	icon = 'icons/obj/clothing/masks.dmi'
-	body_parts_covered = HEAD
-	slot_flags = SLOT_MASK
-	strip_delay = 40
-	equip_delay_other = 40
-	var/mask_adjusted = 0
-	var/adjusted_flags = null
-
-
-/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(body_parts_covered & HEAD)
-			if(damaged_clothes)
-				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
-			if(blood_DNA)
-				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
-
-/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_wear_mask()
-
-//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
-/obj/item/clothing/mask/proc/adjustmask(mob/living/user)
-	if(user && user.incapacitated())
-		return
-	mask_adjusted = !mask_adjusted
-	if(!mask_adjusted)
-		src.icon_state = initial(icon_state)
-		gas_transfer_coefficient = initial(gas_transfer_coefficient)
-		permeability_coefficient = initial(permeability_coefficient)
-		flags_1 |= visor_flags
-		flags_inv |= visor_flags_inv
-		flags_cover |= visor_flags_cover
-		to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
-		slot_flags = initial(slot_flags)
-	else
-		icon_state += "_up"
-		to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
-		gas_transfer_coefficient = null
-		permeability_coefficient = null
-		flags_1 &= ~visor_flags
-		flags_inv &= ~visor_flags_inv
-		flags_cover &= ~visor_flags_cover
-		if(adjusted_flags)
-			slot_flags = adjusted_flags
-	if(user)
-		user.wear_mask_update(src, toggle_off = mask_adjusted)
-		user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.
-
-
-
-
-//Shoes
-/obj/item/clothing/shoes
-	name = "shoes"
-	icon = 'icons/obj/clothing/shoes.dmi'
-	desc = "Comfortable-looking shoes."
-	gender = PLURAL //Carn: for grammarically correct text-parsing
-	var/chained = 0
-
-	body_parts_covered = FEET
-	slot_flags = SLOT_FEET
-
-	permeability_coefficient = 0.5
-	slowdown = SHOES_SLOWDOWN
-	var/blood_state = BLOOD_STATE_NOT_BLOODY
-	var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
-	var/offset = 0
-	var/equipped_before_drop = FALSE
-
-/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		var/bloody = 0
-		if(blood_DNA)
-			bloody = 1
-		else
-			bloody = bloody_shoes[BLOOD_STATE_HUMAN]
-
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
-		if(bloody)
-			. += mutable_appearance('icons/effects/blood.dmi', "shoeblood")
-
-/obj/item/clothing/shoes/equipped(mob/user, slot)
-	. = ..()
-	if(offset && slot_flags & slotdefine2slotbit(slot))
-		user.pixel_y += offset
-		worn_y_dimension -= (offset * 2)
-		user.update_inv_shoes()
-		equipped_before_drop = TRUE
-
-/obj/item/clothing/shoes/proc/restore_offsets(mob/user)
-	equipped_before_drop = FALSE
-	user.pixel_y -= offset
-	worn_y_dimension = world.icon_size
-
-/obj/item/clothing/shoes/dropped(mob/user)
-	if(offset && equipped_before_drop)
-		restore_offsets(user)
-	. = ..()
-
-/obj/item/clothing/shoes/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_shoes()
-
-/obj/item/clothing/shoes/clean_blood()
-	..()
-	bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
-	blood_state = BLOOD_STATE_NOT_BLOODY
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_shoes()
-
-/obj/item/proc/negates_gravity()
-	return 0
-
-//Suit
-/obj/item/clothing/suit
-	icon = 'icons/obj/clothing/suits.dmi'
-	name = "suit"
-	var/fire_resist = T0C+100
-	allowed = list(/obj/item/tank/internals/emergency_oxygen)
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
-	slot_flags = SLOT_OCLOTHING
-	var/blood_overlay_type = "suit"
-	var/togglename = null
-
-
-/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
-		var/mob/living/carbon/human/M = loc
-		if(ishuman(M) && M.w_uniform)
-			var/obj/item/clothing/under/U = M.w_uniform
-			if(istype(U) && U.attached_accessory)
-				var/obj/item/clothing/accessory/A = U.attached_accessory
-				if(A.above_suit)
-					. += U.accessory_overlay
-
-/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_wear_suit()
-
-//Spacesuit
-//Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
-//      Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
-/obj/item/clothing/head/helmet/space
-	name = "space helmet"
-	icon_state = "spaceold"
-	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
-	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
-	item_state = "spaceold"
-	permeability_coefficient = 0.01
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
-	dynamic_hair_suffix = ""
-	dynamic_fhair_suffix = ""
-	cold_protection = HEAD
-	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
-	heat_protection = HEAD
-	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
-	flash_protect = 2
-	strip_delay = 50
-	equip_delay_other = 50
-	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
-	resistance_flags = 0
-	dog_fashion = null
-
-/obj/item/clothing/suit/space
-	name = "space suit"
-	desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
-	icon_state = "spaceold"
-	item_state = "s_suit"
-	w_class = WEIGHT_CLASS_BULKY
-	gas_transfer_coefficient = 0.01
-	permeability_coefficient = 0.02
-	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
-	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
-	slowdown = 1
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
-	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
-	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
-	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
-	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
-	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
-	strip_delay = 80
-	equip_delay_other = 80
-	resistance_flags = 0
-
-//Under clothing
-
-/obj/item/clothing/under
-	icon = 'icons/obj/clothing/uniforms.dmi'
-	name = "under"
-	body_parts_covered = CHEST|GROIN|LEGS|ARMS
-	permeability_coefficient = 0.9
-	slot_flags = SLOT_ICLOTHING
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
-	var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
-	var/has_sensor = HAS_SENSORS // For the crew computer
-	var/random_sensor = 1
-	var/sensor_mode = NO_SENSORS
-	var/can_adjust = 1
-	var/adjusted = NORMAL_STYLE
-	var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only
-	var/obj/item/clothing/accessory/attached_accessory
-	var/mutable_appearance/accessory_overlay
-	var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
-
-/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
-	. = list()
-	if(!isinhands)
-
-		if(damaged_clothes)
-			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
-		if(blood_DNA)
-			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
-		if(accessory_overlay)
-			. += accessory_overlay
-
-/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)
-	..()
-	if(ismob(loc))
-		var/mob/M = loc
-		M.update_inv_w_uniform()
-	if(has_sensor > NO_SENSORS)
-		has_sensor = BROKEN_SENSORS
-
-/obj/item/clothing/under/New()
-	if(random_sensor)
-		//make the sensor mode favor higher levels, except coords.
-		sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
-	adjusted = NORMAL_STYLE
-	..()
-
-/obj/item/clothing/under/equipped(mob/user, slot)
-	..()
-	if(adjusted)
-		adjusted = NORMAL_STYLE
-		fitted = initial(fitted)
-		if(!alt_covers_chest)
-			body_parts_covered |= CHEST
-
-	if(mutantrace_variation && ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(DIGITIGRADE in H.dna.species.species_traits)
-			adjusted = DIGITIGRADE_STYLE
-		H.update_inv_w_uniform()
-
-	if(attached_accessory && slot != slot_hands && ishuman(user))
-		var/mob/living/carbon/human/H = user
-		attached_accessory.on_uniform_equip(src, user)
-		if(attached_accessory.above_suit)
-			H.update_inv_wear_suit()
-
-/obj/item/clothing/under/dropped(mob/user)
-	if(attached_accessory)
-		attached_accessory.on_uniform_dropped(src, user)
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			if(attached_accessory.above_suit)
-				H.update_inv_wear_suit()
-
-	..()
-
-/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
-	. = FALSE
-	if(istype(I, /obj/item/clothing/accessory))
-		var/obj/item/clothing/accessory/A = I
-		if(attached_accessory)
-			if(user)
-				to_chat(user, "<span class='warning'>[src] already has an accessory.</span>")
-			return
-		else
-			if(user && !user.temporarilyRemoveItemFromInventory(I))
-				return
-			if(!A.attach(src, user))
-				return
-
-			if(user && notifyAttach)
-				to_chat(user, "<span class='notice'>You attach [I] to [src].</span>")
-
-			var/accessory_color = attached_accessory.item_color
-			if(!accessory_color)
-				accessory_color = attached_accessory.icon_state
-			accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
-			accessory_overlay.alpha = attached_accessory.alpha
-			accessory_overlay.color = attached_accessory.color
-
-			if(ishuman(loc))
-				var/mob/living/carbon/human/H = loc
-				H.update_inv_w_uniform()
-				H.update_inv_wear_suit()
-
-			return TRUE
-
-/obj/item/clothing/under/proc/remove_accessory(mob/user)
-	if(!isliving(user))
-		return
-	if(!can_use(user))
-		return
-
-	if(attached_accessory)
-		var/obj/item/clothing/accessory/A = attached_accessory
-		attached_accessory.detach(src, user)
-		if(user.put_in_hands(A))
-			to_chat(user, "<span class='notice'>You detach [A] from [src].</span>")
-		else
-			to_chat(user, "<span class='notice'>You detach [A] from [src] and it falls on the floor.</span>")
-
-		if(ishuman(loc))
-			var/mob/living/carbon/human/H = loc
-			H.update_inv_w_uniform()
-			H.update_inv_wear_suit()
-
-
-/obj/item/clothing/under/examine(mob/user)
-	..()
-	if(can_adjust)
-		if(adjusted == ALT_STYLE)
-			to_chat(user, "Alt-click on [src] to wear it normally.")
-		else
-			to_chat(user, "Alt-click on [src] to wear it casually.")
-	if (has_sensor == BROKEN_SENSORS)
-		to_chat(user, "Its sensors appear to be shorted out.")
-	else if(has_sensor > NO_SENSORS)
-		switch(sensor_mode)
-			if(SENSOR_OFF)
-				to_chat(user, "Its sensors appear to be disabled.")
-			if(SENSOR_LIVING)
-				to_chat(user, "Its binary life sensors appear to be enabled.")
-			if(SENSOR_VITALS)
-				to_chat(user, "Its vital tracker appears to be enabled.")
-			if(SENSOR_COORDS)
-				to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.")
-	if(attached_accessory)
-		to_chat(user, "\A [attached_accessory] is attached to it.")
-
 /proc/generate_female_clothing(index,t_color,icon,type)
 	var/icon/female_clothing_icon	= icon("icon"=icon, "icon_state"=t_color)
 	var/icon/female_s				= icon("icon"='icons/mob/uniform.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]")
@@ -799,4 +334,4 @@ BLIND     // can't see anything
 			Shreds.desc = "The sad remains of what used to be [name]."
 		deconstruct(FALSE)
 	else
-		..()
+		..()

code/modules/clothing/glasses/_glasses.dm

@@ -1,7 +1,22 @@
+//Glasses
 /obj/item/clothing/glasses
 	name = "glasses"
+	icon = 'icons/obj/clothing/glasses.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	flags_cover = GLASSESCOVERSEYES
+	slot_flags = SLOT_EYES
+	strip_delay = 20
+	equip_delay_other = 25
+	resistance_flags = 0
 	materials = list(MAT_GLASS = 250)
-	var/glass_colour_type = null //colors your vision when worn
+	var/vision_flags = 0
+	var/darkness_view = 2//Base human is 2
+	var/invis_view = SEE_INVISIBLE_LIVING
+	var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis
+	var/lighting_alpha
+	var/list/icon/current = list() //the current hud icons
+	var/vision_correction = 0 //does wearing these glasses correct some of our vision defects?
+	var/glass_colour_type //colors your vision when worn
 
 /obj/item/clothing/glasses/examine(mob/user)
 	..()

code/modules/clothing/gloves/_gloves.dm

@@ -0,0 +1,31 @@
+/obj/item/clothing/gloves
+	name = "gloves"
+	gender = PLURAL //Carn: for grammarically correct text-parsing
+	w_class = WEIGHT_CLASS_SMALL
+	icon = 'icons/obj/clothing/gloves.dmi'
+	siemens_coefficient = 0.5
+	body_parts_covered = HANDS
+	slot_flags = SLOT_GLOVES
+	attack_verb = list("challenged")
+	var/transfer_prints = FALSE
+	strip_delay = 20
+	equip_delay_other = 40
+
+
+/obj/item/clothing/gloves/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedgloves")
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "bloodyhands")
+
+/obj/item/clothing/gloves/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_gloves()
+
+// Called just before an attack_hand(), in mob/UnarmedAttack()
+/obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
+	return 0 // return 1 to cancel attack_hand()

code/modules/clothing/head/_head.dm

@@ -0,0 +1,30 @@
+/obj/item/clothing/head
+	name = "head"
+	icon = 'icons/obj/clothing/hats.dmi'
+	icon_state = "top_hat"
+	item_state = "that"
+	body_parts_covered = HEAD
+	slot_flags = SLOT_HEAD
+	var/blockTracking = 0 //For AI tracking
+	var/can_toggle = null
+	dynamic_hair_suffix = "+generic"
+
+/obj/item/clothing/head/Initialize()
+	. = ..()
+	if(ishuman(loc) && dynamic_hair_suffix)
+		var/mob/living/carbon/human/H = loc
+		H.update_hair()
+
+/obj/item/clothing/head/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedhelmet")
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "helmetblood")
+
+/obj/item/clothing/head/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_head()

code/modules/clothing/head/misc.dm

@@ -23,7 +23,7 @@
 
 /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>"
+	desc = "It smells like fresh donut holes. / <i>Il sent comme des trous de beignets frais.</i>"
 	icon_state = "canada"
 	item_state = "canada"
 

code/modules/clothing/masks/_masks.dm

@@ -0,0 +1,53 @@
+/obj/item/clothing/mask
+	name = "mask"
+	icon = 'icons/obj/clothing/masks.dmi'
+	body_parts_covered = HEAD
+	slot_flags = SLOT_MASK
+	strip_delay = 40
+	equip_delay_other = 40
+	var/mask_adjusted = 0
+	var/adjusted_flags = null
+
+
+/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(body_parts_covered & HEAD)
+			if(damaged_clothes)
+				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
+			if(blood_DNA)
+				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+
+/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_wear_mask()
+
+//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
+/obj/item/clothing/mask/proc/adjustmask(mob/living/user)
+	if(user && user.incapacitated())
+		return
+	mask_adjusted = !mask_adjusted
+	if(!mask_adjusted)
+		src.icon_state = initial(icon_state)
+		gas_transfer_coefficient = initial(gas_transfer_coefficient)
+		permeability_coefficient = initial(permeability_coefficient)
+		flags_1 |= visor_flags
+		flags_inv |= visor_flags_inv
+		flags_cover |= visor_flags_cover
+		to_chat(user, "<span class='notice'>You push \the [src] back into place.</span>")
+		slot_flags = initial(slot_flags)
+	else
+		icon_state += "_up"
+		to_chat(user, "<span class='notice'>You push \the [src] out of the way.</span>")
+		gas_transfer_coefficient = null
+		permeability_coefficient = null
+		flags_1 &= ~visor_flags
+		flags_inv &= ~visor_flags_inv
+		flags_cover &= ~visor_flags_cover
+		if(adjusted_flags)
+			slot_flags = adjusted_flags
+	if(user)
+		user.wear_mask_update(src, toggle_off = mask_adjusted)
+		user.update_action_buttons_icon() //when mask is adjusted out, we update all buttons icon so the user's potential internal tank correctly shows as off.

code/modules/clothing/neck/_neck.dm

@@ -1,3 +1,20 @@
+/obj/item/clothing/neck
+	name = "necklace"
+	icon = 'icons/obj/clothing/neck.dmi'
+	body_parts_covered = NECK
+	slot_flags = SLOT_NECK
+	strip_delay = 40
+	equip_delay_other = 40
+
+/obj/item/clothing/neck/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(body_parts_covered & HEAD)
+			if(damaged_clothes)
+				. += mutable_appearance('icons/effects/item_damage.dmi', "damagedmask")
+			if(blood_DNA)
+				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
+
 /obj/item/clothing/neck/tie
 	name = "tie"
 	desc = "A neosilk clip-on tie."
@@ -42,8 +59,8 @@
 			var/heart_strength = "<span class='danger'>no</span>"
 			var/lung_strength = "<span class='danger'>no</span>"
 
-			var/obj/item/organ/heart/heart = M.getorganslot("heart")
-			var/obj/item/organ/lungs/lungs = M.getorganslot("lungs")
+			var/obj/item/organ/heart/heart = M.getorganslot(ORGAN_SLOT_HEART)
+			var/obj/item/organ/lungs/lungs = M.getorganslot(ORGAN_SLOT_LUNGS)
 
 			if(!(M.stat == DEAD || (M.status_flags&FAKEDEATH)))
 				if(heart && istype(heart))
@@ -162,4 +179,4 @@
 	desc = "Damn, it feels good to be a gangster."
 	icon = 'icons/obj/clothing/neck.dmi'
 	icon_state = "bling"
-	item_color = "bling"
+	item_color = "bling"

code/modules/clothing/shoes/_shoes.dm

@@ -0,0 +1,65 @@
+/obj/item/clothing/shoes
+	name = "shoes"
+	icon = 'icons/obj/clothing/shoes.dmi'
+	desc = "Comfortable-looking shoes."
+	gender = PLURAL //Carn: for grammarically correct text-parsing
+	var/chained = 0
+
+	body_parts_covered = FEET
+	slot_flags = SLOT_FEET
+
+	permeability_coefficient = 0.5
+	slowdown = SHOES_SLOWDOWN
+	var/blood_state = BLOOD_STATE_NOT_BLOODY
+	var/list/bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+	var/offset = 0
+	var/equipped_before_drop = FALSE
+
+/obj/item/clothing/shoes/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		var/bloody = 0
+		if(blood_DNA)
+			bloody = 1
+		else
+			bloody = bloody_shoes[BLOOD_STATE_HUMAN]
+
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damagedshoe")
+		if(bloody)
+			. += mutable_appearance('icons/effects/blood.dmi', "shoeblood")
+
+/obj/item/clothing/shoes/equipped(mob/user, slot)
+	. = ..()
+	if(offset && slot_flags & slotdefine2slotbit(slot))
+		user.pixel_y += offset
+		worn_y_dimension -= (offset * 2)
+		user.update_inv_shoes()
+		equipped_before_drop = TRUE
+
+/obj/item/clothing/shoes/proc/restore_offsets(mob/user)
+	equipped_before_drop = FALSE
+	user.pixel_y -= offset
+	worn_y_dimension = world.icon_size
+
+/obj/item/clothing/shoes/dropped(mob/user)
+	if(offset && equipped_before_drop)
+		restore_offsets(user)
+	. = ..()
+
+/obj/item/clothing/shoes/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_shoes()
+
+/obj/item/clothing/shoes/clean_blood()
+	..()
+	bloody_shoes = list(BLOOD_STATE_HUMAN = 0,BLOOD_STATE_XENO = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
+	blood_state = BLOOD_STATE_NOT_BLOODY
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_shoes()
+
+/obj/item/proc/negates_gravity()
+	return 0

code/modules/clothing/shoes/miscellaneous.dm

@@ -49,7 +49,7 @@
 
 /obj/item/clothing/shoes/sandal/magic
 	name = "magical sandals"
-	desc = "A pair of sandals imbued with magic"
+	desc = "A pair of sandals imbued with magic."
 	resistance_flags = FIRE_PROOF |  ACID_PROOF
 
 /obj/item/clothing/shoes/galoshes

code/modules/clothing/spacesuits/_spacesuits.dm

@@ -0,0 +1,45 @@
+//Note: Everything in modules/clothing/spacesuits should have the entire suit grouped together.
+//      Meaning the the suit is defined directly after the corrisponding helmet. Just like below!
+/obj/item/clothing/head/helmet/space
+	name = "space helmet"
+	icon_state = "spaceold"
+	desc = "A special helmet with solar UV shielding to protect your eyes from harmful rays."
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+	item_state = "spaceold"
+	permeability_coefficient = 0.01
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
+	cold_protection = HEAD
+	min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
+	heat_protection = HEAD
+	max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
+	flash_protect = 2
+	strip_delay = 50
+	equip_delay_other = 50
+	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	resistance_flags = 0
+	dog_fashion = null
+
+/obj/item/clothing/suit/space
+	name = "space suit"
+	desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
+	icon_state = "spaceold"
+	item_state = "s_suit"
+	w_class = WEIGHT_CLASS_BULKY
+	gas_transfer_coefficient = 0.01
+	permeability_coefficient = 0.02
+	flags_1 = STOPSPRESSUREDMAGE_1 | THICKMATERIAL_1
+	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals)
+	slowdown = 1
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50, fire = 80, acid = 70)
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS
+	min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
+	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
+	max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
+	strip_delay = 80
+	equip_delay_other = 80
+	resistance_flags = 0

code/modules/clothing/spacesuits/chronosuit.dm

@@ -20,7 +20,7 @@
 
 /obj/item/clothing/suit/space/chronos
 	name = "Chronosuit"
-	desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology"
+	desc = "An advanced spacesuit equipped with time-bluespace teleportation and anti-compression technology."
 	icon_state = "chronosuit"
 	item_state = "chronosuit"
 	actions_types = list(/datum/action/item_action/toggle)

code/modules/clothing/spacesuits/hardsuit.dm

@@ -394,7 +394,7 @@
 	item_state = "medical_helm"
 	item_color = "medical"
 	flash_protect = 0
-	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50, fire = 75, acid = 75)
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75, fire = 75, acid = 75)
 	scan_reagents = 1
 
 /obj/item/clothing/suit/space/hardsuit/medical
@@ -403,7 +403,7 @@
 	desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement."
 	item_state = "medical_hardsuit"
 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/device/healthanalyzer, /obj/item/stack/medical)
-	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50, fire = 75, acid = 75)
+	armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75, fire = 75, acid = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
 
 	//Research Director hardsuit
@@ -475,7 +475,7 @@
 	//Head of Security hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/security/hos
 	name = "head of security's hardsuit helmet"
-	desc = "a special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
+	desc = "A special bulky helmet designed for work in a hazardous, low pressure environment. Has an additional layer of armor."
 	icon_state = "hardsuit0-hos"
 	item_color = "hos"
 	armor = list(melee = 45, bullet = 25, laser = 30,energy = 10, bomb = 25, bio = 100, rad = 50, fire = 95, acid = 95)
@@ -720,7 +720,7 @@
 ///SWAT version
 /obj/item/clothing/suit/space/hardsuit/shielded/swat
 	name = "death commando spacesuit"
-	desc = "an advanced hardsuit favored by commandos for use in special operations."
+	desc = "An advanced hardsuit favored by commandos for use in special operations."
 	icon_state = "deathsquad"
 	item_state = "swat_suit"
 	item_color = "syndi"

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -157,7 +157,7 @@ Contains:
 	//Emergency Response Team suits
 /obj/item/clothing/head/helmet/space/hardsuit/ert
 	name = "emergency response unit helmet"
-	desc = "Standard issue command helmet for the ERT"
+	desc = "Standard issue command helmet for the ERT."
 	icon_state = "hardsuit0-ert_commander"
 	item_state = "hardsuit0-ert_commander"
 	item_color = "ert_commander"

code/modules/clothing/suits/_suits.dm

@@ -0,0 +1,31 @@
+/obj/item/clothing/suit
+	icon = 'icons/obj/clothing/suits.dmi'
+	name = "suit"
+	var/fire_resist = T0C+100
+	allowed = list(/obj/item/tank/internals/emergency_oxygen)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	slot_flags = SLOT_OCLOTHING
+	var/blood_overlay_type = "suit"
+	var/togglename = null
+
+
+/obj/item/clothing/suit/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
+		var/mob/living/carbon/human/M = loc
+		if(ishuman(M) && M.w_uniform)
+			var/obj/item/clothing/under/U = M.w_uniform
+			if(istype(U) && U.attached_accessory)
+				var/obj/item/clothing/accessory/A = U.attached_accessory
+				if(A.above_suit)
+					. += U.accessory_overlay
+
+/obj/item/clothing/suit/update_clothes_damaged_state(damaging = TRUE)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_wear_suit()

code/modules/clothing/suits/bio.dm

@@ -5,7 +5,7 @@
 	desc = "A hood that protects the head and face from biological comtaminants."
 	permeability_coefficient = 0.01
 	flags_1 = THICKMATERIAL_1
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 80, fire = 30, acid = 100)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
 	resistance_flags = ACID_PROOF
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -22,7 +22,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 1
 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/pen, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
-	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 80, fire = 30, acid = 100)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
 	strip_delay = 70
 	equip_delay_other = 70
@@ -46,11 +46,11 @@
 
 //Security biosuit, grey with red stripe across the chest
 /obj/item/clothing/head/bio_hood/security
-	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20, fire = 30, acid = 100)
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 80, fire = 30, acid = 100)
 	icon_state = "bio_security"
 
 /obj/item/clothing/suit/bio_suit/security
-	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 20, fire = 30, acid = 100)
+	armor = list(melee = 25, bullet = 15, laser = 25, energy = 10, bomb = 25, bio = 100, rad = 80, fire = 30, acid = 100)
 	icon_state = "bio_security"
 
 

code/modules/clothing/suits/cloaks.dm

@@ -13,7 +13,7 @@
 	name = "cloak hood"
 	icon = 'icons/obj/clothing/hats.dmi'
 	icon_state = "golhood"
-	desc = "A hood for a cloak"
+	desc = "A hood for a cloak."
 	body_parts_covered = HEAD
 	flags_1 = NODROP_1
 	flags_inv = HIDEHAIR|HIDEEARS
@@ -75,7 +75,7 @@
 /obj/item/clothing/suit/hooded/cloak/drake
 	name = "drake armour"
 	icon_state = "dragon"
-	desc = "A suit of armour fashioned from the remains of an ash drake. "
+	desc = "A suit of armour fashioned from the remains of an ash drake."
 	allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/device/mining_scanner, /obj/item/device/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/spear)
 	armor = list(melee = 70, bullet = 30, laser = 50, energy = 40, bomb = 70, bio = 60, rad = 50, fire = 100, acid = 100)
 	hoodtype = /obj/item/clothing/head/hooded/cloakhood/drake

code/modules/clothing/suits/miscellaneous.dm

@@ -414,6 +414,24 @@
 	icon_state = "letterman_n"
 	item_state = "letterman_n"
 
+/obj/item/clothing/suit/dracula
+	name = "dracula coat"
+	desc = "Looks like this belongs in a very old movie set."
+	icon_state = "draculacoat"
+	item_state = "draculacoat"
+
+/obj/item/clothing/suit/drfreeze_coat
+	name = "doctor freeze's labcoat"
+	desc = "A labcoat imbued with the power of features and freezes."
+	icon_state = "drfreeze_coat"
+	item_state = "drfreeze_coat"
+
+/obj/item/clothing/suit/gothcoat
+	name = "gothic coat"
+	desc = "Perfect for those who want stalk in a corner of a bar."
+	icon_state = "gothcoat"
+	item_state = "gothcoat"
+
 /obj/item/clothing/suit/xenos
 	name = "xenos suit"
 	desc = "A suit made out of chitinous alien hide."
@@ -459,7 +477,7 @@
 	icon_state = "coatcaptain"
 	item_state = "coatcaptain"
 	armor = list(melee = 25, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 50)
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
+	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/melee/classic_baton/telescopic)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
 
 /obj/item/clothing/head/hooded/winterhood/captain
@@ -470,7 +488,7 @@
 	icon_state = "coatsecurity"
 	item_state = "coatsecurity"
 	armor = list(melee = 25, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 0, acid = 45)
-	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight/seclite, /obj/item/melee/classic_baton/telescopic)
+	allowed = list(/obj/item/gun/energy, /obj/item/reagent_containers/spray/pepper, /obj/item/gun/ballistic, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/device/flashlight, /obj/item/melee/classic_baton/telescopic)
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/security
 
 /obj/item/clothing/head/hooded/winterhood/security
@@ -550,7 +568,7 @@
 
 /obj/item/clothing/suit/spookyghost
 	name = "spooky ghost"
-	desc = "this is obviously just a bedsheet, but maybe try it on?"
+	desc = "This is obviously just a bedsheet, but maybe try it on?"
 	icon_state = "bedsheet"
 	user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150)
 	alternate_worn_layer = ABOVE_BODY_FRONT_LAYER //so the bedsheet goes over everything but fire

code/modules/clothing/under/_under.dm

@@ -0,0 +1,156 @@
+/obj/item/clothing/under
+	icon = 'icons/obj/clothing/uniforms.dmi'
+	name = "under"
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+	permeability_coefficient = 0.9
+	slot_flags = SLOT_ICLOTHING
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0)
+	var/fitted = FEMALE_UNIFORM_FULL // For use in alternate clothing styles for women
+	var/has_sensor = HAS_SENSORS // For the crew computer
+	var/random_sensor = 1
+	var/sensor_mode = NO_SENSORS
+	var/can_adjust = 1
+	var/adjusted = NORMAL_STYLE
+	var/alt_covers_chest = 0 // for adjusted/rolled-down jumpsuits, 0 = exposes chest and arms, 1 = exposes arms only
+	var/obj/item/clothing/accessory/attached_accessory
+	var/mutable_appearance/accessory_overlay
+	var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
+
+/obj/item/clothing/under/worn_overlays(isinhands = FALSE)
+	. = list()
+	if(!isinhands)
+
+		if(damaged_clothes)
+			. += mutable_appearance('icons/effects/item_damage.dmi', "damageduniform")
+		if(blood_DNA)
+			. += mutable_appearance('icons/effects/blood.dmi', "uniformblood")
+		if(accessory_overlay)
+			. += accessory_overlay
+
+/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)
+	..()
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_w_uniform()
+	if(has_sensor > NO_SENSORS)
+		has_sensor = BROKEN_SENSORS
+
+/obj/item/clothing/under/New()
+	if(random_sensor)
+		//make the sensor mode favor higher levels, except coords.
+		sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
+	adjusted = NORMAL_STYLE
+	..()
+
+/obj/item/clothing/under/equipped(mob/user, slot)
+	..()
+	if(adjusted)
+		adjusted = NORMAL_STYLE
+		fitted = initial(fitted)
+		if(!alt_covers_chest)
+			body_parts_covered |= CHEST
+
+	if(mutantrace_variation && ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(DIGITIGRADE in H.dna.species.species_traits)
+			adjusted = DIGITIGRADE_STYLE
+		H.update_inv_w_uniform()
+
+	if(attached_accessory && slot != slot_hands && ishuman(user))
+		var/mob/living/carbon/human/H = user
+		attached_accessory.on_uniform_equip(src, user)
+		if(attached_accessory.above_suit)
+			H.update_inv_wear_suit()
+
+/obj/item/clothing/under/dropped(mob/user)
+	if(attached_accessory)
+		attached_accessory.on_uniform_dropped(src, user)
+		if(ishuman(user))
+			var/mob/living/carbon/human/H = user
+			if(attached_accessory.above_suit)
+				H.update_inv_wear_suit()
+
+	..()
+
+/obj/item/clothing/under/proc/attach_accessory(obj/item/I, mob/user, notifyAttach = 1)
+	. = FALSE
+	if(istype(I, /obj/item/clothing/accessory))
+		var/obj/item/clothing/accessory/A = I
+		if(attached_accessory)
+			if(user)
+				to_chat(user, "<span class='warning'>[src] already has an accessory.</span>")
+			return
+		else
+			if(user && !user.temporarilyRemoveItemFromInventory(I))
+				return
+			if(!A.attach(src, user))
+				return
+
+			if(user && notifyAttach)
+				to_chat(user, "<span class='notice'>You attach [I] to [src].</span>")
+
+			var/accessory_color = attached_accessory.item_color
+			if(!accessory_color)
+				accessory_color = attached_accessory.icon_state
+			accessory_overlay = mutable_appearance('icons/mob/accessories.dmi', "[accessory_color]")
+			accessory_overlay.alpha = attached_accessory.alpha
+			accessory_overlay.color = attached_accessory.color
+
+			if(ishuman(loc))
+				var/mob/living/carbon/human/H = loc
+				H.update_inv_w_uniform()
+				H.update_inv_wear_suit()
+
+			return TRUE
+
+/obj/item/clothing/under/proc/remove_accessory(mob/user)
+	if(!isliving(user))
+		return
+	if(!can_use(user))
+		return
+
+	if(attached_accessory)
+		var/obj/item/clothing/accessory/A = attached_accessory
+		attached_accessory.detach(src, user)
+		if(user.put_in_hands(A))
+			to_chat(user, "<span class='notice'>You detach [A] from [src].</span>")
+		else
+			to_chat(user, "<span class='notice'>You detach [A] from [src] and it falls on the floor.</span>")
+
+		if(ishuman(loc))
+			var/mob/living/carbon/human/H = loc
+			H.update_inv_w_uniform()
+			H.update_inv_wear_suit()
+
+
+/obj/item/clothing/under/examine(mob/user)
+	..()
+	if(can_adjust)
+		if(adjusted == ALT_STYLE)
+			to_chat(user, "Alt-click on [src] to wear it normally.")
+		else
+			to_chat(user, "Alt-click on [src] to wear it casually.")
+	if (has_sensor == BROKEN_SENSORS)
+		to_chat(user, "Its sensors appear to be shorted out.")
+	else if(has_sensor > NO_SENSORS)
+		switch(sensor_mode)
+			if(SENSOR_OFF)
+				to_chat(user, "Its sensors appear to be disabled.")
+			if(SENSOR_LIVING)
+				to_chat(user, "Its binary life sensors appear to be enabled.")
+			if(SENSOR_VITALS)
+				to_chat(user, "Its vital tracker appears to be enabled.")
+			if(SENSOR_COORDS)
+				to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.")
+	if(attached_accessory)
+		to_chat(user, "\A [attached_accessory] is attached to it.")

code/modules/clothing/under/accessories.dm

@@ -139,8 +139,10 @@
 							log_game("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
 							message_admins("<b>[key_name(M)]</b> was given the following commendation by <b>[key_name(user)]</b>: [input]")
 
-		else to_chat(user, "<span class='warning'>Medals can only be pinned on jumpsuits!</span>")
-	else ..()
+		else
+			to_chat(user, "<span class='warning'>Medals can only be pinned on jumpsuits!</span>")
+	else
+		..()
 
 /obj/item/clothing/accessory/medal/conduct
 	name = "distinguished conduct medal"

code/modules/clothing/under/miscellaneous.dm

@@ -24,7 +24,7 @@
 
 /obj/item/clothing/under/scratch
 	name = "white suit"
-	desc = "A white suit, suitable for an excellent host"
+	desc = "A white suit, suitable for an excellent host."
 	icon_state = "scratch"
 	item_state = "scratch"
 	item_color = "scratch"
@@ -693,6 +693,33 @@
 	can_adjust = FALSE
 	resistance_flags = NONE
 
+/obj/item/clothing/under/draculass
+	name = "draculass coat"
+	desc = "A dress inspired by the ancient \"Victorian\" era."
+	icon_state = "draculass"
+	item_state = "draculass"
+	item_color = "draculass"
+	body_parts_covered = CHEST|GROIN|ARMS
+	fitted = FEMALE_UNIFORM_TOP
+	can_adjust = FALSE
+
+/obj/item/clothing/under/drfreeze
+	name = "doctor freeze's jumpsuit"
+	desc = "A modified scientist jumpsuit to look extra cool."
+	icon_state = "drfreeze"
+	item_state = "drfreeze"
+	item_color = "drfreeze"
+	can_adjust = FALSE
+
+/obj/item/clothing/under/lobster
+	name = "foam lobster suit"
+	desc = "Who beheaded the college mascot?"
+	icon_state = "lobster"
+	item_state = "lobster"
+	item_color = "lobster"
+	fitted = NO_FEMALE_UNIFORM
+	can_adjust = FALSE
+
 /obj/item/clothing/under/skeleton
 	name = "skeleton jumpsuit"
 	desc = "A black jumpsuit with a white bone pattern printed on it. Spooky!"
@@ -702,4 +729,4 @@
 	body_parts_covered = CHEST|GROIN|ARMS|LEGS
 	fitted = NO_FEMALE_UNIFORM
 	can_adjust = FALSE
-	resistance_flags = NONE
+	resistance_flags = NONE

code/modules/clothing/under/syndicate.dm

@@ -18,7 +18,7 @@
 
 /obj/item/clothing/under/syndicate/sniper
 	name = "Tactical turtleneck suit"
-	desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp"
+	desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
 	icon_state = "really_black_suit"
 	item_state = "bl_suit"
 	item_color = "black_suit"

code/modules/clothing/under/trek.dm

@@ -8,14 +8,14 @@
 //TOS
 /obj/item/clothing/under/trek/command
 	name = "command uniform"
-	desc = "The uniform worn by command officers"
+	desc = "The uniform worn by command officers."
 	icon_state = "trek_command"
 	item_color = "trek_command"
 	item_state = "y_suit"
 
 /obj/item/clothing/under/trek/engsec
 	name = "engsec uniform"
-	desc = "The uniform worn by engineering/security officers"
+	desc = "The uniform worn by engineering/security officers."
 	icon_state = "trek_engsec"
 	item_color = "trek_engsec"
 	item_state = "r_suit"
@@ -24,7 +24,7 @@
 
 /obj/item/clothing/under/trek/medsci
 	name = "medsci uniform"
-	desc = "The uniform worn by medical/science officers"
+	desc = "The uniform worn by medical/science officers."
 	icon_state = "trek_medsci"
 	item_color = "trek_medsci"
 	item_state = "b_suit"
@@ -66,7 +66,7 @@
 //Q
 /obj/item/clothing/under/trek/Q
 	name = "french marshall's uniform"
-	desc = "something about it feels off..."
+	desc = "Something about it feels off..."
 	icon_state = "trek_Q"
 	item_color = "trek_Q"
 	item_state = "r_suit"

code/modules/detectivework/detective_work.dm

@@ -3,7 +3,7 @@
 /atom/var/list/suit_fibers
 
 /atom/proc/add_fibers(mob/living/carbon/human/M)
-	if(M.gloves && istype(M.gloves, /obj/item/clothing/))
+	if(M.gloves && istype(M.gloves, /obj/item/clothing/))
 		var/obj/item/clothing/gloves/G = M.gloves
 		if(G.transfer_blood > 1) //bloodied gloves transfer blood to touched objects
 			if(add_blood(G.blood_DNA)) //only reduces the bloodiness of our gloves if the item wasn't already bloody
@@ -11,7 +11,8 @@
 	else if(M.bloody_hands > 1)
 		if(add_blood(M.blood_DNA))
 			M.bloody_hands--
-	if(!suit_fibers) suit_fibers = list()
+	if(!suit_fibers)
+		suit_fibers = list()
 	var/fibertext
 	var/item_multiplier = isitem(src)?1.2:1
 	if(M.wear_suit)

code/modules/error_handler/error_handler.dm

@@ -6,6 +6,19 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(!istype(E)) //Something threw an unusual exception
 		log_world("\[[time_stamp()]] Uncaught exception: [E]")
 		return ..()
+	
+	//this is snowflake because of a byond bug (ID:2306577), do not attempt to call non-builtin procs in this if
+	if(copytext(E.name,1,32) == "Maximum recursion level reached")
+		var/list/split = splittext(E.desc, "\n")
+		for (var/i in 1 to split.len)
+			if (split[i] != "")
+				split[i] = "\[[time2text(world.timeofday,"hh:mm:ss")]\][split[i]]"
+		E.desc = jointext(split, "\n")
+		//log to world while intentionally triggering the byond bug.
+		log_world("\[[time2text(world.timeofday,"hh:mm:ss")]\]runtime error: [E.name]\n[E.desc]")
+		//if we got to here without silently ending, the byond bug has been fixed.
+		log_world("The bug with recursion runtimes has been fixed. Please remove the snowflake check from world/Error in [__FILE__]:[__LINE__]")
+		return //this will never happen.
 
 	var/static/list/error_last_seen = list()
 	var/static/list/error_cooldown = list() /* Error_cooldown items will either be positive(cooldown time) or negative(silenced error)
@@ -118,4 +131,4 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 
 	world.log = null
 
-#endif
+#endif

code/modules/events/_event.dm

@@ -99,6 +99,10 @@
 
 	return E
 
+//Special admins setup
+/datum/round_event_control/proc/admin_setup()
+	return
+
 /datum/round_event	//NOTE: Times are measured in master controller ticks!
 	var/processing = TRUE
 	var/datum/round_event_control/control

code/modules/events/blob.dm

@@ -1,38 +1,29 @@
-/datum/round_event_control/blob
-	name = "Blob"
-	typepath = /datum/round_event/ghost_role/blob
-	weight = 5
-	max_occurrences = 1
-
-	min_players = 20
-	earliest_start = 18000 //30 minutes
-
-	gamemode_blacklist = list("blob") //Just in case a blob survives that long
-
-/datum/round_event/ghost_role/blob
-	announceWhen	= 12
-	role_name = "blob overmind"
-	var/new_rate = 2
-
-/datum/round_event/ghost_role/blob/New(my_processing = TRUE, set_point_rate)
-	..()
-	if(set_point_rate)
-		new_rate = set_point_rate
-
-/datum/round_event/ghost_role/blob/announce()
-	priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
-
-
-/datum/round_event/ghost_role/blob/spawn_role()
-	if(!GLOB.blobstart.len)
-		return MAP_ERROR
-	var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
-	if(!candidates.len)
-		return NOT_ENOUGH_PLAYERS
-	var/mob/dead/observer/new_blob = pick(candidates)
-	var/obj/structure/blob/core/BC = new/obj/structure/blob/core(pick(GLOB.blobstart), new_blob.client, new_rate)
-	BC.overmind.blob_points = min(20 + GLOB.player_list.len, BC.overmind.max_blob_points)
-	spawned_mobs += BC.overmind
-	message_admins("[key_name_admin(BC.overmind)] has been made into a blob overmind by an event.")
-	log_game("[key_name(BC.overmind)] was spawned as a blob overmind by an event.")
-	return SUCCESSFUL_SPAWN
+/datum/round_event_control/blob
+	name = "Blob"
+	typepath = /datum/round_event/ghost_role/blob
+	weight = 10
+	max_occurrences = 1
+
+	min_players = 20
+
+	gamemode_blacklist = list("blob") //Just in case a blob survives that long
+
+/datum/round_event/ghost_role/blob
+	announceWhen	= -1
+	role_name = "blob overmind"
+
+/datum/round_event/ghost_role/blob/announce()
+	priority_announce("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert", 'sound/ai/outbreak5.ogg')
+
+/datum/round_event/ghost_role/blob/spawn_role()
+	if(!GLOB.blobstart.len)
+		return MAP_ERROR
+	var/list/candidates = get_candidates("blob", null, ROLE_BLOB)
+	if(!candidates.len)
+		return NOT_ENOUGH_PLAYERS
+	var/mob/dead/observer/new_blob = pick(candidates)
+	var/mob/camera/blob/BC = new_blob.become_overmind()
+	spawned_mobs += BC
+	message_admins("[key_name_admin(BC)] has been made into a blob overmind by an event.")
+	log_game("[key_name(BC)] was spawned as a blob overmind by an event.")
+	return SUCCESSFUL_SPAWN

code/modules/events/brand_intelligence.dm

@@ -13,16 +13,16 @@
 	var/list/obj/machinery/vending/infectedMachines = list()
 	var/obj/machinery/vending/originMachine
 	var/list/rampant_speeches = list("Try our aggressive new marketing strategies!", \
-									 "You should buy products to feed your lifestyle obession!", \
+									 "You should buy products to feed your lifestyle obsession!", \
 									 "Consume!", \
 									 "Your money can buy happiness!", \
 									 "Engage direct marketing!", \
 									 "Advertising is legalized lying! But don't let that put you off our great deals!", \
-									 "You don't want to buy anything? Yeah, well I didn't want to buy your mom either.")
+									 "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.")
 
 
 /datum/round_event/brand_intelligence/announce()
-	priority_announce("Rampant brand intelligence has been detected aboard [station_name()], please stand-by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
+	priority_announce("Rampant brand intelligence has been detected aboard [station_name()]. Please stand by. The origin is believed to be \a [originMachine.name].", "Machine Learning Alert")
 
 
 /datum/round_event/brand_intelligence/start()

code/modules/events/false_alarm.dm

@@ -1,37 +1,61 @@
-/datum/round_event_control/falsealarm
-	name 			= "False Alarm"
-	typepath 		= /datum/round_event/falsealarm
-	weight			= 20
-	max_occurrences = 5
-
-/datum/round_event_control/falsealarm/canSpawnEvent(players_amt, gamemode)
-	return ..() && length(gather_false_events())
-
-/datum/round_event/falsealarm
-	announceWhen	= 0
-	endWhen			= 1
-
-/datum/round_event/falsealarm/announce()
-	var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
-	var/gamemode = SSticker.mode.config_tag
-
-	var/events_list = gather_false_events(players_amt, gamemode)
-	var/datum/round_event_control/event_control = pick(events_list)
-	if(event_control)
-		var/datum/round_event/Event = new event_control.typepath()
-		message_admins("False Alarm: [Event]")
-		Event.kill() 		//do not process this event - no starts, no ticks, no ends
-		Event.announce() 	//just announce it like it's happening
-
-/proc/gather_false_events(players_amt, gamemode)
-	. = list()
-	for(var/datum/round_event_control/E in SSevents.control)
+/datum/round_event_control/falsealarm
+	name 			= "False Alarm"
+	typepath 		= /datum/round_event/falsealarm
+	weight			= 20
+	max_occurrences = 5
+	var/forced_type //Admin abuse
+
+
+/datum/round_event_control/falsealarm/admin_setup()
+	if(!check_rights(R_FUN))
+		return
+
+	var/list/possible_types = list()
+
+	for(var/datum/round_event_control/E in SSevents.control)
 		if(istype(E, /datum/round_event_control/falsealarm))
-			continue
-		if(!E.canSpawnEvent(players_amt, gamemode))
-			continue
-
-		var/datum/round_event/event = E.typepath
-		if(initial(event.announceWhen) <= 0)
-			continue
-		. += E
+			continue
+		var/datum/round_event/event = E.typepath
+		if(initial(event.announceWhen) <= 0)
+			continue
+		possible_types += E
+	
+	forced_type = input(usr, "Select the scare.","False event") as null|anything in possible_types
+
+/datum/round_event_control/falsealarm/canSpawnEvent(players_amt, gamemode)
+	return ..() && length(gather_false_events())
+
+/datum/round_event/falsealarm
+	announceWhen	= 0
+	endWhen			= 1
+
+/datum/round_event/falsealarm/announce()
+	var/players_amt = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1)
+	var/gamemode = SSticker.mode.config_tag
+
+	var/events_list = gather_false_events(players_amt, gamemode)
+	var/datum/round_event_control/event_control
+	var/datum/round_event_control/falsealarm/C = control
+	if(C.forced_type)
+		event_control = C.forced_type
+		C.forced_type = null
+	else
+		event_control = pick(events_list)
+	if(event_control)
+		var/datum/round_event/Event = new event_control.typepath()
+		message_admins("False Alarm: [Event]")
+		Event.kill() 		//do not process this event - no starts, no ticks, no ends
+		Event.announce() 	//just announce it like it's happening
+
+/proc/gather_false_events(players_amt, gamemode)
+	. = list()
+	for(var/datum/round_event_control/E in SSevents.control)
+		if(istype(E, /datum/round_event_control/falsealarm))
+			continue
+		if(!E.canSpawnEvent(players_amt, gamemode))
+			continue
+
+		var/datum/round_event/event = E.typepath
+		if(initial(event.announceWhen) <= 0)
+			continue
+		. += E

code/modules/events/holiday/halloween.dm

@@ -10,7 +10,8 @@
 	..()
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
 		var/obj/item/storage/backpack/b = locate() in H.contents
-		new /obj/item/storage/spooky(b)
+		if(b)
+			new /obj/item/storage/spooky(b)
 
 	for(var/mob/living/simple_animal/pet/dog/corgi/Ian/Ian in GLOB.mob_list)
 		Ian.place_on_head(new /obj/item/bedsheet(Ian))
@@ -21,77 +22,6 @@
 /datum/round_event/spooky/announce()
 	priority_announce(pick("RATTLE ME BONES!","THE RIDE NEVER ENDS!", "A SKELETON POPS OUT!", "SPOOKY SCARY SKELETONS!", "CREWMEMBERS BEWARE, YOU'RE IN FOR A SCARE!") , "THE CALL IS COMING FROM INSIDE THE HOUSE")
 
-//Eyeball migration
-/datum/round_event_control/carp_migration/eyeballs
-	name = "Eyeball Migration"
-	typepath = /datum/round_event/carp_migration/eyeballs
-	holidayID = HALLOWEEN
-	weight = 25
-	earliest_start = 0
-
-/datum/round_event/carp_migration/eyeballs/start()
-	for(var/obj/effect/landmark/carpspawn/C in GLOB.landmarks_list)
-		new /mob/living/simple_animal/hostile/carp/eyeball(C.loc)
-
-//Pumpking meteors waves
-/datum/round_event_control/meteor_wave/spooky
-	name = "Pumpkin Wave"
-	typepath = /datum/round_event/meteor_wave/spooky
-	holidayID = HALLOWEEN
-	weight = 20
-	max_occurrences = 2
-
-/datum/round_event/meteor_wave/spooky
-	endWhen	= 40
-
-/datum/round_event/meteor_wave/spooky/tick()
-	if(IsMultiple(activeFor, 4))
-		spawn_meteors(3, GLOB.meteorsSPOOKY) //meteor list types defined in gamemode/meteor/meteors.dm
-
-//Creepy clown invasion
-/datum/round_event_control/creepy_clowns
-	name = "Clowns"
-	typepath = /datum/round_event/creepy_clowns
-	holidayID = HALLOWEEN
-	weight = 20
-	earliest_start = 0
-
-/datum/round_event/creepy_clowns
-	endWhen = 40
-
-/datum/round_event/creepy_clowns/start()
-	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
-		if(!H.client || !istype(H))
-			return
-		to_chat(H, "<span class='danger'>Honk...</span>")
-		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)
-
-/datum/round_event/creepy_clowns/tick()
-	if(IsMultiple(activeFor, 4))
-		for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
-			if (prob(66))
-				playsound(H.loc, pick('sound/spookoween/scary_horn.ogg','sound/spookoween/scary_horn2.ogg', 'sound/spookoween/scary_horn3.ogg'), 100, 1)
-			if (prob(33))
-				var/turf/T = get_turf(H)
-				if(T)
-					new /obj/effect/hallucination/simple/clown(T, H, 25)
-			else if (prob(25))
-				var/turf/T = get_turf(H)
-				if(T)
-					new /obj/effect/hallucination/simple/clown/scary(T, H, 25)
-			else if (prob(5))
-				var/turf/T = get_turf(H)
-				if(T)
-					spawn_atom_to_turf(/obj/effect/mob_spawn/human/clown/corpse, H, 1)
-			else if (prob(1))
-				spawn_atom_to_turf(/mob/living/simple_animal/hostile/retaliate/clown, H, 1)
-
-/datum/round_event/creepy_clowns/announce()
-	priority_announce("Honk... Honk... honk... HONK! HONK! HONKHONKHONKHONKHONK", "HONK!", 'sound/spookoween/scary_horn.ogg')
-
 //spooky foods (you can't actually make these when it's not halloween)
 /obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull
 	name = "skull cookie"
@@ -105,7 +35,6 @@
 	icon = 'icons/obj/halloween_items.dmi'
 	icon_state = "coffincookie"
 
-
 //spooky items
 
 /obj/item/storage/spooky

code/modules/events/meteor_wave.dm

@@ -1,68 +1,72 @@
-// Normal strength
-
-/datum/round_event_control/meteor_wave
-	name = "Meteor Wave: Normal"
-	typepath = /datum/round_event/meteor_wave
-	weight = 4
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave
-	startWhen		= 6
-	endWhen			= 66
-	announceWhen	= 1
-	var/list/wave_type
-	var/wave_name = "normal"
-
-/datum/round_event/meteor_wave/New()
-	..()
-	if(!wave_type)
-		determine_wave_type()
-
-/datum/round_event/meteor_wave/proc/determine_wave_type()
-	if(!wave_name)
-		wave_name = pickweight(list(
-			"normal" = 50,
-			"threatening" = 40,
-			"catastrophic" = 10))
-	switch(wave_name)
-		if("normal")
-			wave_type = GLOB.meteors_normal
-		if("threatening")
-			wave_type = GLOB.meteors_threatening
-		if("catastrophic")
-			wave_type = GLOB.meteors_catastrophic
-		if("meaty")
-			wave_type = GLOB.meteorsB
-		if("space dust")
-			wave_type = GLOB.meteorsC
-		else
-			WARNING("Wave name of [wave_name] not recognised.")
-			kill()
-
-/datum/round_event/meteor_wave/announce()
-	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
-
-/datum/round_event/meteor_wave/tick()
-	if(IsMultiple(activeFor, 3))
-		spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
-
-/datum/round_event_control/meteor_wave/threatening
-	name = "Meteor Wave: Threatening"
-	typepath = /datum/round_event/meteor_wave/threatening
-	weight = 2
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave/threatening
-	wave_name = "threatening"
-
-/datum/round_event_control/meteor_wave/catastrophic
-	name = "Meteor Wave: Catastrophic"
-	typepath = /datum/round_event/meteor_wave/catastrophic
-	weight = 1
-	min_players = 5
-	max_occurrences = 3
-
-/datum/round_event/meteor_wave/catastrophic
-	wave_name = "catastrophic"
+// Normal strength
+
+/datum/round_event_control/meteor_wave
+	name = "Meteor Wave: Normal"
+	typepath = /datum/round_event/meteor_wave
+	weight = 4
+	min_players = 5
+	max_occurrences = 3
+
+/datum/round_event/meteor_wave
+	startWhen		= 6
+	endWhen			= 66
+	announceWhen	= 1
+	var/list/wave_type
+	var/wave_name = "normal"
+
+/datum/round_event/meteor_wave/New()
+	..()
+	if(!wave_type)
+		determine_wave_type()
+
+/datum/round_event/meteor_wave/proc/determine_wave_type()
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		wave_name = "halloween"
+	if(!wave_name)
+		wave_name = pickweight(list(
+			"normal" = 50,
+			"threatening" = 40,
+			"catastrophic" = 10))
+	switch(wave_name)
+		if("normal")
+			wave_type = GLOB.meteors_normal
+		if("threatening")
+			wave_type = GLOB.meteors_threatening
+		if("catastrophic")
+			wave_type = GLOB.meteors_catastrophic
+		if("meaty")
+			wave_type = GLOB.meteorsB
+		if("space dust")
+			wave_type = GLOB.meteorsC
+		if("halloween")
+			wave_type = GLOB.meteorsSPOOKY
+		else
+			WARNING("Wave name of [wave_name] not recognised.")
+			kill()
+
+/datum/round_event/meteor_wave/announce()
+	priority_announce("Meteors have been detected on collision course with the station.", "Meteor Alert", 'sound/ai/meteors.ogg')
+
+/datum/round_event/meteor_wave/tick()
+	if(IsMultiple(activeFor, 3))
+		spawn_meteors(5, wave_type) //meteor list types defined in gamemode/meteor/meteors.dm
+
+/datum/round_event_control/meteor_wave/threatening
+	name = "Meteor Wave: Threatening"
+	typepath = /datum/round_event/meteor_wave/threatening
+	weight = 2
+	min_players = 5
+	max_occurrences = 3
+
+/datum/round_event/meteor_wave/threatening
+	wave_name = "threatening"
+
+/datum/round_event_control/meteor_wave/catastrophic
+	name = "Meteor Wave: Catastrophic"
+	typepath = /datum/round_event/meteor_wave/catastrophic
+	weight = 1
+	min_players = 5
+	max_occurrences = 3
+
+/datum/round_event/meteor_wave/catastrophic
+	wave_name = "catastrophic"

code/modules/events/shuttle_loan.dm

@@ -29,9 +29,9 @@
 		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")
 		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")
 			thanks_msg = "The cargo shuttle should return in 5 minutes."

code/modules/events/wizard/departmentrevolt.dm

@@ -45,7 +45,7 @@
 						SSticker.mode.traitors += M
 						M.special_role = "separatist"
 						H.log_message("<font color='red'>Was made into a separatist, long live [nation]!</font>", INDIVIDUAL_ATTACK_LOG)
-						to_chat(H, "<B>You are a separatist! [nation] forever! Protect the soverignty of your newfound land with your comrades in arms!</B>")
+						to_chat(H, "<B>You are a separatist! [nation] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
 	if(citizens.len)
 		var/message
 		for(var/job in jobs_to_revolt)

code/modules/flufftext/Hallucination.dm

@@ -164,7 +164,8 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 	feedback_details += "Vent Coords: [center.x],[center.y],[center.z]"
 	flood_images += image(image_icon,center,image_state,MOB_LAYER)
 	flood_turfs += center
-	if(target.client) target.client.images |= flood_images
+	if(target.client)
+		target.client.images |= flood_images
 	next_expand = world.time + FAKE_FLOOD_EXPAND_TIME
 	START_PROCESSING(SSobj, src)
 
@@ -960,13 +961,18 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 		var/l = ui_hand_position(target.get_held_index_of_item(l_hand))
 		var/r = ui_hand_position(target.get_held_index_of_item(r_hand))
 		var/list/slots_free = list(l,r)
-		if(l_hand) slots_free -= l
-		if(r_hand) slots_free -= r
+		if(l_hand)
+			slots_free -= l
+		if(r_hand)
+			slots_free -= r
 		if(ishuman(target))
 			var/mob/living/carbon/human/H = target
-			if(!H.belt) slots_free += ui_belt
-			if(!H.l_store) slots_free += ui_storage1
-			if(!H.r_store) slots_free += ui_storage2
+			if(!H.belt)
+				slots_free += ui_belt
+			if(!H.l_store)
+				slots_free += ui_storage1
+			if(!H.r_store)
+				slots_free += ui_storage2
 		if(slots_free.len)
 			target.halitem.screen_loc = pick(slots_free)
 			target.halitem.layer = ABOVE_HUD_LAYER
@@ -999,7 +1005,8 @@ GLOBAL_LIST_INIT(hallucinations_major, list(
 					target.halitem.icon_state = "flashbang1"
 					target.halitem.name = "Flashbang"
 			feedback_details += "Type: [target.halitem.name]"
-			if(target.client) target.client.screen += target.halitem
+			if(target.client)
+				target.client.screen += target.halitem
 			QDEL_IN(target.halitem, rand(150, 350))
 	qdel(src)
 

code/modules/flufftext/TextFilters.dm

@@ -41,8 +41,10 @@
 	step(M, pick(d,turn(d,90),turn(d,-90)))
 
 /proc/Ellipsis(original_msg, chance = 50, keep_words)
-	if(chance <= 0) return "..."
-	if(chance >= 100) return original_msg
+	if(chance <= 0)
+		return "..."
+	if(chance >= 100)
+		return original_msg
 
 	var/list
 		words = splittext(original_msg," ")

code/modules/food_and_drinks/drinks/drinks.dm

@@ -15,8 +15,10 @@
 	resistance_flags = 0
 
 /obj/item/reagent_containers/food/drinks/on_reagent_change()
-	if (gulp_size < 5) gulp_size = 5
-	else gulp_size = max(round(reagents.total_volume / 5), 5)
+	if (gulp_size < 5)
+		gulp_size = 5
+	else
+		gulp_size = max(round(reagents.total_volume / 5), 5)
 
 /obj/item/reagent_containers/food/drinks/attack(mob/M, mob/user, def_zone)
 
@@ -51,7 +53,8 @@
 	return 1
 
 /obj/item/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 	if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
 
 		if (!is_open_container())

code/modules/food_and_drinks/food/condiment.dm

@@ -54,7 +54,8 @@
 	return 1
 
 /obj/item/reagent_containers/food/condiment/afterattack(obj/target, mob/user , proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 	if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
 
 		if(!target.reagents.total_volume)
@@ -225,7 +226,7 @@
 
 /obj/item/reagent_containers/food/condiment/pack
 	name = "condiment pack"
-	desc = "A small plastic pack with condiments to put on your food"
+	desc = "A small plastic pack with condiments to put on your food."
 	icon_state = "condi_empty"
 	volume = 10
 	amount_per_transfer_from_this = 10
@@ -236,7 +237,8 @@
 	return
 
 /obj/item/reagent_containers/food/condiment/pack/afterattack(obj/target, mob/user , proximity)
-	if(!proximity) return
+	if(!proximity)
+		return
 
 	//You can tear the bag open above food to put the condiments on it, obviously.
 	if(istype(target, /obj/item/reagent_containers/food/snacks))

code/modules/food_and_drinks/food/customizables.dm

@@ -57,7 +57,8 @@
 			update_overlays(S)
 			to_chat(user, "<span class='notice'>You add the [I.name] to the [name].</span>")
 			update_name(S)
-	else . = ..()
+	else
+		. = ..()
 
 
 /obj/item/reagent_containers/food/snacks/customizable/proc/update_name(obj/item/reagent_containers/food/snacks/S)
@@ -308,7 +309,8 @@
 			else
 				var/obj/item/reagent_containers/food/snacks/customizable/A = new/obj/item/reagent_containers/food/snacks/customizable/salad(get_turf(src))
 				A.initialize_custom_food(src, S, user)
-	else . = ..()
+	else
+		. = ..()
 	return
 
 /obj/item/reagent_containers/glass/bowl/on_reagent_change()

code/modules/food_and_drinks/food/snacks/dough.dm

@@ -43,7 +43,7 @@
 
 /obj/item/reagent_containers/food/snacks/pizzabread
 	name = "pizza bread"
-	desc = "Add ingredients to make a pizza"
+	desc = "Add ingredients to make a pizza."
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "pizzabread"
 	custom_food_type = /obj/item/reagent_containers/food/snacks/customizable/pizza
@@ -124,7 +124,7 @@
 
 /obj/item/reagent_containers/food/snacks/pastrybase
 	name = "pastry base"
-	desc = "A base for any self-respecting pastry"
+	desc = "A base for any self-respecting pastry."
 	icon = 'icons/obj/food/food_ingredients.dmi'
 	icon_state = "pastrybase"
 	list_reagents = list("nutriment" = 1)

code/modules/food_and_drinks/food/snacks/meat.dm

@@ -4,7 +4,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/slab
 	name = "meat"
-	desc = "A slab of meat"
+	desc = "A slab of meat."
 	icon_state = "meat"
 	dried_type = /obj/item/reagent_containers/food/snacks/sosjerky/healthy
 	bitesize = 3
@@ -82,7 +82,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
 	icon_state = "lizardmeat"
-	desc = "Delicious dino damage"
+	desc = "Delicious dino damage."
 	filling_color = "#6B8E23"
 	tastes = list("meat" = 4, "scales" = 1)
 	foodtype = MEAT | RAW
@@ -96,7 +96,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
 	icon_state = "shadowmeat"
-	desc = "Ow, the edge"
+	desc = "Ow, the edge."
 	filling_color = "#202020"
 	tastes = list("darkness" = 1, "meat" = 1)
 	foodtype = MEAT | RAW
@@ -180,7 +180,7 @@
 
 /obj/item/reagent_containers/food/snacks/meat/slab/xeno
 	name = "xeno meat"
-	desc = "A slab of meat"
+	desc = "A slab of meat."
 	icon_state = "xenomeat"
 	list_reagents = list("nutriment" = 3, "vitamin" = 1)
 	bitesize = 4