Merge branch 'master' into FermiChem

code/modules/NTNet/network.dm

@@ -133,14 +133,14 @@
 	return FALSE
 
 /datum/ntnet/proc/log_data_transfer(datum/netdata/data)
-	logs += "[station_time_timestamp()] - [data.generate_netlog()]"
+	logs += "[STATION_TIME_TIMESTAMP("hh:mm:ss")] - [data.generate_netlog()]"
 	if(logs.len > setting_maxlogcount)
 		logs = logs.Copy(logs.len - setting_maxlogcount, 0)
 	return
 
 // Simplified logging: Adds a log. log_string is mandatory parameter, source is optional.
 /datum/ntnet/proc/add_log(log_string, obj/item/computer_hardware/network_card/source = null)
-	var/log_text = "[station_time_timestamp()] - "
+	var/log_text = "[STATION_TIME_TIMESTAMP("hh:mm:ss")] - "
 	if(source)
 		log_text += "[source.get_network_tag()] - "
 	else

code/modules/admin/admin.dm

@@ -538,13 +538,22 @@
 	message_admins("[key_name_admin(usr)] toggled OOC.")
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle OOC", "[GLOB.ooc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
+/datum/admins/proc/toggleooclocal()
+	set category = "Server"
+	set desc="Toggle dat bitch"
+	set name="Toggle Local OOC"
+	toggle_looc()
+	log_admin("[key_name(usr)] toggled LOOC.")
+	message_admins("[key_name_admin(usr)] toggled LOOC.")
+	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Local OOC", "[GLOB.ooc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/toggleoocdead()
 	set category = "Server"
 	set desc="Toggle dis bitch"
 	set name="Toggle Dead OOC"
 	toggle_dooc()
 
-	log_admin("[key_name(usr)] toggled OOC.")
+	log_admin("[key_name(usr)] toggled Dead OOC.")
 	message_admins("[key_name_admin(usr)] toggled Dead OOC.")
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Dead OOC", "[GLOB.dooc_allowed ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 

code/modules/admin/admin_investigate.dm

@@ -2,7 +2,7 @@
 	if(!message || !subject)
 		return
 	var/F = file("[GLOB.log_directory]/[subject].html")
-	WRITE_FILE(F, "<small>[time_stamp()] [REF(src)] ([x],[y],[z])</small> || [src] [message]<br>")
+	WRITE_FILE(F, "<small>[TIME_STAMP("hh:mm:ss", FALSE)] [REF(src)] ([x],[y],[z])</small> || [src] [message]<br>")
 
 /client/proc/investigate_show(subject in list("notes, memos, watchlist", INVESTIGATE_RESEARCH, INVESTIGATE_EXONET, INVESTIGATE_PORTAL, INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY, INVESTIGATE_HALLUCINATIONS, INVESTIGATE_RADIATION, INVESTIGATE_CIRCUIT, INVESTIGATE_NANITES) )
 	set name = "Investigate"

code/modules/admin/admin_verbs.dm

@@ -24,6 +24,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin())
 	/client/proc/game_panel,			/*game panel, allows to change game-mode etc*/
 	/client/proc/check_ai_laws,			/*shows AI and borg laws*/
 	/datum/admins/proc/toggleooc,		/*toggles ooc on/off for everyone*/
+	/datum/admins/proc/toggleooclocal,	/*toggles looc on/off for everyone*/
 	/datum/admins/proc/toggleoocdead,	/*toggles ooc on/off for everyone who is dead*/
 	/datum/admins/proc/toggleaooc,		/*toggles antag ooc on/off*/
 	/datum/admins/proc/toggleenter,		/*toggles whether people can join the current game*/

code/modules/admin/chat_commands.dm

@@ -126,3 +126,18 @@ GLOBAL_LIST(round_end_notifiees)
 /datum/tgs_chat_command/reload_admins/proc/ReloadAsync()
 	set waitfor = FALSE
 	load_admins()
+
+/datum/tgs_chat_command/addbunkerbypass
+	name = "whitelist"
+	help_text = "whitelist <ckey>"
+	admin_only = TRUE
+
+/datum/tgs_chat_command/addbunkerbypass/Run(datum/tgs_chat_user/sender, params)
+	if(!CONFIG_GET(flag/sql_enabled))
+		return "The Database is not enabled!"
+
+	GLOB.bunker_passthrough |= ckey(params)
+
+	log_admin("[sender.friendly_name] has added [params] to the current round's bunker bypass list.")
+	message_admins("[sender.friendly_name] has added [params] to the current round's bunker bypass list.")
+	return "[params] has been added to the current round's bunker bypass list."

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -217,3 +217,7 @@
 /proc/_step_away(ref, trg, max)
 	step_away(ref, trg, max)
 
+/proc/_instantiate_at(thing, location)
+	new thing(location)
+
+

code/modules/admin/verbs/adminhelp.dm

@@ -214,7 +214,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	if(heard_by_no_admins && usr && usr.ckey != initiator_ckey)
 		heard_by_no_admins = FALSE
 		send2irc(initiator_ckey, "Ticket #[id]: Answered by [key_name(usr)]")
-	_interactions += "[time_stamp()]: [formatted_message]"
+	_interactions += "[TIME_STAMP("hh:mm:ss", FALSE)]: [formatted_message]"
 
 //Removes the ahelp verb and returns it after 2 minutes
 /datum/admin_help/proc/TimeoutVerb()
@@ -416,9 +416,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
 	dat += "</b>[GLOB.TAB][TicketHref("Refresh", ref_src)][GLOB.TAB][TicketHref("Re-Title", ref_src, "retitle")]"
 	if(state != AHELP_ACTIVE)
 		dat += "[GLOB.TAB][TicketHref("Reopen", ref_src, "reopen")]"
-	dat += "<br><br>Opened at: [gameTimestamp(wtime = opened_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
+	dat += "<br><br>Opened at: [GAMETIMESTAMP("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - opened_at)] ago)"
 	if(closed_at)
-		dat += "<br>Closed at: [gameTimestamp(wtime = closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
+		dat += "<br>Closed at: [GAMETIMESTAMP("hh:mm:ss", closed_at)] (Approx [DisplayTimeText(world.time - closed_at)] ago)"
 	dat += "<br><br>"
 	if(initiator)
 		dat += "<b>Actions:</b> [FullMonty(ref_src)]<br>"

code/modules/admin/verbs/panicbunker.dm

@@ -13,6 +13,7 @@
 	if (new_pb && !SSdbcore.Connect())
 		message_admins("The Database is not connected! Panic bunker will not work until the connection is reestablished.")
 	SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Toggle Panic Bunker", "[new_pb ? "Enabled" : "Disabled"]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	send2irc("Panic Bunker", "[key_name(usr)] has toggled the Panic Bunker, it is now [new_pb ? "enabled" : "disabled"].")
 
 /client/proc/addbunkerbypass(ckeytobypass as text)
 	set category = "Special Verbs"
@@ -24,7 +25,8 @@
 
 	GLOB.bunker_passthrough |= ckey(ckeytobypass)
 	log_admin("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
-	message_admins("[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+	message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
+	send2irc("Panic Bunker", "[key_name(usr)] has added [ckeytobypass] to the current round's bunker bypass list.")
 
 /client/proc/revokebunkerbypass(ckeytobypass as text)
 	set category = "Special Verbs"
@@ -36,5 +38,5 @@
 
 	GLOB.bunker_passthrough -= ckey(ckeytobypass)
 	log_admin("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
-	message_admins("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
-
+	message_admins("[key_name_admin(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
+	send2irc("Panic Bunker", "[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")

code/modules/antagonists/blob/blob/blobs/core.dm

@@ -4,7 +4,7 @@
 	icon_state = "blank_blob"
 	desc = "A huge, pulsating yellow mass."
 	max_integrity = 400
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90)
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 20, "energy" = 5, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 90) // Last stand
 	explosion_block = 6
 	point_return = -1
 	health_regen = 0 //we regen in Life() instead of when pulsed

code/modules/antagonists/blob/blob/blobs/factory.dm

@@ -6,6 +6,7 @@
 	max_integrity = 200
 	health_regen = 1
 	point_return = 25
+	armor = list("melee" = 10, "bullet" = 20, "laser" = 15, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
 	var/list/spores = list()
 	var/mob/living/simple_animal/hostile/blob/blobbernaut/naut = null
 	var/max_spores = 3

code/modules/antagonists/blob/blob/blobs/resource.dm

@@ -5,6 +5,7 @@
 	desc = "A thin spire of slightly swaying tendrils."
 	max_integrity = 60
 	point_return = 15
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 0, "energy" = 0, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
 	var/resource_delay = 0
 
 /obj/structure/blob/resource/scannerreport()

code/modules/antagonists/blob/blob/blobs/shield.dm

@@ -8,7 +8,7 @@
 	explosion_block = 3
 	point_return = 4
 	atmosblock = TRUE
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
+	armor = list("melee" = 25, "bullet" = 25, "laser" = 15, "energy" = 10, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
 
 /obj/structure/blob/shield/scannerreport()
 	if(atmosblock)
@@ -20,11 +20,12 @@
 
 /obj/structure/blob/shield/update_icon()
 	..()
-	if(obj_integrity <= 75)
+	if(obj_integrity <= 70)
 		icon_state = "blob_shield_damaged"
 		name = "weakened strong blob"
 		desc = "A wall of twitching tendrils."
 		atmosblock = FALSE
+		armor = list("melee" = 15, "bullet" = 15, "laser" = 5, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 90, "acid" = 90)
 	else
 		icon_state = initial(icon_state)
 		name = initial(name)

code/modules/antagonists/changeling/cellular_emporium.dm

@@ -72,7 +72,7 @@
 	name = "Cellular Emporium"
 	icon_icon = 'icons/obj/drinks.dmi'
 	button_icon_state = "changelingsting"
-	background_icon_state = "bg_alien"
+	background_icon_state = "bg_ling"
 	var/datum/cellular_emporium/cellular_emporium
 
 /datum/action/innate/cellular_emporium/New(our_target)

code/modules/antagonists/changeling/changeling_power.dm

@@ -20,10 +20,12 @@
 
 
 /obj/effect/proc_holder/changeling/proc/on_purchase(mob/user, is_respec)
+	action.Grant(user)
 	if(!is_respec)
 		SSblackbox.record_feedback("tally", "changeling_power_purchase", 1, name)
 
 /obj/effect/proc_holder/changeling/proc/on_refund(mob/user)
+	action.Remove(user)
 	return
 
 /obj/effect/proc_holder/changeling/Click()

code/modules/antagonists/changeling/powers/absorb.dm

@@ -4,6 +4,9 @@
 	chemical_cost = 0
 	dna_cost = 0
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_absorb_dna"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/absorbDNA/can_sting(mob/living/carbon/user)
 	if(!..())

code/modules/antagonists/changeling/powers/adrenaline.dm

@@ -6,6 +6,9 @@
 	dna_cost = 2
 	req_human = 1
 	req_stat = UNCONSCIOUS
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_adrenals"
+	action_background_icon_state = "bg_ling"
 
 //Recover from stuns.
 /obj/effect/proc_holder/changeling/adrenaline/sting_action(mob/living/user)

code/modules/antagonists/changeling/powers/augmented_eyesight.dm

@@ -8,12 +8,16 @@
 	chemical_cost = 0
 	dna_cost = 2 //Would be 1 without thermal vision
 	active = FALSE
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_augmented_eyesight"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/augmented_eyesight/on_purchase(mob/user) //The ability starts inactive, so we should be protected from flashes.
 	var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES)
 	if (E)
 		E.flash_protect = 2 //Adjust the user's eyes' flash protection
 		to_chat(user, "We adjust our eyes to protect them from bright lights.")
+		action.Grant(user)
 	else
 		to_chat(user, "We can't adjust our eyes if we don't have any!")
 
@@ -42,6 +46,7 @@
 
 
 /obj/effect/proc_holder/changeling/augmented_eyesight/on_refund(mob/user) //Get rid of X-ray vision and flash protection when the user refunds this ability
+	action.Remove(user)
 	var/obj/item/organ/eyes/E = user.getorganslot(ORGAN_SLOT_EYES)
 	if(E)
 		if (active)

code/modules/antagonists/changeling/powers/biodegrade.dm

@@ -6,6 +6,9 @@
 	loudness = 1
 	dna_cost = 2
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_freedom"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/biodegrade/sting_action(mob/living/carbon/human/user)
 	var/used = FALSE // only one form of shackles removed per use

code/modules/antagonists/changeling/powers/chameleon_skin.dm

@@ -5,6 +5,9 @@
 	dna_cost = 2
 	chemical_cost = 25
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_camouflage"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/chameleon_skin/sting_action(mob/user)
 	var/mob/living/carbon/human/H = user //SHOULD always be human, because req_human = 1
@@ -18,6 +21,7 @@
 	return TRUE
 
 /obj/effect/proc_holder/changeling/chameleon_skin/on_refund(mob/user)
+	action.Remove(user)
 	if(user.has_dna())
 		var/mob/living/carbon/C = user
 		var/datum/mutation/human/HM = GLOB.mutations_list[CHAMELEON]

code/modules/antagonists/changeling/powers/digitalcamo.dm

@@ -4,6 +4,9 @@
 	helptext = "We cannot be tracked by camera or seen by AI units while using this skill. However, humans looking at us will find us... uncanny. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	dna_cost = 1
 	loudness = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_digital_camo"
+	action_background_icon_state = "bg_ling"
 
 //Prevents AIs tracking you but makes you easily detectable to the human-eye.
 /obj/effect/proc_holder/changeling/digitalcamo/sting_action(mob/user)
@@ -19,5 +22,6 @@
 	return TRUE
 
 /obj/effect/proc_holder/changeling/digitalcamo/on_refund(mob/user)
+	action.Remove(user)
 	user.digitalcamo = 0
 	user.digitalinvis = 0

code/modules/antagonists/changeling/powers/fakedeath.dm

@@ -6,13 +6,16 @@
 	req_dna = 1
 	req_stat = DEAD
 	ignores_fakedeath = TRUE
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_regenerative_stasis"
+	action_background_icon_state = "bg_ling"
 
 //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay.
 /obj/effect/proc_holder/changeling/fakedeath/sting_action(mob/living/user)
 	to_chat(user, "<span class='notice'>We begin our stasis, preparing energy to arise once more.</span>")
 	if(user.stat != DEAD)
 		user.emote("deathgasp")
-		user.tod = station_time_timestamp()
+		user.tod = STATION_TIME_TIMESTAMP("hh:mm:ss")
 	user.fakedeath("changeling") //play dead
 	user.update_stat()
 	user.update_canmove()
@@ -25,7 +28,9 @@
 		var/datum/antagonist/changeling/C = user.mind.has_antag_datum(/datum/antagonist/changeling)
 		if(C && C.purchasedpowers)
 			to_chat(user, "<span class='notice'>We are ready to revive.</span>")
-			C.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null)
+			var/obj/effect/proc_holder/changeling/revive/RV =  new /obj/effect/proc_holder/changeling/revive(null)
+			C.purchasedpowers += RV
+			RV.action.Grant(user)
 
 /obj/effect/proc_holder/changeling/fakedeath/can_sting(mob/living/user)
 	if(user.has_trait(TRAIT_DEATHCOMA, "changeling"))

code/modules/antagonists/changeling/powers/fleshmend.dm

@@ -5,6 +5,9 @@
 	chemical_cost = 20
 	dna_cost = 2
 	req_stat = UNCONSCIOUS
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_fleshmend"
+	action_background_icon_state = "bg_ling"
 
 //Starts healing you every second for 10 seconds.
 //Can be used whilst unconscious.

code/modules/antagonists/changeling/powers/headcrab.dm

@@ -6,6 +6,9 @@
 	dna_cost = 1
 	loudness = 2
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_explode"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/headcrab/sting_action(mob/user)
 	set waitfor = FALSE

code/modules/antagonists/changeling/powers/hivemind.dm

@@ -5,6 +5,16 @@
 	helptext = "We will be able to talk with other changelings with :g. Exchanged DNA do not count towards absorb objectives."
 	dna_cost = 1
 	chemical_cost = -1
+	action_icon = 'icons/mob/actions/actions_xeno.dmi'
+	action_icon_state = "alien_whisper"
+	action_background_icon_state = "bg_ling"
+
+/obj/effect/proc_holder/changeling/hivemind_comms/sting_action(var/mob/living/user)
+	if (user.has_trait(CHANGELING_HIVEMIND_MUTE))
+		to_chat(user, "<span class='warning'>The poison in the air hinders our ability to interact with the hivemind.</span>")
+		return
+	var/input = stripped_input(usr, "Please choose a message to transmit.", "Changeling Hivemind", "")
+	user.say(".g[input]")
 
 /obj/effect/proc_holder/changeling/hivemind_comms/on_purchase(mob/user, is_respec)
 	..()
@@ -14,12 +24,15 @@
 	var/obj/effect/proc_holder/changeling/hivemind_upload/S1 = new
 	if(!changeling.has_sting(S1))
 		changeling.purchasedpowers+=S1
+		S1.action.Grant(user)
 	var/obj/effect/proc_holder/changeling/hivemind_download/S2 = new
 	if(!changeling.has_sting(S2))
 		changeling.purchasedpowers+=S2
+		S2.action.Grant(user)
 	var/obj/effect/proc_holder/changeling/linglink/S3 = new
 	if(!changeling.has_sting(S3))
 		changeling.purchasedpowers+=S3
+		S3.action.Grant(user)
 
 // HIVE MIND UPLOAD/DOWNLOAD DNA
 GLOBAL_LIST_EMPTY(hivemind_bank)
@@ -29,6 +42,9 @@ GLOBAL_LIST_EMPTY(hivemind_bank)
 	desc = "Allows us to channel DNA in the airwaves to allow other changelings to absorb it."
 	chemical_cost = 10
 	dna_cost = -1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_upload"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/hivemind_upload/sting_action(var/mob/living/user)
 	if (user.has_trait(CHANGELING_HIVEMIND_MUTE))
@@ -63,6 +79,9 @@ GLOBAL_LIST_EMPTY(hivemind_bank)
 	desc = "Allows us to absorb DNA that has been channeled to the airwaves. Does not count towards absorb objectives."
 	chemical_cost = 10
 	dna_cost = -1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_download"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/hivemind_download/can_sting(mob/living/carbon/user)
 	if(!..())

code/modules/antagonists/changeling/powers/humanform.dm

@@ -3,6 +3,9 @@
 	desc = "We change into a human."
 	chemical_cost = 5
 	req_dna = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_human"
+	action_background_icon_state = "bg_ling"
 
 //Transform into a human.
 /obj/effect/proc_holder/changeling/humanform/sting_action(mob/living/carbon/user)

code/modules/antagonists/changeling/powers/lesserform.dm

@@ -5,6 +5,9 @@
 	dna_cost = 1
 	loudness = 2
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_lesser"
+	action_background_icon_state = "bg_ling"
 
 //Transform into a monkey.
 /obj/effect/proc_holder/changeling/lesserform/sting_action(mob/living/carbon/human/user)

code/modules/antagonists/changeling/powers/linglink.dm

@@ -4,6 +4,9 @@
 	chemical_cost = 0
 	dna_cost = -1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_link"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/linglink/can_sting(mob/living/carbon/user)
 	if(!..())

code/modules/antagonists/changeling/powers/mimic_voice.dm

@@ -5,6 +5,9 @@
 	chemical_cost = 0 //constant chemical drain hardcoded
 	dna_cost = 1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_mimic_voice"
+	action_background_icon_state = "bg_ling"
 
 
 // Fake Voice

code/modules/antagonists/changeling/powers/mutations.dm

@@ -56,6 +56,7 @@
 	return W
 
 /obj/effect/proc_holder/changeling/weapon/on_refund(mob/user)
+	action.Remove(user)
 	for(var/obj/item/I in user.held_items)
 		check_weapon(user, I)
 
@@ -105,6 +106,7 @@
 /obj/effect/proc_holder/changeling/suit/on_refund(mob/user)
 	if(!ishuman(user))
 		return
+	action.Remove(user)
 	var/mob/living/carbon/human/H = user
 	check_suit(H)
 
@@ -141,6 +143,9 @@
 	req_human = 1
 	weapon_type = /obj/item/melee/arm_blade
 	weapon_name_simple = "blade"
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_armblade"
+	action_background_icon_state = "bg_ling"
 
 /obj/item/melee/arm_blade
 	name = "arm blade"
@@ -225,6 +230,9 @@
 	weapon_type = /obj/item/gun/magic/tentacle
 	weapon_name_simple = "tentacle"
 	silent = TRUE
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_tentacle"
+	action_background_icon_state = "bg_ling"
 
 /obj/item/gun/magic/tentacle
 	name = "tentacle"
@@ -401,6 +409,9 @@
 	dna_cost = 1
 	loudness = 1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_shield"
+	action_background_icon_state = "bg_ling"
 
 	weapon_type = /obj/item/shield/changeling
 	weapon_name_simple = "shield"
@@ -454,6 +465,9 @@
 	dna_cost = 2
 	loudness = 1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_space_suit"
+	action_background_icon_state = "bg_ling"
 
 	suit_type = /obj/item/clothing/suit/space/changeling
 	helmet_type = /obj/item/clothing/head/helmet/space/changeling
@@ -503,6 +517,9 @@
 	loudness = 2
 	req_human = 1
 	recharge_slowdown = 0.25
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_armor"
+	action_background_icon_state = "bg_ling"
 
 	suit_type = /obj/item/clothing/suit/armor/changeling
 	helmet_type = /obj/item/clothing/head/helmet/changeling

code/modules/antagonists/changeling/powers/panacea.dm

@@ -5,6 +5,9 @@
 	chemical_cost = 20
 	dna_cost = 1
 	req_stat = UNCONSCIOUS
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_anatomic_panacea"
+	action_background_icon_state = "bg_ling"
 
 //Heals the things that the other regenerative abilities don't.
 /obj/effect/proc_holder/changeling/panacea/sting_action(mob/user)

code/modules/antagonists/changeling/powers/pheromone_receptors.dm

@@ -10,6 +10,9 @@
 	chemical_cost = 0 //Reduces regain rate while active.
 	dna_cost = 2
 	var/receptors_active = FALSE
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_pheromone"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/pheromone_receptors/sting_action(mob/living/carbon/user)
 	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)

code/modules/antagonists/changeling/powers/regenerate.dm

@@ -8,6 +8,9 @@
 	chemical_cost = 10
 	dna_cost = 0
 	req_stat = UNCONSCIOUS
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_regenerate"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/regenerate/sting_action(mob/living/user)
 	to_chat(user, "<span class='notice'>You feel an itching, both inside and \

code/modules/antagonists/changeling/powers/revive.dm

@@ -5,6 +5,9 @@
 	req_stat = DEAD
 	always_keep = TRUE
 	ignores_fakedeath = TRUE
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_revive"
+	action_background_icon_state = "bg_ling"
 
 //Revive from revival stasis
 /obj/effect/proc_holder/changeling/revive/sting_action(mob/living/carbon/user)
@@ -26,6 +29,7 @@
 	to_chat(user, "<span class='notice'>We have revived ourselves.</span>")
 	var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
 	changeling.purchasedpowers -= src
+	src.action.Remove(user)
 	return TRUE
 
 /obj/effect/proc_holder/changeling/revive/can_be_used_by(mob/living/user)

code/modules/antagonists/changeling/powers/shriek.dm

@@ -6,6 +6,9 @@
 	dna_cost = 1
 	loudness = 1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_resonant"
+	action_background_icon_state = "bg_ling"
 
 //A flashy ability, good for crowd control and sewing chaos.
 /obj/effect/proc_holder/changeling/resonant_shriek/sting_action(mob/user)
@@ -36,6 +39,9 @@
 	chemical_cost = 20
 	dna_cost = 1
 	loudness = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_dissonant"
+	action_background_icon_state = "bg_ling"
 
 //A flashy ability, good for crowd control and sewing chaos.
 /obj/effect/proc_holder/changeling/dissonant_shriek/sting_action(mob/user)

code/modules/antagonists/changeling/powers/spiders.dm

@@ -6,6 +6,9 @@
 	dna_cost = 1
 	loudness = 4
 	req_absorbs = 3
+	action_icon = 'icons/effects/effects.dmi'
+	action_icon_state = "spiderling"
+	action_background_icon_state = "bg_ling"
 
 //Makes some spiderlings. Good for setting traps and causing general trouble.
 /obj/effect/proc_holder/changeling/spiders/sting_action(mob/user)

code/modules/antagonists/changeling/powers/strained_muscles.dm

@@ -10,6 +10,9 @@
 	req_human = 1
 	var/stacks = 0 //Increments every 5 seconds; damage increases over time
 	active = 0 //Whether or not you are a hedgehog
+	action_icon = 'icons/obj/implants.dmi'
+	action_icon_state = "adrenal"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/strained_muscles/sting_action(mob/living/carbon/user)
 	active = !active

code/modules/antagonists/changeling/powers/tiny_prick.dm

@@ -64,12 +64,15 @@
 /obj/effect/proc_holder/changeling/sting/transformation
 	name = "Transformation Sting"
 	desc = "We silently sting a human, injecting a retrovirus that forces them to transform."
-	helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
+	helptext = "The victim will transform much like a changeling would. Does not provide a warning to others. Mutations will not be transferred, and monkeys will become human. This ability is loud, and might cause our blood to react violently to heat."
 	sting_icon = "sting_transform"
 	chemical_cost = 50
 	dna_cost = 3
-	loudness = 1
+	loudness = 2
 	var/datum/changelingprofile/selected_dna = null
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_transform"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/transformation/Click()
 	var/mob/user = usr
@@ -117,6 +120,9 @@
 	chemical_cost = 20
 	dna_cost = 1
 	loudness = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_fake"
+	action_background_icon_state = "bg_ling"
 
 /obj/item/melee/arm_blade/false
 	desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless."
@@ -169,6 +175,9 @@
 	sting_icon = "sting_extract"
 	chemical_cost = 25
 	dna_cost = 0
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_extract"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/extract_dna/can_sting(mob/user, mob/target)
 	if(..())
@@ -190,6 +199,9 @@
 	chemical_cost = 20
 	dna_cost = 2
 	loudness = 2
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_mute"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/mute/sting_action(mob/user, mob/living/carbon/target)
 	log_combat(user, target, "stung", "mute sting")
@@ -204,6 +216,9 @@
 	chemical_cost = 25
 	dna_cost = 1
 	loudness = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_blind"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/blind/sting_action(mob/user, mob/living/carbon/target)
 	log_combat(user, target, "stung", "blind sting")
@@ -220,6 +235,9 @@
 	sting_icon = "sting_lsd"
 	chemical_cost = 10
 	dna_cost = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_lsd"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/living/carbon/target)
 	log_combat(user, target, "stung", "LSD sting")
@@ -238,6 +256,9 @@
 	chemical_cost = 15
 	dna_cost = 2
 	loudness = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_sting_cryo"
+	action_background_icon_state = "bg_ling"
 
 /obj/effect/proc_holder/changeling/sting/cryo/sting_action(mob/user, mob/target)
 	log_combat(user, target, "stung", "cryo sting")

code/modules/antagonists/changeling/powers/transform.dm

@@ -5,6 +5,9 @@
 	dna_cost = 0
 	req_dna = 1
 	req_human = 1
+	action_icon = 'icons/mob/actions/actions_changeling.dmi'
+	action_icon_state = "ling_transform"
+	action_background_icon_state = "bg_ling"
 
 /obj/item/clothing/glasses/changeling
 	name = "flesh"

code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm

@@ -6,7 +6,8 @@
 	icon_state = "clockwork_helmet"
 	w_class = WEIGHT_CLASS_NORMAL
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-	flags_inv = HIDEEARS|HIDEHAIR|HIDEFACE
+	flags_inv = HIDEEARS|HIDEHAIR|HIDEFACE|HIDESNOUT
+	mutantrace_variation = MUTANTRACE_VARIATION
 	armor = list("melee" = 50, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 
 /obj/item/clothing/head/helmet/clockwork/Initialize()

code/modules/antagonists/cult/cult_items.dm

@@ -319,9 +319,10 @@
 	icon_state = "magus"
 	item_state = "magus"
 	desc = "A helm worn by the followers of Nar'Sie."
-	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 10, "acid" = 10)
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/magusred
 	name = "magus robes"

code/modules/antagonists/cult/runes.dm

@@ -112,7 +112,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 	var/list/invokers = list() //people eligible to invoke the rune
 	if(user)
 		invokers += user
-	if(req_cultists > 1 || istype(src, /obj/effect/rune/convert))
+	if(req_cultists > 1 || istype(src, /obj/effect/rune/narsie) || istype(src, /obj/effect/rune/convert))
 		var/list/things_in_range = range(1, src)
 		var/obj/item/toy/plush/narplush/plushsie = locate() in things_in_range
 		if(istype(plushsie) && plushsie.is_invoker)
@@ -250,14 +250,18 @@ structure_check() searches for nearby cultist structures required for the invoca
 	currentconversionman = convertee
 	conversiontimeout = world.time + (10 SECONDS)
 	convertee.Stun(100)
+	convertee.add_trait(TRAIT_MUTE, "conversionrune")
 	conversionresult = FALSE
 	while(world.time < conversiontimeout && convertee && !conversionresult)
 		stoplag(1)
 	currentconversionman = null
-	if(convertee && get_turf(convertee) != get_turf(src))
+	if(!convertee)
 		return FALSE
-	if(!conversionresult && convertee)
-		do_sacrifice(convertee, invokers)
+	convertee.remove_trait(TRAIT_MUTE, "conversionrune")
+	if(get_turf(convertee) != get_turf(src))
+		return FALSE
+	if(!conversionresult)
+		do_sacrifice(convertee, invokers, TRUE)
 		return FALSE
 	var/brutedamage = convertee.getBruteLoss()
 	var/burndamage = convertee.getFireLoss()
@@ -279,7 +283,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		H.cultslurring = 0
 	return 1
 
-/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers)
+/obj/effect/rune/convert/proc/do_sacrifice(mob/living/sacrificial, list/invokers, force_a_sac)
 	var/mob/living/first_invoker = invokers[1]
 	if(!first_invoker)
 		return FALSE
@@ -289,7 +293,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 
 
 	var/big_sac = FALSE
-	if((((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
+	if(!force_a_sac && (((ishuman(sacrificial) || iscyborg(sacrificial)) && sacrificial.stat != DEAD) || C.cult_team.is_sacrifice_target(sacrificial.mind)) && invokers.len < 3)
 		for(var/M in invokers)
 			to_chat(M, "<span class='cult italic'>[sacrificial] is too greatly linked to the world! You need three acolytes!</span>")
 		log_game("Offer rune failed - not enough acolytes and target is living or sac target")

code/modules/assembly/doorcontrol.dm

@@ -55,7 +55,7 @@
 			if(specialfunctions & SHOCK)
 				if(D.secondsElectrified)
 					D.secondsElectrified = -1
-					LAZYADD(D.shockedby, "\[[time_stamp()]\] [key_name(usr)]")
+					LAZYADD(D.shockedby, "\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(usr)]")
 					log_combat(usr, D, "electrified")
 				else
 					D.secondsElectrified = 0

code/modules/atmospherics/gasmixtures/gas_mixture.dm

@@ -29,6 +29,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	var/last_share = 0
 	var/list/reaction_results
 	var/list/analyzer_results //used for analyzer feedback - not initialized until its used
+	var/gc_share = FALSE // Whether to call garbage_collect() on the sharer during shares, used for immutable mixtures
 
 /datum/gas_mixture/New(volume)
 	gases = new
@@ -143,9 +144,6 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	//Performs air sharing calculations between two gas_mixtures assuming only 1 boundary length
 	//Returns: amount of gas exchanged (+ if sharer received)
 
-/datum/gas_mixture/proc/after_share(datum/gas_mixture/sharer)
-	//called on share's sharer to let it know it just got some gases
-
 /datum/gas_mixture/proc/temperature_share(datum/gas_mixture/sharer, conduction_coefficient)
 	//Performs temperature sharing calculations (via conduction) between two gas_mixtures assuming only 1 boundary length
 	//Returns: new temperature of the sharer
@@ -343,7 +341,8 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 	if(length(cached_gases ^ sharer_gases)) //if all gases were present in both mixtures, we know that no gases are 0
 		garbage_collect(cached_gases - sharer_gases) //any gases the sharer had, we are guaranteed to have. gases that it didn't have we are not.
 		sharer.garbage_collect(sharer_gases - cached_gases) //the reverse is equally true
-	sharer.after_share(src, atmos_adjacent_turfs)
+	if (initial(sharer.gc_share))
+		sharer.garbage_collect()
 	if(temperature_delta > MINIMUM_TEMPERATURE_TO_MOVE || abs(moved_moles) > MINIMUM_MOLES_DELTA_TO_MOVE)
 		var/our_moles
 		TOTAL_MOLES(cached_gases,our_moles)
@@ -351,9 +350,6 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
 		TOTAL_MOLES(sharer_gases,their_moles)
 		return (temperature_archived*(our_moles + moved_moles) - sharer.temperature_archived*(their_moles - moved_moles)) * R_IDEAL_GAS_EQUATION / volume
 
-/datum/gas_mixture/after_share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-	return
-
 /datum/gas_mixture/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
 	//transfer of thermal energy (via conduction) between self and sharer
 	if(sharer)

code/modules/atmospherics/gasmixtures/immutable_mixtures.dm

@@ -1,73 +1,71 @@
-//"immutable" gas mixture used for immutable calculations
-//it can be changed, but any changes will ultimately be undone before they can have any effect
-
-/datum/gas_mixture/immutable
-	var/initial_temperature
-
-/datum/gas_mixture/immutable/New()
-	..()
-	garbage_collect()
-
-/datum/gas_mixture/immutable/garbage_collect()
-	temperature = initial_temperature
-	temperature_archived = initial_temperature
-	gases.Cut()
-
-/datum/gas_mixture/immutable/archive()
-	return 1 //nothing changes, so we do nothing and the archive is successful
-
-/datum/gas_mixture/immutable/merge()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
-	. = ..(sharer, 0)
-	garbage_collect()
-
-/datum/gas_mixture/immutable/after_share()
-	garbage_collect()
-
-/datum/gas_mixture/immutable/react()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/copy()
-	return new type //we're immutable, so we can just return a new instance.
-
-/datum/gas_mixture/immutable/copy_from()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/copy_from_turf()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/parse_gas_string()
-	return 0 //we're immutable.
-
-/datum/gas_mixture/immutable/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
-	. = ..()
-	temperature = initial_temperature
-
-
-//used by space tiles
-/datum/gas_mixture/immutable/space
-	initial_temperature = TCMB
-
-/datum/gas_mixture/immutable/space/heat_capacity()
-	return HEAT_CAPACITY_VACUUM
-
-/datum/gas_mixture/immutable/space/remove()
-	return copy() //we're always empty, so we can just return a copy.
-
-/datum/gas_mixture/immutable/space/remove_ratio()
-	return copy() //we're always empty, so we can just return a copy.
-
-
-//used by cloners
-/datum/gas_mixture/immutable/cloner
-	initial_temperature = T20C
-
-/datum/gas_mixture/immutable/cloner/garbage_collect()
-	..()
-	ADD_GAS(/datum/gas/nitrogen, gases)
-	gases[/datum/gas/nitrogen][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
-
-/datum/gas_mixture/immutable/cloner/heat_capacity()
-	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20
+//"immutable" gas mixture used for immutable calculations
+//it can be changed, but any changes will ultimately be undone before they can have any effect
+
+/datum/gas_mixture/immutable
+	var/initial_temperature
+	gc_share = TRUE
+
+/datum/gas_mixture/immutable/New()
+	..()
+	garbage_collect()
+
+/datum/gas_mixture/immutable/garbage_collect()
+	temperature = initial_temperature
+	temperature_archived = initial_temperature
+	gases.Cut()
+
+/datum/gas_mixture/immutable/archive()
+	return 1 //nothing changes, so we do nothing and the archive is successful
+
+/datum/gas_mixture/immutable/merge()
+	return 0 //we're immutable.
+
+/datum/gas_mixture/immutable/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
+	. = ..(sharer, 0)
+	garbage_collect()
+
+/datum/gas_mixture/immutable/react()
+	return 0 //we're immutable.
+
+/datum/gas_mixture/immutable/copy()
+	return new type //we're immutable, so we can just return a new instance.
+
+/datum/gas_mixture/immutable/copy_from()
+	return 0 //we're immutable.
+
+/datum/gas_mixture/immutable/copy_from_turf()
+	return 0 //we're immutable.
+
+/datum/gas_mixture/immutable/parse_gas_string()
+	return 0 //we're immutable.
+
+/datum/gas_mixture/immutable/temperature_share(datum/gas_mixture/sharer, conduction_coefficient, sharer_temperature, sharer_heat_capacity)
+	. = ..()
+	temperature = initial_temperature
+
+
+//used by space tiles
+/datum/gas_mixture/immutable/space
+	initial_temperature = TCMB
+
+/datum/gas_mixture/immutable/space/heat_capacity()
+	return HEAT_CAPACITY_VACUUM
+
+/datum/gas_mixture/immutable/space/remove()
+	return copy() //we're always empty, so we can just return a copy.
+
+/datum/gas_mixture/immutable/space/remove_ratio()
+	return copy() //we're always empty, so we can just return a copy.
+
+
+//used by cloners
+/datum/gas_mixture/immutable/cloner
+	initial_temperature = T20C
+
+/datum/gas_mixture/immutable/cloner/garbage_collect()
+	..()
+	ADD_GAS(/datum/gas/nitrogen, gases)
+	gases[/datum/gas/nitrogen][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
+
+/datum/gas_mixture/immutable/cloner/heat_capacity()
+	return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20

code/modules/atmospherics/machinery/datum_pipeline.dm

@@ -221,13 +221,16 @@
 		if(!P)
 			continue
 		GL += P.return_air()
-		for(var/obj/machinery/atmospherics/components/binary/valve/V in P.other_atmosmch)
-			if(V.on)
-				PL |= V.parents[1]
-				PL |= V.parents[2]
-		for(var/obj/machinery/atmospherics/components/unary/portables_connector/C in P.other_atmosmch)
-			if(C.connected_device)
-				GL += C.portableConnectorReturnAir()
+		for(var/atmosmch in P.other_atmosmch)
+			if (istype(atmosmch, /obj/machinery/atmospherics/components/binary/valve))
+				var/obj/machinery/atmospherics/components/binary/valve/V = atmosmch
+				if(V.on)
+					PL |= V.parents[1]
+					PL |= V.parents[2]
+			else if (istype(atmosmch, /obj/machinery/atmospherics/components/unary/portables_connector))
+				var/obj/machinery/atmospherics/components/unary/portables_connector/C = atmosmch
+				if(C.connected_device)
+					GL += C.portableConnectorReturnAir()
 
 	var/total_thermal_energy = 0
 	var/total_heat_capacity = 0

code/modules/awaymissions/corpse.dm

@@ -41,6 +41,11 @@
 		return
 	if(QDELETED(src) || QDELETED(user))
 		return
+	if(isobserver(user))
+		var/mob/dead/observer/O = user
+		if(!O.can_reenter_round)
+			to_chat(user, "<span class='warning'>You are unable to reenter the round.</span>")
+			return
 	var/ghost_role = alert(latejoinercalling ? "Latejoin as [mob_name]? (This is a ghost role, and as such, it's very likely to be off-station.)" : "Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
 	if(ghost_role == "No" || !loc)
 		return

code/modules/cargo/exports/large_objects.dm

@@ -55,7 +55,6 @@
 	contents_cost = 700
 	export_types = list(/obj/structure/reagent_dispensers/beerkeg)
 
-
 /datum/export/large/pipedispenser
 	cost = 500
 	unit_name = "pipe dispenser"
@@ -122,7 +121,6 @@
 	unit_name = "packaged antimatter reactor section"
 	export_types = list(/obj/item/am_shielding_container)
 
-
 /datum/export/large/iv
 	cost = 50
 	unit_name = "iv drip"
@@ -133,3 +131,86 @@
 	unit_name = "security barrier"
 	export_types = list(/obj/item/grenade/barrier, /obj/structure/barricade/security)
 
+/datum/export/large/odysseus
+	cost = 5500
+	unit_name = "working odysseus"
+	export_types = list(/obj/mecha/medical/odysseus)
+	include_subtypes = FALSE
+
+/datum/export/large/ripley
+	cost = 6500
+	unit_name = "working ripley"
+	export_types = list(/obj/mecha/working/ripley)
+	include_subtypes = FALSE
+
+/datum/export/large/firefighter
+	cost = 9000
+	unit_name = "working firefighter"
+	export_types = list(/obj/mecha/working/ripley/firefighter)
+	include_subtypes = FALSE
+
+/datum/export/large/gygax
+	cost = 19000
+	unit_name = "working gygax"
+	export_types = list(/obj/mecha/combat/gygax)
+	include_subtypes = FALSE
+
+/datum/export/large/durand
+	cost = 10000
+	unit_name = "working durand"
+	export_types = list(/obj/mecha/combat/durand)
+	include_subtypes = FALSE
+
+/datum/export/large/phazon
+	cost = 25000 //Little over half do to needing a core
+	unit_name = "working phazon"
+	export_types = list(/obj/mecha/combat/phazon)
+	include_subtypes = FALSE
+
+/datum/export/large/marauder
+	cost = 15000 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
+	unit_name = "working marauder"
+	export_types = list(/obj/mecha/combat/marauder)
+	include_subtypes = FALSE
+
+/datum/export/large/deathripley
+	cost = 8500 //Still a "Combat class" mech - Illegal tech as well! 165% "normal" boundy price.
+	unit_name = "working illegally modified"
+	export_types = list(/obj/mecha/working/ripley/deathripley)
+	include_subtypes = FALSE
+
+/datum/export/large/gygaxdark
+	cost = 28500 //Still a Combat class mech - Illegal tech as well! 150% "normal" boundy price.
+	unit_name = "working illegally modified gygax"
+	export_types = list(/obj/mecha/combat/gygax/dark)
+	include_subtypes = FALSE
+
+/datum/export/large/oldripley
+	cost = 6250 //old mech - Scrap metal ! 50% "normal" boundy price.
+	unit_name = "working miner ripley"
+	export_types = list(/obj/mecha/working/ripley/mining)
+	include_subtypes = FALSE
+
+/datum/export/large/honk
+	cost = 12000 //Still a "Combat class" mech - Comats bordem honk!
+	unit_name = "working honker"
+	export_types = list(/obj/mecha/combat/honker)
+	include_subtypes = FALSE
+
+/datum/export/large/reticence
+	cost = 12000 //Still a "Combat class" mech - Has cloking and lethal weaponds.
+	unit_name = "working reticence"
+	export_types = list(/obj/mecha/combat/reticence)
+	include_subtypes = FALSE
+
+/datum/export/large/seraph
+	cost = 25500 //Still a Combat class mech - CC tech as well! 150% "normal" boundy price.
+	unit_name = "working seraph"
+	export_types = list(/obj/mecha/combat/marauder/seraph)
+	include_subtypes = FALSE
+
+/datum/export/large/mauler
+	cost = 12000 //Still a Combat class mech - CC lethal weaponds.
+	unit_name = "working legally modified marauder"
+	export_types = list(/obj/mecha/combat/marauder/mauler)
+	include_subtypes = FALSE

code/modules/cargo/packs.dm

@@ -81,6 +81,21 @@
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/emergency/radiatione_emergency
+	name = "Emergenc Radiation Protection Crate"
+	desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a few pill bottles that are able to handles radiation and the affects of the poisoning."
+	cost = 2500
+	contains = list(/obj/item/clothing/head/radiation,
+					/obj/item/clothing/head/radiation,
+					/obj/item/clothing/suit/radiation,
+					/obj/item/clothing/suit/radiation,
+					/obj/item/geiger_counter,
+					/obj/item/geiger_counter,
+					/obj/item/storage/pill_bottle/mutarad,
+					/obj/item/storage/firstaid/radbgone)
+	crate_name = "radiation protection crate"
+	crate_type = /obj/structure/closet/crate/radiation
+
 /datum/supply_pack/emergency/rcds
 	name = "Emergency RCDs"
 	desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!"
@@ -512,6 +527,14 @@
 					/obj/item/storage/belt/bandolier)
 	crate_name = "combat shotguns crate"
 
+/datum/supply_pack/security/armory/dragnetgun
+	name = "DRAGnet gun Crate"
+	desc = "Contains two DRAGnet gun. A Dynamic Rapid-Apprehension of the Guilty net the revolution in law enforcement technology that YOU Want! Requires Armory access to open."
+	cost = 3500
+	contains = list(/obj/item/gun/energy/e_gun/dragnet,
+					/obj/item/gun/energy/e_gun/dragnet)
+	crate_name = "anti riot net guns crate"
+
 /datum/supply_pack/security/armory/energy
 	name = "Energy Guns Crate"
 	desc = "Contains three Energy Guns, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open."
@@ -545,7 +568,7 @@
 
 /datum/supply_pack/security/armory/fire
 	name = "Incendiary Weapons Crate"
-	desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Armory access to open."
+	desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Brige access to open."
 	cost = 1500
 	access = ACCESS_HEADS
 	contains = list(/obj/item/flamethrower/full,
@@ -559,6 +582,16 @@
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
 
+/datum/supply_pack/security/armory/miniguns
+	name = "Personal Miniature Energy Guns"
+	desc = "Contains three miniature energy guns. Each gun has a disabler and a lethal option. Requires Armory access to open."
+	cost = 5000
+	contains = list(/obj/item/gun/energy/e_gun/mini,
+					/obj/item/gun/energy/e_gun/mini,
+					/obj/item/gun/energy/e_gun/mini)
+	crate_name = "personal energy guns crate"
+	crate_type = /obj/structure/closet/crate/secure/plasma
+
 /datum/supply_pack/security/armory/laserarmor
 	name = "Reflector Vest Crate"
 	desc = "Contains two vests of highly reflective material. Each armor piece diffuses a laser's energy by over half, as well as offering a good chance to reflect the laser entirely. Requires Armory access to open."
@@ -620,6 +653,13 @@
 					/obj/item/clothing/gloves/combat)
 	crate_name = "swat crate"
 
+/datum/supply_pack/security/armory/swattasers //Lesser AEG tbh
+	name = "SWAT tatical tasers Crate"
+	desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open."
+	cost = 8000
+	contains = list(/obj/item/gun/energy/e_gun/stun,
+					/obj/item/gun/energy/e_gun/stun)
+	crate_name = "swat taser crate"
 
 /datum/supply_pack/security/armory/wt550
 	name = "WT-550 Semi-Auto Rifle Crate"
@@ -1332,6 +1372,19 @@
 					/obj/item/storage/firstaid/o2)
 	crate_name = "oxygen deprivation kit crate"
 
+/datum/supply_pack/medical/advrad
+	name = "Radiation Treatment Crate Deluxe"
+	desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pill bottle, as well as a radiation treatment deluxe pill bottle!"
+	cost = 3500
+	contains = list(/obj/item/storage/pill_bottle/antirad_plus,
+					/obj/item/storage/pill_bottle/mutarad,
+					/obj/item/storage/firstaid/radbgone,
+					/obj/item/storage/firstaid/radbgone,
+					/obj/item/geiger_counter,
+					/obj/item/geiger_counter)
+	crate_name = "radiation protection crate"
+	crate_type = /obj/structure/closet/crate/radiation
+
 /datum/supply_pack/medical/surgery
 	name = "Surgical Supplies Crate"
 	desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical duffelbag, Sterilizine spray and collapsible roller bed."
@@ -1646,7 +1699,7 @@
 			/obj/item/t_scanner/adv_mining_scanner/lesser,
 			/obj/item/radio/headset/headset_cargo/mining,
 			/obj/item/storage/bag/ore,
-			/obj/item/clothing/suit/hooded/explorer,
+			/obj/item/clothing/suit/hooded/explorer/standard,
 			/obj/item/clothing/mask/gas/explorer)
 	crate_name = "shaft miner starter kit"
 	crate_type = /obj/structure/closet/crate/secure

code/modules/client/preferences.dm

@@ -75,13 +75,80 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/eye_color = "000"				//Eye color
 	var/datum/species/pref_species = new /datum/species/human()	//Mutant race
 	var/list/features = list("mcolor" = "FFF",
-		"tail_lizard" = "Smooth", "tail_human" = "Cat",
-		"snout" = "Round", "horns" = "None", "ears" = "Cat",
-		"wings" = "None", "frills" = "None", "spines" = "None",
-		"body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain")
+		"tail_lizard" = "Smooth",
+		"tail_human" = "None",
+		"snout" = "Round",
+		"horns" = "None",
+		"ears" = "None",
+		"wings" = "None",
+		"frills" = "None",
+		"spines" = "None",
+		"body_markings" = "None",
+		"legs" = "Normal Legs",
+		"moth_wings" = "Plain",
+		"mcolor2" = "FFF",
+		"mcolor3" = "FFF",
+		"mam_body_markings" = "Plain",
+		"mam_ears" = "None",
+		"mam_snouts" = "None",
+		"mam_tail" = "None",
+		"mam_tail_animated" = "None",
+		"xenodorsal" = "Standard",
+		"xenohead" = "Standard",
+		"xenotail" = "Xenomorph Tail",
+		"taur" = "None",
+		"exhibitionist" = FALSE,
+		"genitals_use_skintone" = FALSE,
+		"has_cock" = FALSE,
+		"cock_shape" = "Human",
+		"cock_length" = 6,
+		"cock_girth_ratio" = COCK_GIRTH_RATIO_DEF,
+		"cock_color" = "fff",
+		"has_sheath" = FALSE,
+		"sheath_color" = "fff",
+		"has_balls" = FALSE,
+		"balls_internal" = FALSE,
+		"balls_color" = "fff",
+		"balls_amount" = 2,
+		"balls_sack_size" = BALLS_SACK_SIZE_DEF,
+		"balls_size" = BALLS_SIZE_DEF,
+		"balls_cum_rate" = CUM_RATE,
+		"balls_cum_mult" = CUM_RATE_MULT,
+		"balls_efficiency" = CUM_EFFICIENCY,
+		"balls_fluid" = "semen",
+		"has_ovi" = FALSE,
+		"ovi_shape" = "knotted",
+		"ovi_length" = 6,
+		"ovi_color" = "fff",
+		"has_eggsack" = FALSE,
+		"eggsack_internal" = TRUE,
+		"eggsack_color" = "fff",
+		"eggsack_size" = BALLS_SACK_SIZE_DEF,
+		"eggsack_egg_color" = "fff",
+		"eggsack_egg_size" = EGG_GIRTH_DEF,
+		"has_breasts" = FALSE,
+		"breasts_color" = "fff",
+		"breasts_size" = "C",
+		"breasts_shape" = "Pair",
+		"breasts_fluid" = "milk",
+		"has_vag" = FALSE,
+		"vag_shape" = "Human",
+		"vag_color" = "fff",
+		"vag_clits" = 1,
+		"vag_clit_diam" = 0.25,
+		"has_womb" = FALSE,
+		"womb_cum_rate" = CUM_RATE,
+		"womb_cum_mult" = CUM_RATE_MULT,
+		"womb_efficiency" = CUM_EFFICIENCY,
+		"womb_fluid" = "femcum",
+		"ipc_screen" = "Sunburst",
+		"ipc_antenna" = "None",
+		"flavor_text" = ""
+		)
 
 	var/list/custom_names = list()
 	var/prefered_security_department = SEC_DEPT_RANDOM
+	var/custom_species = null
 
 		//Quirk list
 	var/list/positive_quirks = list()
@@ -127,6 +194,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 	var/action_buttons_screen_locs = list()
 
+	//backgrounds
+	var/mutable_appearance/character_background
+	var/icon/bgstate = "steel"
+	var/list/bgstate_options = list("000", "midgrey", "FFF", "white", "steel", "techmaint", "dark", "plating", "reinforced")
+
 /datum/preferences/New(client/C)
 	parent = C
 
@@ -264,8 +336,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<h2>Body</h2>"
 			dat += "<b>Gender:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=gender'>[gender == MALE ? "Male" : (gender == FEMALE ? "Female" : (gender == PLURAL ? "Non-binary" : "Object"))]</a><BR>"
 			dat += "<b>Species:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=species;task=input'>[pref_species.id]</a><BR>"
+			dat += "<b>Custom Species Name:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=custom_species;task=input'>[custom_species ? custom_species : "None"]</a><BR>"
 			dat += "<a style='display:block;width:100px' href='?_src_=prefs;preference=all;task=random'>Random Body</A><BR>"
 			dat += "<b>Always Random Body:</b><a href='?_src_=prefs;preference=all'>[be_random_body ? "Yes" : "No"]</A><BR>"
+			dat += "<br><b>Cycle background:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cycle_bg;task=input'>[bgstate]</a><BR>"
 
 			var/use_skintones = pref_species.use_skintones
 			if(use_skintones)
@@ -810,10 +884,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<tr><td colspan=4><hr></td></tr>"
 			dat += "<tr><td colspan=4><b><center>[gear_tab]</center></b></td></tr>"
 			dat += "<tr><td colspan=4><hr></td></tr>"
-			dat += "<tr style='vertical-align:top;'><td width=15%><b>Name</b></td>"
-			dat += "<td width=5% style='vertical-align:top'><b>Cost</b></td>"
-			dat += "<td><font size=2><b>Restrictions</b></font></td>"
-			dat += "<td><font size=2><b>Description</b></font></td></tr>"
+			dat += "<tr width=10% style='vertical-align:top;'><td width=15%><b>Name</b></td>"
+			dat += "<td style='vertical-align:top'><b>Cost</b></td>"
+			dat += "<td width=10%><font size=2><b>Restrictions</b></font></td>"
+			dat += "<td width=80%><font size=2><b>Description</b></font></td></tr>"
 			for(var/j in GLOB.loadout_items[gear_tab])
 				var/datum/gear/gear = GLOB.loadout_items[gear_tab][j]
 				var/donoritem
@@ -834,9 +908,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<td width = 5% style='vertical-align:top'>[gear.cost]</td><td>"
 				if(islist(gear.restricted_roles))
 					if(gear.restricted_roles.len)
-						dat += "<font size=2>"
-						dat += gear.restricted_roles.Join(";")
-						dat += "</font>"
+						if(gear.restricted_desc)
+							dat += "<font size=2>"
+							dat += gear.restricted_desc
+							dat += "</font>"
+						else
+							dat += "<font size=2>"
+							dat += gear.restricted_roles.Join(";")
+							dat += "</font>"
 				dat += "</td><td><font size=2><i>[gear.description]</i></font></td></tr>"
 			dat += "</table>"
 
@@ -1385,48 +1464,35 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("hair_style")
 					var/new_hair_style
-					if(gender == MALE)
-						new_hair_style = input(user, "Choose your character's hair style:", "Character Preference")  as null|anything in GLOB.hair_styles_male_list
-					else
-						new_hair_style = input(user, "Choose your character's hair style:", "Character Preference")  as null|anything in GLOB.hair_styles_female_list
+					new_hair_style = input(user, "Choose your character's hair style:", "Character Preference")  as null|anything in GLOB.hair_styles_list
 					if(new_hair_style)
 						hair_style = new_hair_style
 
 				if("next_hair_style")
-					if (gender == MALE)
-						hair_style = next_list_item(hair_style, GLOB.hair_styles_male_list)
-					else
-						hair_style = next_list_item(hair_style, GLOB.hair_styles_female_list)
+					hair_style = next_list_item(hair_style, GLOB.hair_styles_list)
 
 				if("previous_hair_style")
-					if (gender == MALE)
-						hair_style = previous_list_item(hair_style, GLOB.hair_styles_male_list)
-					else
-						hair_style = previous_list_item(hair_style, GLOB.hair_styles_female_list)
+					hair_style = previous_list_item(hair_style, GLOB.hair_styles_list)
 
 				if("facial")
 					var/new_facial = input(user, "Choose your character's facial-hair colour:", "Character Preference","#"+facial_hair_color) as color|null
 					if(new_facial)
 						facial_hair_color = sanitize_hexcolor(new_facial)
-					if("facial_hair_style")
-						var/new_facial_hair_style
-						if(gender == MALE)
-							new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in GLOB.facial_hair_styles_male_list
-						else
-							new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in GLOB.facial_hair_styles_female_list
-						if(new_facial_hair_style)
-							facial_hair_style = new_facial_hair_style
+
+				if("facial_hair_style")
+					var/new_facial_hair_style
+					new_facial_hair_style = input(user, "Choose your character's facial-hair style:", "Character Preference")  as null|anything in GLOB.facial_hair_styles_list
+					if(new_facial_hair_style)
+						facial_hair_style = new_facial_hair_style
 
 				if("next_facehair_style")
-					if (gender == MALE)
-						facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
-					else
-						facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
-					if("previous_facehair_style")
-						if (gender == MALE)
-							facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_male_list)
-						else
-							facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_female_list)
+					facial_hair_style = next_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
+
+				if("previous_facehair_style")
+					facial_hair_style = previous_list_item(facial_hair_style, GLOB.facial_hair_styles_list)
+
+				if("cycle_bg")
+					bgstate = next_list_item(bgstate, bgstate_options)
 
 				if("underwear")
 					var/new_underwear
@@ -1463,18 +1529,16 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						var/newtype = GLOB.species_list[result]
 						pref_species = new newtype()
 						//let's ensure that no weird shit happens on species swapping.
+						custom_species = null
 						if(!("body_markings" in pref_species.default_features))
 							features["body_markings"] = "None"
 						if(!("mam_body_markings" in pref_species.default_features))
 							features["mam_body_markings"] = "None"
-						if("mam_body_markings" in pref_species.default_features && features["mam_body_markings"] == "None")
-							features["mam_body_markings"] = "Plain"
+						if("mam_body_markings" in pref_species.default_features)
+							if(features["mam_body_markings"] == "None")
+								features["mam_body_markings"] = "Plain"
 						if("tail_lizard" in pref_species.default_features)
 							features["tail_lizard"] = "Smooth"
-						if("mam_tail" in pref_species.default_features)
-							features["mam_tail"] = "None"
-						if("mam_ears" in pref_species.default_features)
-							features["mam_ears"] = "None"
 						if(pref_species.id == "felinid")
 							features["mam_tail"] = "Cat"
 							features["mam_ears"] = "Cat"
@@ -1488,6 +1552,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						if(features["mcolor3"] == "#000" || (!(MUTCOLORS_PARTSONLY in pref_species.species_traits) && ReadHSV(temp_hsv)[3] < ReadHSV("#202020")[3]))
 							features["mcolor3"] = pref_species.default_color
 
+				if("custom_species")
+					var/new_species = reject_bad_name(input(user, "Choose your species subtype, if unique. This will show up on examinations and health scans. Do not abuse this:", "Character Preference", custom_species) as null|text)
+					if(new_species)
+						custom_species = new_species
+					else
+						custom_species = null
+
 				if("mutant_color")
 					var/new_mutantcolor = input(user, "Choose your character's alien/mutant color:", "Character Preference","#"+features["mcolor"]) as color|null
 					if(new_mutantcolor)
@@ -1584,16 +1655,33 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							features["tail_lizard"] = "None"
 
 				if("snout")
+					var/list/snowflake_snouts_list = list()
+					for(var/path in GLOB.snouts_list)
+						var/datum/sprite_accessory/mam_snouts/instance = GLOB.snouts_list[path]
+						if(istype(instance, /datum/sprite_accessory))
+							var/datum/sprite_accessory/S = instance
+							if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+								snowflake_snouts_list[S.name] = path
 					var/new_snout
-					new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.snouts_list
+					new_snout = input(user, "Choose your character's snout:", "Character Preference") as null|anything in snowflake_snouts_list
 					if(new_snout)
 						features["snout"] = new_snout
+						features["mam_snouts"] = "None"
+
 
 				if("mam_snouts")
+					var/list/snowflake_mam_snouts_list = list()
+					for(var/path in GLOB.mam_snouts_list)
+						var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path]
+						if(istype(instance, /datum/sprite_accessory))
+							var/datum/sprite_accessory/S = instance
+							if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(user.client.ckey)))
+								snowflake_mam_snouts_list[S.name] = path
 					var/new_mam_snouts
-					new_mam_snouts = input(user, "Choose your character's snout:", "Character Preference") as null|anything in GLOB.mam_snouts_list
+					new_mam_snouts = input(user, "Choose your character's snout:", "Character Preference") as null|anything in snowflake_mam_snouts_list
 					if(new_mam_snouts)
 						features["mam_snouts"] = new_mam_snouts
+						features["snout"] = "None"
 
 				if("horns")
 					var/new_horns
@@ -1601,12 +1689,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_horns)
 						features["horns"] = new_horns
 
-				if("ears")
-					var/new_ears
-					new_ears = input(user, "Choose your character's ears:", "Character Preference") as null|anything in GLOB.ears_list
-					if(new_ears)
-						features["ears"] = new_ears
-
 				if("wings")
 					var/new_wings
 					new_wings = input(user, "Choose your character's wings:", "Character Preference") as null|anything in GLOB.r_wings_list
@@ -2115,6 +2197,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.real_name = nameless ? "[real_name] #[rand(10000, 99999)]" : real_name
 	character.name = character.real_name
 	character.nameless = nameless
+	character.custom_species = custom_species
 
 	character.gender = gender
 	character.age = age
@@ -2149,34 +2232,29 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.dna.features = features.Copy()
 	character.dna.real_name = character.real_name
 	character.dna.nameless = character.nameless
+	character.dna.custom_species = character.custom_species
 
 	if("tail_lizard" in pref_species.default_features)
 		character.dna.species.mutant_bodyparts |= "tail_lizard"
-	else if("mam_tail" in pref_species.default_features)
+	if("mam_tail" in pref_species.default_features)
 		character.dna.species.mutant_bodyparts |= "mam_tail"
-	else if("xenotail" in pref_species.default_features)
+	if("xenotail" in pref_species.default_features)
 		character.dna.species.mutant_bodyparts |= "xenotail"
 
-	if("legs" in pref_species.default_features)
-		if(character.dna.features["legs"] == "Digitigrade Legs")
-			pref_species.species_traits += DIGITIGRADE
-			character.Digitigrade_Leg_Swap(FALSE)
-
-		if(character.dna.features["legs"] == "Normal Legs" && DIGITIGRADE in pref_species.species_traits)
-			pref_species.species_traits -= DIGITIGRADE
-			character.Digitigrade_Leg_Swap(TRUE)
-
-	else if((!"legs" in pref_species.default_features) && DIGITIGRADE in pref_species.species_traits)
+	if(("legs" in character.dna.species.mutant_bodyparts) && character.dna.features["legs"] == "Digitigrade Legs")
+		pref_species.species_traits |= DIGITIGRADE
+	else
 		pref_species.species_traits -= DIGITIGRADE
-		character.Digitigrade_Leg_Swap(TRUE)
 
 	if(DIGITIGRADE in pref_species.species_traits)
 		character.Digitigrade_Leg_Swap(FALSE)
+	else
+		character.Digitigrade_Leg_Swap(TRUE)
 
-	if(icon_updates)
-		character.update_body()
-		character.update_hair()
-		character.update_body_parts()
+	//let's be sure the character updates
+	character.update_body()
+	character.update_hair()
+	character.update_body_parts()
 
 /datum/preferences/proc/get_default_name(name_id)
 	switch(name_id)

code/modules/client/preferences_savefile.dm

@@ -236,6 +236,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Character
 	S["real_name"]			>> real_name
 	S["nameless"]			>> nameless
+	S["custom_species"]		>> custom_species
 	S["name_is_always_random"] >> be_random_name
 	S["body_is_always_random"] >> be_random_body
 	S["gender"]				>> gender
@@ -260,12 +261,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_lizard_body_markings"]	>> features["body_markings"]
 	S["feature_lizard_legs"]			>> features["legs"]
 	S["feature_moth_wings"]				>> features["moth_wings"]
-	if(!CONFIG_GET(flag/join_with_mutant_humans))
-		features["tail_human"] = "none"
-		features["ears"] = "none"
-	else
-		S["feature_human_tail"]				>> features["tail_human"]
-		S["feature_human_ears"]				>> features["ears"]
+	S["feature_human_tail"]				>> features["tail_human"]
+	S["feature_human_ears"]				>> features["ears"]
 
 	//Custom names
 	for(var/custom_name_id in GLOB.preferences_custom_names)
@@ -354,7 +351,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	gender = sanitize_gender(gender, TRUE, TRUE)
 	if(!real_name)
 		real_name = random_unique_name(gender)
-
+	custom_species = reject_bad_name(custom_species)
 	for(var/custom_name_id in GLOB.preferences_custom_names)
 		var/namedata = GLOB.preferences_custom_names[custom_name_id]
 		custom_names[custom_name_id] = reject_bad_name(custom_names[custom_name_id],namedata["allow_numbers"])
@@ -388,15 +385,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc))
 	features["mcolor"]	= sanitize_hexcolor(features["mcolor"], 3, 0)
 	features["tail_lizard"]	= sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard)
-	features["tail_human"] 	= sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None")
+	features["tail_human"] 	= sanitize_inlist(features["tail_human"], GLOB.tails_list_human)
 	features["snout"]	= sanitize_inlist(features["snout"], GLOB.snouts_list)
 	features["horns"] 	= sanitize_inlist(features["horns"], GLOB.horns_list)
-	features["ears"]	= sanitize_inlist(features["ears"], GLOB.ears_list, "None")
+	features["ears"]	= sanitize_inlist(features["ears"], GLOB.ears_list)
 	features["frills"] 	= sanitize_inlist(features["frills"], GLOB.frills_list)
 	features["spines"] 	= sanitize_inlist(features["spines"], GLOB.spines_list)
 	features["body_markings"] 	= sanitize_inlist(features["body_markings"], GLOB.body_markings_list)
-	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs")
-	features["moth_wings"] 	= sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain")
+	features["feature_lizard_legs"]	= sanitize_inlist(features["legs"], GLOB.legs_list)
+	features["moth_wings"] 	= sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list)
 
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -431,6 +428,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Character
 	WRITE_FILE(S["real_name"]			, real_name)
 	WRITE_FILE(S["nameless"]			, nameless)
+	WRITE_FILE(S["custom_species"]		, custom_species)
 	WRITE_FILE(S["name_is_always_random"] , be_random_name)
 	WRITE_FILE(S["body_is_always_random"] , be_random_body)
 	WRITE_FILE(S["gender"]				, gender)

code/modules/client/verbs/looc.dm

@@ -24,11 +24,8 @@
 		return
 
 	if(!holder)
-		if(!GLOB.ooc_allowed)
-			to_chat(src, "<span class='danger'> OOC is globally muted</span>")
-			return
-		if(!GLOB.dooc_allowed && (mob.stat == DEAD))
-			to_chat(usr, "<span class='danger'> OOC for dead mobs has been turned off.</span>")
+		if(!GLOB.looc_allowed)
+			to_chat(src, "<span class='danger'> LOOC is globally muted</span>")
 			return
 		if(prefs.muted & MUTE_OOC)
 			to_chat(src, "<span class='danger'> You cannot use OOC (muted).</span>")

code/modules/client/verbs/ooc.dm

@@ -80,6 +80,16 @@
 		GLOB.ooc_allowed = !GLOB.ooc_allowed
 	to_chat(world, "<B>The OOC channel has been globally [GLOB.ooc_allowed ? "enabled" : "disabled"].</B>")
 
+/proc/toggle_looc(toggle = null)
+	if(toggle != null)
+		if(toggle != GLOB.looc_allowed)
+			GLOB.looc_allowed = toggle
+		else
+			return
+	else
+		GLOB.looc_allowed = !GLOB.looc_allowed
+
+
 /proc/toggle_dooc(toggle = null)
 	if(toggle != null)
 		if(toggle != GLOB.dooc_allowed)

code/modules/client/verbs/suicide.dm

@@ -198,11 +198,13 @@
 
 		death(0)
 
-/mob/living/proc/suicide_log()
-	log_game("[key_name(src)] committed suicide at [AREACOORD(src)] as [src.type].")
+/mob/living/proc/suicide_log(ghosting)
+	log_game("[key_name(src)] [ghosting ? "ghosted" : "committed suicide"] at [AREACOORD(src)] as [src.type].")
+	message_admins("[key_name(src)] [ghosting ? "ghosted" : "committed suicide"] at [AREACOORD(src)].")
 
-/mob/living/carbon/human/suicide_log()
-	log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [AREACOORD(src)].")
+/mob/living/carbon/human/suicide_log(ghosting)
+	log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) [is_special_character(src) ? "(ANTAG!) " : ""][ghosting ? "ghosted" : "committed suicide"] at [AREACOORD(src)].")
+	message_admins("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) [is_special_character(src) ? "(ANTAG!) " : ""][ghosting ? "ghosted" : "committed suicide"] at [AREACOORD(src)].")
 
 /mob/living/proc/canSuicide()
 	switch(stat)

code/modules/clothing/head/_head.dm

@@ -8,6 +8,8 @@
 	var/blockTracking = 0 //For AI tracking
 	var/can_toggle = null
 	dynamic_hair_suffix = "+generic"
+	var/muzzle_var = NORMAL_STYLE
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //not all hats have muzzles
 
 /obj/item/clothing/head/Initialize()
 	. = ..()
@@ -15,6 +17,30 @@
 		var/mob/living/carbon/human/H = loc
 		H.update_hair()
 
+/obj/item/clothing/head/equipped(mob/user, slot)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/datum/species/pref_species = H.dna.species
+
+		if(mutantrace_variation)
+			if("mam_snouts" in pref_species.default_features)
+				if(H.dna.features["mam_snouts"] != "None")
+					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
+
+			else if("snout" in pref_species.default_features)
+				if(H.dna.features["snout"] != "None")
+					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
+
+			else
+				muzzle_var = NORMAL_STYLE
+
+			H.update_inv_head()
+
 /obj/item/clothing/head/worn_overlays(isinhands = FALSE)
 	. = list()
 	if(!isinhands)

code/modules/clothing/head/hardhat.dm

@@ -79,8 +79,9 @@
 	name = "atmospheric technician's firefighting helmet"
 	desc = "A firefighter's helmet, able to keep the user cool in any situation."
 	clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	cold_protection = HEAD
 	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	mutantrace_variation = MUTANTRACE_VARIATION

code/modules/clothing/head/helmet.dm

@@ -74,6 +74,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	dog_fashion = null
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/head/helmet/attack_self(mob/user)
 	if(can_toggle && !user.incapacitated())
@@ -210,10 +211,11 @@
 	icon_state = "knight_green"
 	item_state = "knight_green"
 	armor = list("melee" = 41, "bullet" = 15, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 2, "rad" = 0, "fire" = 0, "acid" = 50)
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	strip_delay = 80
 	dog_fashion = null
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 
 /obj/item/clothing/head/helmet/knight/Initialize(mapload)
@@ -242,6 +244,7 @@
 	icon_state = "skull"
 	item_state = "skull"
 	strip_delay = 100
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 //LightToggle
 

code/modules/clothing/head/jobs.dm

@@ -26,7 +26,7 @@
 	icon_state = "captain"
 	item_state = "that"
 	flags_inv = 0
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
 	dog_fashion = /datum/dog_fashion/head/captain
 
@@ -38,15 +38,28 @@
 
 	dog_fashion = null
 
+/obj/item/clothing/head/caphat/beret
+	name = "captain's beret"
+	desc = "A beret fit for a leader."
+	icon_state = "capberet"
+
+	dog_fashion = null
 
 //Head of Personnel
 /obj/item/clothing/head/hopcap
 	name = "head of personnel's cap"
 	icon_state = "hopcap"
 	desc = "The symbol of true bureaucratic micromanagement."
-	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	armor = list("melee" = 30, "bullet" = 25, "laser" = 25, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	dog_fashion = /datum/dog_fashion/head/hop
 
+/obj/item/clothing/head/hopcap/beret
+	name = "head of personnel's beret"
+	desc = "The symbol of true bureaucratic micromanagement, although in a fancy form."
+	icon_state = "hopberet"
+
+	dog_fashion = null
+
 //Chaplain
 /obj/item/clothing/head/nun_hood
 	name = "nun hood"
@@ -164,3 +177,27 @@
 	name = "treasure hunter's fedora"
 	desc = "You got red text today kid, but it doesn't mean you have to like it."
 	icon_state = "curator"
+
+//Chief Medical Officer
+/obj/item/clothing/head/beret/cmo
+	name = "chief medical officer's beret"
+	desc = "A fancy beret with a green cross, signifying your status in the station's medbay."
+	icon_state = "cmoberet"
+
+//Research Director
+/obj/item/clothing/head/beret/rd
+	name = "research director's beret"
+	desc = "A beret worn only by highly intelligent people."
+	icon_state = "rdberet"
+
+//Chief Engineer
+/obj/item/clothing/head/beret/ce
+	name = "chief engineer's beret"
+	desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price."
+	icon_state = "ceberet"
+
+//Quartermaster
+/obj/item/clothing/head/beret/qm
+	name = "quartermaster's beret"
+	desc = "This headwear shows off your Cargonian leadership"
+	icon_state = "qmberet"

code/modules/clothing/head/misc.dm

@@ -65,7 +65,8 @@
 	icon_state = "syndicate-helm-black-red"
 	item_state = "syndicate-helm-black-red"
 	desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/head/cueball
 	name = "cueball helmet"
@@ -73,7 +74,7 @@
 	icon_state = "cueball"
 	item_state="cueball"
 	flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/snowman
 	name = "Snowman Head"
@@ -81,14 +82,14 @@
 	icon_state = "snowman_h"
 	item_state = "snowman_h"
 	flags_cover = HEADCOVERSEYES
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/justice
 	name = "justice hat"
 	desc = "Fight for what's righteous!"
 	icon_state = "justicered"
 	item_state = "justicered"
-	flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
+	flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
 	flags_cover = HEADCOVERSEYES
 
 /obj/item/clothing/head/justice/blue
@@ -159,14 +160,14 @@
 	desc = "Bkaw!"
 	icon_state = "chickenhead"
 	item_state = "chickensuit"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/griffin
 	name = "griffon head"
 	desc = "Why not 'eagle head'? Who knows."
 	icon_state = "griffinhat"
 	item_state = "griffinhat"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/bearpelt
 	name = "bear pelt hat"
@@ -179,7 +180,7 @@
 	icon_state = "xenos"
 	item_state = "xenos_helm"
 	desc = "A helmet made out of chitinous alien hide."
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/fedora
 	name = "fedora"
@@ -267,13 +268,13 @@
 	name = "paper sack hat"
 	desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness."
 	icon_state = "papersack"
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS|HIDESNOUT
 
 /obj/item/clothing/head/papersack/smiley
 	name = "paper sack hat"
 	desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
 	icon_state = "papersack_smile"
-	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS|HIDESNOUT
 
 /obj/item/clothing/head/crown
 	name = "crown"
@@ -297,7 +298,7 @@
 	name = "foam lobster head"
 	desc = "When everything's going to crab, protecting your head is the best choice."
 	icon_state = "lobster_hat"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 /obj/item/clothing/head/drfreezehat
 	name = "doctor freeze's wig"

code/modules/clothing/head/misc_special.dm

@@ -28,6 +28,7 @@
 	visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = FIRE_PROOF
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/head/welding/attack_self(mob/user)
 	weldingvisortoggle(user)
@@ -113,7 +114,7 @@
 	icon_state = "hardhat0_pumpkin"
 	item_state = "hardhat0_pumpkin"
 	item_color = "pumpkin"
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	brightness_on = 2 //luminosity when on
 	flags_cover = HEADCOVERSEYES
@@ -163,7 +164,7 @@
 	icon_state = "cardborg_h"
 	item_state = "cardborg_h"
 	flags_cover = HEADCOVERSEYES
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 
 	dog_fashion = /datum/dog_fashion/head/cardborg
 

code/modules/clothing/masks/_masks.dm

@@ -7,6 +7,8 @@
 	equip_delay_other = 40
 	var/mask_adjusted = 0
 	var/adjusted_flags = null
+	var/muzzle_var = NORMAL_STYLE
+	mutantrace_variation = NO_MUTANTRACE_VARIATION //most masks have overrides, but not all probably.
 
 
 /obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
@@ -18,6 +20,31 @@
 			IF_HAS_BLOOD_DNA(src)
 				. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
 
+/obj/item/clothing/mask/equipped(mob/user, slot)
+	..()
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		var/datum/species/pref_species = H.dna.species
+
+		if(mutantrace_variation)
+			if("mam_snouts" in pref_species.default_features)
+				if(H.dna.features["mam_snouts"] != "None")
+					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
+
+			else if("snout" in pref_species.default_features)
+				if(H.dna.features["snout"] != "None")
+					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE
+
+			else
+				muzzle_var = NORMAL_STYLE
+
+			H.update_inv_wear_mask()
+
+
 /obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
 	..()
 	if(ismob(loc))

code/modules/clothing/masks/boxing.dm

@@ -7,6 +7,7 @@
 	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
 	actions_types = list(/datum/action/item_action/adjust)
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/balaclava/attack_self(mob/user)
 	adjustmask(user)
@@ -18,6 +19,7 @@
 	item_state = "luchag"
 	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
 	w_class = WEIGHT_CLASS_SMALL
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/luchador/speechModification(message)
 	if(copytext(message, 1, 2) != "*")

code/modules/clothing/masks/breath.dm

@@ -13,6 +13,7 @@
 	flags_cover = MASKCOVERSMOUTH
 	visor_flags_cover = MASKCOVERSMOUTH
 	resistance_flags = NONE
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/modules/clothing/masks/gasmask.dm

@@ -3,13 +3,21 @@
 	desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
 	icon_state = "gas_alt"
 	clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
-	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
+	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT
 	w_class = WEIGHT_CLASS_NORMAL
 	item_state = "gas_alt"
 	gas_transfer_coefficient = 0.01
 	permeability_coefficient = 0.01
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
 	resistance_flags = NONE
+	mutantrace_variation = MUTANTRACE_VARIATION
+
+/obj/item/clothing/mask/gas/glass
+	name = "glass gas mask"
+	desc = "A face-covering mask that can be connected to an air supply. This one doesn't obscure your face however." //More accurate
+	icon_state = "gas_clear"
+	flags_inv = HIDEEYES
+
 
 // **** Welding gas mask ****
 

code/modules/clothing/masks/miscellaneous.dm

@@ -7,6 +7,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	gas_transfer_coefficient = 0.9
 	equip_delay_other = 20
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/muzzle/attack_paw(mob/user)
 	if(iscarbon(user))
@@ -30,6 +31,7 @@
 	permeability_coefficient = 0.01
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 25, "rad" = 0, "fire" = 0, "acid" = 0)
 	actions_types = list(/datum/action/item_action/adjust)
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/surgical/attack_self(mob/user)
 	adjustmask(user)
@@ -39,6 +41,7 @@
 	desc = "Warning: moustache is fake."
 	icon_state = "fake-moustache"
 	flags_inv = HIDEFACE
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/fakemoustache/italian
 	name = "italian moustache"
@@ -66,6 +69,7 @@
 	name = "joy mask"
 	desc = "Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout."
 	icon_state = "joy"
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/pig
 	name = "pig mask"
@@ -225,6 +229,7 @@
 	slot_flags = ITEM_SLOT_MASK
 	adjusted_flags = ITEM_SLOT_HEAD
 	icon_state = "bandbotany"
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/mask/bandana/attack_self(mob/user)
 	adjustmask(user)

code/modules/clothing/neck/_neck.dm

@@ -171,17 +171,57 @@
 	icon_state = "stripedbluescarf"
 	item_color = "stripedbluescarf"
 
-/obj/item/clothing/neck/petcollar //don't really wear this though please c'mon seriously guys
+///////////
+//COLLARS//
+///////////
+
+/obj/item/clothing/neck/petcollar
 	name = "pet collar"
 	desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule."
 	icon_state = "petcollar"
 	item_color = "petcollar"
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/collar
 	var/tagname = null
 
 /obj/item/clothing/neck/petcollar/attack_self(mob/user)
 	tagname = copytext(sanitize(input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot") as null|text),1,MAX_NAME_LEN)
 	name = "[initial(name)] - [tagname]"
 
+/obj/item/clothing/neck/petcollar/locked
+	name = "locked collar"
+	desc = "A collar that has a small lock on it to keep it from being removed."
+	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/collar/locked
+	var/lock = FALSE
+
+/obj/item/clothing/neck/petcollar/locked/attackby(obj/item/key/collar, mob/user, params)
+	if(lock != FALSE)
+		to_chat(user, "<span class='warning'>With a click the collar unlocks!</span>")
+		lock = FALSE
+		item_flags = NONE
+	else
+		to_chat(user, "<span class='warning'>With a click the collar locks!</span>")
+		lock = TRUE
+		item_flags = NODROP
+	return
+
+/obj/item/clothing/neck/petcollar/locked/attack_hand(mob/user)
+	if(loc == user && user.get_item_by_slot(SLOT_NECK) && lock != FALSE)
+		to_chat(user, "<span class='warning'>The collar is locked! You'll need unlock the collar before you can take it off!</span>")
+		return
+	..()
+
+/obj/item/key/collar
+	name = "Collar Key"
+	desc = "A key for a tiny lock on a collar or bag."
+
+/obj/item/clothing/neck/petcollar/Initialize()
+	. = ..()
+	new /obj/item/reagent_containers/food/snacks/cookie(src)
+
+/obj/item/clothing/neck/petcollar/locked/Initialize()
+	. = ..()
+	new /obj/item/key/collar(src)
+
 //////////////
 //DOPE BLING//
 //////////////
@@ -191,4 +231,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/spacesuits/_spacesuits.dm

@@ -8,7 +8,7 @@
 	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
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	dynamic_hair_suffix = ""
 	dynamic_fhair_suffix = ""
 	cold_protection = HEAD
@@ -21,6 +21,7 @@
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
 	dog_fashion = null
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space
 	name = "space suit"

code/modules/clothing/spacesuits/hardsuit.dm

@@ -712,7 +712,10 @@
 /obj/item/clothing/suit/space/hardsuit/shielded/worn_overlays(isinhands)
 	. = list()
 	if(!isinhands)
-		. += mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER + 0.01)
+		if(taurmode >= SNEK_TAURIC)
+			. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', shield_state, MOB_LAYER + 0.01)
+		else
+			. += mutable_appearance('icons/effects/effects.dmi', shield_state, MOB_LAYER + 0.01)
 
 /obj/item/clothing/head/helmet/space/hardsuit/shielded
 	resistance_flags = FIRE_PROOF | ACID_PROOF

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -64,6 +64,7 @@ Contains:
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space/officer
 	name = "officer's jacket"
@@ -114,6 +115,7 @@ Contains:
 	desc = "Ho ho ho. Merrry X-mas!"
 	icon_state = "santahat"
 	flags_cover = HEADCOVERSEYES
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 	dog_fashion = /datum/dog_fashion/head/santa
 
@@ -137,12 +139,14 @@ Contains:
 	strip_delay = 40
 	equip_delay_other = 20
 	flags_cover = HEADCOVERSEYES
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/head/helmet/space/pirate/bandana
 	name = "royal bandana"
 	desc = "A space-proof bandanna crafted with reflective kevlar."
 	icon_state = "bandana"
 	item_state = "bandana"
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space/pirate
 	name = "royal waistcoat "
@@ -250,6 +254,7 @@ Contains:
 	strip_delay = 130
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = ACID_PROOF | FIRE_PROOF
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space/freedom
 	name = "eagle suit"
@@ -273,6 +278,7 @@ Contains:
 	brightness_on = 0 //luminosity when on
 	actions_types = list()
 	item_flags = NODROP
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 
 /obj/item/clothing/suit/space/hardsuit/carp
@@ -295,6 +301,7 @@ Contains:
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	actions_types = list()
 	resistance_flags = FIRE_PROOF
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	name = "paranormal response team suit"
@@ -304,6 +311,7 @@ Contains:
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF
+	tauric = TRUE		//Citadel Add for tauric hardsuits
 
 /obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize()
 	. = ..()

code/modules/clothing/suits/_suits.dm

@@ -36,7 +36,7 @@
 				if(tauric == TRUE)
 					center = TRUE
 					dimension_x = 64
-			else if(H.dna.features["taur"] in list("Fox",  "Wolf",  "Otie",  "Drake",  "Lab",  "Shepherd",  "Husky",  "Eevee",  "Panther",  "Tajaran",  "Horse",  "Cow"))
+			else if(H.dna.features["taur"] in list("Fox","Wolf","Otie","Drake","Lab","Shepherd","Husky","Eevee","Panther","Horse","Cow","Tiger"))
 				taurmode = PAW_TAURIC
 				if(tauric == TRUE)
 					center = TRUE
@@ -61,7 +61,10 @@
 		if(damaged_clothes)
 			. += mutable_appearance('icons/effects/item_damage.dmi', "damaged[blood_overlay_type]")
 		IF_HAS_BLOOD_DNA(src)
-			. += mutable_appearance('icons/effects/blood.dmi', "[blood_overlay_type]blood")
+			if(taurmode >= SNEK_TAURIC)
+				. += mutable_appearance('modular_citadel/icons/mob/64x32_effects.dmi', "[blood_overlay_type]blood")
+			else
+				. += 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

code/modules/clothing/suits/bio.dm

@@ -6,9 +6,10 @@
 	permeability_coefficient = 0.01
 	clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
-	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT
 	resistance_flags = ACID_PROOF
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/bio_suit
 	name = "bio suit"

code/modules/clothing/suits/labcoat.dm

@@ -5,7 +5,28 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|ARMS
-	allowed = list(/obj/item/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer, /obj/item/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(
+		/obj/item/analyzer,
+		/obj/item/stack/medical,
+		/obj/item/dnainjector,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/reagent_containers/hypospray,
+		/obj/item/hypospray/mkii,
+		/obj/item/healthanalyzer,
+		/obj/item/flashlight/pen,
+		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/glass/beaker,
+		/obj/item/reagent_containers/pill,
+		/obj/item/storage/pill_bottle,
+		/obj/item/paper,
+		/obj/item/melee/classic_baton/telescopic,
+		/obj/item/soap,
+		/obj/item/sensor_device,
+		/obj/item/tank/internals/emergency_oxygen,
+		/obj/item/tank/internals/plasmaman
+		)
+
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
 	togglename = "buttons"
 	species_exception = list(/datum/species/golem)

code/modules/clothing/suits/toggles.dm

@@ -180,6 +180,7 @@
 
 /obj/item/clothing/suit/space/hardsuit/proc/ToggleHelmet()
 	var/mob/living/carbon/human/H = src.loc
+	var/datum/species/pref_species = H.dna.species
 	if(!helmettype)
 		return
 	if(!helmet)
@@ -193,6 +194,18 @@
 				to_chat(H, "<span class='warning'>You're already wearing something on your head!</span>")
 				return
 			else if(H.equip_to_slot_if_possible(helmet,SLOT_HEAD,0,0,1))
+				if(helmet.mutantrace_variation)
+					if("mam_snouts" in pref_species.default_features)
+						if(H.dna.features["mam_snouts"] != "None")
+							helmet.muzzle_var = ALT_STYLE
+
+					else if("snout" in pref_species.default_features)
+						if(H.dna.features["snout"] != "None")
+							helmet.muzzle_var = ALT_STYLE
+					else
+						helmet.muzzle_var = NORMAL_STYLE
+					H.update_inv_head()
+
 				to_chat(H, "<span class='notice'>You engage the helmet on the hardsuit.</span>")
 				suittoggled = TRUE
 				H.update_inv_wear_suit()

code/modules/clothing/suits/utility.dm

@@ -60,7 +60,7 @@
 	icon_state = "bombsuit"
 	clothing_flags = THICKMATERIAL
 	armor = list("melee" = 20, "bullet" = 0, "laser" = 20,"energy" = 10, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
-	flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	dynamic_hair_suffix = ""
 	dynamic_fhair_suffix = ""
 	cold_protection = HEAD
@@ -71,6 +71,7 @@
 	equip_delay_other = 70
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 
 /obj/item/clothing/suit/bomb_suit
@@ -123,13 +124,14 @@
 	icon_state = "rad"
 	desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'"
 	clothing_flags = THICKMATERIAL
-	flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
+	flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 60, "rad" = 100, "fire" = 30, "acid" = 30)
 	strip_delay = 60
 	equip_delay_other = 60
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
 	resistance_flags = NONE
 	rad_flags = RAD_PROTECT_CONTENTS
+	mutantrace_variation = MUTANTRACE_VARIATION
 
 /obj/item/clothing/suit/radiation
 	name = "radiation suit"

code/modules/detectivework/scanner.dm

@@ -116,7 +116,7 @@
 		// We gathered everything. Create a fork and slowly display the results to the holder of the scanner.
 
 		var/found_something = 0
-		add_log("<B>[station_time_timestamp()][get_timestamp()] - [target_name]</B>", 0)
+		add_log("<B>[STATION_TIME_TIMESTAMP("hh:mm:ss")][get_timestamp()] - [target_name]</B>", 0)
 
 		// Fingerprints
 		if(length(fingerprints))

code/modules/error_handler/error_handler.dm

@@ -76,7 +76,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 			var/skipcount = abs(error_cooldown[erroruid]) - 1
 			error_cooldown[erroruid] = 0
 			if(skipcount > 0)
-				SEND_TEXT(world.log, "\[[time_stamp()]] Skipped [skipcount] runtimes in [E.file],[E.line].")
+				SEND_TEXT(world.log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]] Skipped [skipcount] runtimes in [E.file],[E.line].")
 				GLOB.error_cache.log_error(E, skip_count = skipcount)
 
 	error_last_seen[erroruid] = world.time
@@ -113,7 +113,7 @@ GLOBAL_VAR_INIT(total_runtimes_skipped, 0)
 	if(GLOB.error_cache)
 		GLOB.error_cache.log_error(E, desclines)
 
-	var/main_line = "\[[time_stamp()]] Runtime in [E.file],[E.line]: [E]"
+	var/main_line = "\[[TIME_STAMP("hh:mm:ss", FALSE)]] Runtime in [E.file],[E.line]: [E]"
 	SEND_TEXT(world.log, main_line)
 	for(var/line in desclines)
 		SEND_TEXT(world.log, line)

code/modules/error_handler/error_viewer.dm

@@ -131,10 +131,10 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
 
 /datum/error_viewer/error_source/New(exception/e)
 	if (!istype(e))
-		name = "\[[time_stamp()]] Uncaught exceptions"
+		name = "\[[TIME_STAMP("hh:mm:ss", FALSE)]] Uncaught exceptions"
 		return
 
-	name = "<b>\[[time_stamp()]]</b> Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b>"
+	name = "<b>\[[TIME_STAMP("hh:mm:ss", FALSE)]]</b> Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b>"
 
 /datum/error_viewer/error_source/show_to(user, datum/error_viewer/back_to, linear)
 	if (!istype(back_to))
@@ -156,15 +156,15 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache)
 
 /datum/error_viewer/error_entry/New(exception/e, list/desclines, skip_count)
 	if (!istype(e))
-		name = "<b>\[[time_stamp()]]</b> Uncaught exception: <b>[html_encode(e.name)]</b>"
+		name = "<b>\[[TIME_STAMP("hh:mm:ss", FALSE)]]</b> Uncaught exception: <b>[html_encode(e.name)]</b>"
 		return
 
 	if(skip_count)
-		name = "\[[time_stamp()]] Skipped [skip_count] runtimes in [e.file],[e.line]."
+		name = "\[[TIME_STAMP("hh:mm:ss", FALSE)]] Skipped [skip_count] runtimes in [e.file],[e.line]."
 		is_skip_count = TRUE
 		return
 
-	name = "<b>\[[time_stamp()]]</b> Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b>"
+	name = "<b>\[[TIME_STAMP("hh:mm:ss", FALSE)]]</b> Runtime in <b>[e.file]</b>, line <b>[e.line]</b>: <b>[html_encode(e.name)]</b>"
 	exc = e
 	if (istype(desclines))
 		for (var/line in desclines)

code/modules/events/shuttle_loan.dm

@@ -6,7 +6,7 @@
 #define PIZZA_DELIVERY 6
 #define ITS_HIP_TO 7
 #define MY_GOD_JC 8
-
+#define DELTA_CRATES 9
 
 /datum/round_event_control/shuttle_loan
 	name = "Shuttle Loan"
@@ -118,6 +118,18 @@
 						P.info = "Cargo: We have discovered an active Syndicate bomb near our VIP shuttle's fuel lines. If you feel up to the task, we will pay you for defusing it."
 						P.update_icon()
 			bonus_points = 45000 //If you mess up, people die and the shuttle gets turned into swiss cheese
+		if(DELTA_CRATES)
+			if(prob(50))
+				priority_announce("Cargo: We have discovered a warehouse of DELTA locked crates, we cant store any more of them at CC can you take them for us?.", "CentCom Security Division")
+			else
+				priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg') // CITADEL EDIT metabreak
+				for(var/obj/machinery/computer/communications/C in GLOB.machines)
+					if(!(C.stat & (BROKEN|NOPOWER)) && is_station_level(C.z))
+						var/obj/item/paper/P = new(C.loc)
+						P.name = "Cargo Report"
+						P.info = "Cargo: We have discovered a warehouse of DELTA locked crates, we cant store any more of them at CC can you take them for us?."
+						P.update_icon()
+			bonus_points = 25000 //If you mess up, people die and the shuttle gets turned into swiss cheese
 
 /datum/round_event/shuttle_loan/proc/loan_shuttle()
 	priority_announce(thanks_msg, "Cargo shuttle commandeered by CentCom.")
@@ -147,6 +159,8 @@
 			SSshuttle.centcom_message += "Biohazard cleanup incoming."
 		if(MY_GOD_JC)
 			SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution."
+		if(DELTA_CRATES)
+			SSshuttle.centcom_message += "DELTA Locked crates incoming. Exercise extreme caution."
 
 /datum/round_event/shuttle_loan/tick()
 	if(dispatched)
@@ -291,6 +305,15 @@
 				else
 					shuttle_spawns.Add(/obj/item/paper/fluff/cargo/bomb/allyourbase)
 
+			if(DELTA_CRATES) //Delta crates can stack on eacher, and are basicly a 1/3/5 bombs
+				for(var/i in 1 to 7) //7 seems fair
+					shuttle_spawns.Add(/obj/structure/closet/crate/secure/loot)
+
+				for(var/i in 1 to 5)
+					var/turf/T = pick_n_take(empty_shuttle_turfs)
+					new /obj/structure/spider/stickyweb(T)
+					new /obj/effect/decal/cleanable/ash(T)
+
 		var/false_positive = 0
 		while(shuttle_spawns.len && empty_shuttle_turfs.len)
 			var/turf/T = pick_n_take(empty_shuttle_turfs)
@@ -334,3 +357,4 @@
 #undef PIZZA_DELIVERY
 #undef ITS_HIP_TO
 #undef MY_GOD_JC
+#undef DELTA_CRATES

code/modules/events/vent_clog.dm

@@ -13,16 +13,49 @@
 	var/list/vents  = list()
 	var/randomProbability = 1
 	var/reagentsAmount = 100
-	var/list/saferChems = list("water","carbon","flour","cleaner","nutriment","condensedcapsaicin","mushroomhallucinogen","lube","pink_glitter","cryptobiolin",
-						 "plantbgone","blood","charcoal","space_drugs","morphine","holywater","ethanol","hot_coco","sacid","mindbreaker","rotatium","bluespace",
-						 "pax","laughter","concentrated_barbers_aid","colorful_reagent","dizzysolution","tiresolution","sodiumchloride","beer","hair_dye","sugar","white_glitter","growthserum")
+	var/list/saferChems = list(
+		"water",
+		"carbon",
+		"flour",
+		"cleaner",
+		"nutriment",
+		"condensedcapsaicin",
+		"mushroomhallucinogen",
+		"lube",
+		"pink_glitter",
+		"cryptobiolin",
+		"plantbgone",
+		"blood",
+		"charcoal",
+		"space_drugs",
+		"morphine",
+		"holywater",
+		"ethanol",
+		"hot_coco",
+		"sacid",
+		"mindbreaker",
+		"rotatium",
+		"bluespace",
+		"pax",
+		"laughter",
+		"concentrated_barbers_aid",
+		"colorful_reagent",
+		"dizzysolution",
+		"tiresolution",
+		"sodiumchloride",
+		"beer",
+		"hair_dye",
+		"sugar",
+		"white_glitter",
+		"growthserum"
+	)
 	//needs to be chemid unit checked at some point
 
 /datum/round_event/vent_clog/announce()
 	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejection of contents may occur.", "Atmospherics alert")
 
 /datum/round_event/vent_clog/setup()
-	endWhen = rand(25, 100)
+	endWhen = rand(120, 180)
 	for(var/obj/machinery/atmospherics/components/unary/vent_scrubber/temp_vent in GLOB.machines)
 		var/turf/T = get_turf(temp_vent)
 		if(T && is_station_level(T.z) && !temp_vent.welded)
@@ -30,25 +63,34 @@
 	if(!vents.len)
 		return kill()
 
-/datum/round_event/vent_clog/start()
-	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
-		if(vent && vent.loc)
-			var/datum/reagents/R = new/datum/reagents(1000)
-			R.my_atom = vent
-			if (prob(randomProbability))
-				R.add_reagent(get_random_reagent_id(), reagentsAmount)
-			else
-				R.add_reagent(pick(saferChems), reagentsAmount)
+/datum/round_event/vent_clog/tick()
 
-			var/datum/effect_system/foam_spread/foam = new
-			foam.set_up(200, get_turf(vent), R)
-			foam.start()
+	if(!vents.len)
+		return kill()
 
-			var/cockroaches = prob(33) ? 3 : 0
-			while(cockroaches)
-				new /mob/living/simple_animal/cockroach(get_turf(vent))
-				cockroaches--
-		CHECK_TICK
+	CHECK_TICK
+
+	var/obj/machinery/atmospherics/components/unary/vent = pick(vents)
+	vents -= vent
+
+	if(!vent || vent.welded)
+		return
+
+	var/turf/T = get_turf(vent)
+	if(!T)
+		return
+
+	var/datum/reagents/R = new/datum/reagents(1000)
+	R.my_atom = vent
+	if (prob(randomProbability))
+		R.add_reagent(get_random_reagent_id(), reagentsAmount)
+	else
+		R.add_reagent(pick(saferChems), reagentsAmount)
+
+	var/datum/effect_system/smoke_spread/chem/C = new
+	C.set_up(R,16,T,TRUE)
+	C.start()
+	playsound(T, 'sound/effects/smoke.ogg', 50, 1, -3)
 
 /datum/round_event_control/vent_clog/threatening
 	name = "Clogged Vents: Threatening"
@@ -75,7 +117,7 @@
 	reagentsAmount = 250
 
 /datum/round_event_control/vent_clog/beer
-	name = "Foamy beer stationwide"
+	name = "Clogged Vents: Beer"
 	typepath = /datum/round_event/vent_clog/beer
 	max_occurrences = 0
 
@@ -83,12 +125,12 @@
 	reagentsAmount = 100
 
 /datum/round_event_control/vent_clog/plasma_decon
-	name = "Plasma decontamination"
+	name = "Anti-Plasma Flood"
 	typepath = /datum/round_event/vent_clog/plasma_decon
 	max_occurrences = 0
 
 /datum/round_event_control/vent_clog/female
-	name = "FemCum stationwide"
+	name = "Clogged Vents; Girlcum"
 	typepath = /datum/round_event/vent_clog/female
 	max_occurrences = 0
 
@@ -96,7 +138,7 @@
 	reagentsAmount = 100
 
 /datum/round_event_control/vent_clog/male
-	name = "Semen stationwide"
+	name = "Clogged Vents: Semen"
 	typepath = /datum/round_event/vent_clog/male
 	max_occurrences = 0
 
@@ -108,7 +150,7 @@
 
 /datum/round_event/vent_clog/beer/start()
 	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
-		if(vent && vent.loc)
+		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
 			R.add_reagent("beer", reagentsAmount)
@@ -118,9 +160,12 @@
 			foam.start()
 		CHECK_TICK
 
+/datum/round_event/vent_clog/male/announce()
+	priority_announce("The scrubbers network is experiencing a backpressure surge. Some ejaculation of contents may occur.", "Atmospherics alert")
+
 /datum/round_event/vent_clog/male/start()
 	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
-		if(vent && vent.loc)
+		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
 			R.add_reagent("semen", reagentsAmount)
@@ -130,9 +175,12 @@
 			foam.start()
 		CHECK_TICK
 
+/datum/round_event/vent_clog/female/announce()
+	priority_announce("The scrubbers network is experiencing a backpressure squirt. Some ejection of contents may occur.", "Atmospherics alert")
+
 /datum/round_event/vent_clog/female/start()
 	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
-		if(vent && vent.loc)
+		if(vent && vent.loc && !vent.welded)
 			var/datum/reagents/R = new/datum/reagents(1000)
 			R.my_atom = vent
 			R.add_reagent("femcum", reagentsAmount)
@@ -147,7 +195,7 @@
 
 /datum/round_event/vent_clog/plasma_decon/start()
 	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
-		if(vent && vent.loc)
+		if(vent && vent.loc && !vent.welded)
 			var/datum/effect_system/smoke_spread/freezing/decon/smoke = new
 			smoke.set_up(7, get_turf(vent), 7)
 			smoke.start()

code/modules/events/wizard/race.dm

@@ -5,6 +5,18 @@
 	max_occurrences = 5
 	earliest_start = 0 MINUTES
 
+/datum/round_event/wizard/race
+	var/list/stored_name
+	var/list/stored_species
+	var/list/stored_dna
+
+/datum/round_event/wizard/race/setup()
+	stored_name = list()
+	stored_species = list()
+	stored_dna = list()
+	endWhen = rand(600,1200) //10 to 20 minutes
+	..()
+
 /datum/round_event/wizard/race/start()
 
 	var/all_the_same = 0
@@ -12,18 +24,35 @@
 
 	for(var/speciestype in subtypesof(/datum/species))
 		var/datum/species/S = new speciestype()
-		if(!S.dangerous_existence && !S.blacklisted)
+		if(!S.dangerous_existence && !S.blacklisted && !S.nojumpsuit) //Dangerous Species, Blacklisted Species, and Species who can't wear jumpsuits are blacklisted.
 			all_species += speciestype
 
 	var/datum/species/new_species = pick(all_species)
 
-	if(prob(50))
+	if(prob(75))
 		all_the_same = 1
 
-	for(var/mob/living/carbon/human/H in GLOB.carbon_list) //yes, even the dead
+	for(var/mob/living/carbon/human/H in GLOB.carbon_list)
+		var/turf/T = get_turf(H)
+		if(!T)
+			continue
+		if(!is_station_level(T.z))
+			continue
+		stored_name[H] = H.real_name
+		stored_species[H] = H.dna.species
+		stored_dna[H] = H.dna.unique_enzymes
 		H.set_species(new_species)
 		H.real_name = H.dna.species.random_name(H.gender,1)
 		H.dna.unique_enzymes = H.dna.generate_unique_enzymes()
 		to_chat(H, "<span class='notice'>You feel somehow... different?</span>")
 		if(!all_the_same)
 			new_species = pick(all_species)
+
+/datum/round_event/wizard/race/end()
+	for(var/mob/living/carbon/human/H in GLOB.carbon_list)
+		if(!(stored_name[H] && stored_species[H] && stored_dna[H]))
+			continue
+		H.set_species(stored_species[H])
+		H.real_name = stored_name[H]
+		H.dna.unique_enzymes = stored_dna[H]
+		to_chat(H, "<span class='notice'>You feel back to your normal self again.</span>")

code/modules/food_and_drinks/food/snacks_cake.dm

@@ -54,7 +54,6 @@
 	tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1)
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
 
-
 /obj/item/reagent_containers/food/snacks/store/cake/brain
 	name = "brain cake"
 	desc = "A squishy cake-thing."
@@ -86,7 +85,6 @@
 	tastes = list("cake" = 4, "cream cheese" = 3)
 	foodtype = GRAIN | DAIRY
 
-
 /obj/item/reagent_containers/food/snacks/cakeslice/cheese
 	name = "cheese cake slice"
 	desc = "Slice of pure cheestisfaction."
@@ -95,7 +93,6 @@
 	tastes = list("cake" = 4, "cream cheese" = 3)
 	foodtype = GRAIN | DAIRY
 
-
 /obj/item/reagent_containers/food/snacks/store/cake/orange
 	name = "orange cake"
 	desc = "A cake with added orange."
@@ -132,7 +129,6 @@
 	tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
-
 /obj/item/reagent_containers/food/snacks/store/cake/lemon
 	name = "lemon cake"
 	desc = "A cake with added lemon."
@@ -143,7 +139,6 @@
 	tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2)
 	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
 
-
 /obj/item/reagent_containers/food/snacks/cakeslice/lemon
 	name = "lemon cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
@@ -163,7 +158,6 @@
 	tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
-
 /obj/item/reagent_containers/food/snacks/cakeslice/chocolate
 	name = "chocolate cake slice"
 	desc = "Just a slice of cake, it is enough for everyone."
@@ -172,7 +166,6 @@
 	tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4)
 	foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR
 
-
 /obj/item/reagent_containers/food/snacks/store/cake/birthday
 	name = "birthday cake"
 	desc = "Happy Birthday little clown..."
@@ -250,5 +243,100 @@
 	icon_state = "pumpkinspicecakeslice"
 	filling_color = "#FFD700"
 	tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1)
-
 	foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR
+
+/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackberry strawberries vanilla cake
+	name = "blackberry and strawberry vanilla cake"
+	desc = "A plain cake, filled with assortment of blackberries and strawberries!"
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "blackbarry_strawberries_cake_vanilla_cake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc
+	bonus_reagents = list("nutriment" = 14, "vitamin" = 4)
+	tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/reagent_containers/food/snacks/cakeslice/bsvc
+	name = "blackberry and strawberry vanilla cake slice"
+	desc = "Just a slice of cake  filled with assortment of blackberries and strawberries!"
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "blackbarry_strawberries_cake_vanilla_slice"
+	filling_color = "#FFD700"
+	tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake
+	name = "blackberry and strawberry chocolate cake"
+	desc = "A plain cake, filled with assortment of blackberries and strawberries!"
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "blackbarry_strawberries_cake_coco_cake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc
+	bonus_reagents = list("nutriment" = 14, "vitamin" = 4, "cocoa" = 5)
+	tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+
+/obj/item/reagent_containers/food/snacks/cakeslice/bscc
+	name = "blackberry and strawberry chocolate cake slice"
+	desc = "Just a slice of cake  filled with assortment of blackberries and strawberries!"
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "blackbarry_strawberries_cake_coco_cake_slice"
+	filling_color = "#FFD700"
+	tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3)
+	foodtype = GRAIN | DAIRY | FRUIT | SUGAR
+
+obj/item/reagent_containers/food/snacks/store/cake/holy_cake
+	name = "angel food cake"
+	desc = "A cake made for angels and chaplains alike! Contains holy water."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "holy_cake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 3, "holy_water" = 10)
+	tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+	foodtype = GRAIN | DAIRY | SUGAR
+
+/obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice
+	name = "angel food cake slice"
+	desc = "A slice of heavenly cake."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "holy_cake_slice"
+	filling_color = "#00FFFF"
+	tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
+	foodtype = GRAIN | DAIRY | SUGAR
+
+obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+	name = "pound cake"
+	desc = "A condensed cake made for filling people up quickly."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "pound_cake"
+	slices_num = 7 //Its ment to feed the party
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
+	bonus_reagents = list("nutriment" = 60)
+	tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1)
+	foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
+
+/obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice
+	name = "pound cake slice"
+	desc = "A slice of condensed cake made for filling people up quickly."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "pound_cake_slice"
+	filling_color = "#00FFFF"
+	tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1)
+	foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD
+
+obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
+	name = "hardware cake"
+	desc = "A cake that is made with electronic boards and leaks acid..."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "hardware_cake"
+	slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
+	bonus_reagents = list("sacid" = 15, "oil" = 15)
+	tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
+	foodtype = GRAIN | GROSS
+
+/obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice
+	name = "hardware cake slice"
+	desc = "A slice of electronic boards and some acid."
+	icon = 'modular_citadel/icons/obj/food/cake.dmi'
+	icon_state = "hardware_cake_slice"
+	filling_color = "#00FFFF"
+	tastes = list("acid" = 1, "metal" = 1, "regret" = 10)
+	foodtype = GRAIN | GROSS

code/modules/food_and_drinks/food/snacks_meat.dm

@@ -54,6 +54,43 @@
 	tastes = list("fish" = 1, "chips" = 1)
 	foodtype = MEAT | VEGETABLES | FRIED
 
+/obj/item/reagent_containers/food/snacks/sushi_basic
+	name = "funa hosomaki"
+	desc = "A small cylindrical kudzu skin, filled with rice and fish."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_basic"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 4)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 1, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushi_adv
+	name = "funa nigiri"
+	desc = "A peace  of carp lightly placed on some rice."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_adv"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 6)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 2, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushi_pro
+	name = "funa nigiri"
+	desc = "A well prepared peace  of the best of the carp fillet placed on rice. Looks fancy and fresh!"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_pro"
+	bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	bitesize = 10
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 3, "rice" = 2, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+
 ////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
 
 /obj/item/reagent_containers/food/snacks/tofu
@@ -184,6 +221,15 @@
 	tastes = list("the jungle" = 1, "bananas" = 1)
 	foodtype = MEAT | SUGAR
 
+/obj/item/reagent_containers/food/snacks/monkeycube/On_Consume(mob/living/carbon/M)
+	if(iscarbon(M))
+		M.visible_message("[src] bursts out of [M]!</span>")
+		M.emote("scream")
+		M.Knockdown(40)
+		M.adjustBruteLoss(60)
+		Expand()
+	return ..()
+
 /obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
 	var/mob/spammer = get_mob_by_key(fingerprintslast)
 	var/mob/living/carbon/monkey/bananas = new(drop_location(), TRUE, spammer)

code/modules/food_and_drinks/food/snacks_other.dm

@@ -207,6 +207,16 @@
 	tastes = list("cobwebs" = 1, "sugar" = 2)
 	foodtype = JUNKFOOD | SUGAR
 
+/obj/item/reagent_containers/food/snacks/tobiko
+	name = "tobiko"
+	desc = "Spider eggs wrapped in a thin salted Kudzu pod"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_egg"
+	list_reagents = list("nutriment" = 6, "vitamin" = 2)
+	filling_color = "#FF3333" // R225 G051 B051
+	tastes = list("seaweed" = 1, "cobwebs" = 1, "salty" = 2)
+	foodtype = MEAT | VEGETABLES
+
 /obj/item/reagent_containers/food/snacks/chococoin
 	name = "chocolate coin"
 	desc = "A completely edible but nonflippable festive coin."
@@ -569,3 +579,12 @@
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
 	foodtype = JUNKFOOD | SUGAR
+
+/obj/item/reagent_containers/food/snacks/riceball
+	name = "onigiri"
+	desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "riceball"
+	list_reagents = list("nutriment" = 6, "sodiumchloride" = 2)
+	tastes = list("rice" = 3, "salt" = 1)
+	foodtype = GRAIN

code/modules/food_and_drinks/food/snacks_pizza.dm

@@ -160,6 +160,15 @@
 	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2)
 	foodtype = PINEAPPLE //Over powering tast of gods fruit
 
+/obj/item/reagent_containers/food/snacks/pizza/pineapple/anomaly
+	desc = "A anomaly made pizza with pineapple..."
+	bonus_reagents = list("nutriment" = 16, "vitamin" = 16)
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2, "good" = 10)
+
+/obj/item/reagent_containers/food/snacks/pizzaslice/pineapple/anomaly
+	desc = "A slice of good tasting pizza. But has pineapple on it, what a anomaly!"
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2, "good" = 10)
+
 /obj/item/reagent_containers/food/snacks/pizza/arnold
 	name = "\improper Arnold pizza"
 	desc = "Hello, you've reached Arnold's pizza shop. I'm not here now, I'm out killing pepperoni."

code/modules/food_and_drinks/food/snacks_sandwichtoast.dm

@@ -102,3 +102,13 @@
 	list_reagents = list("nutriment" = 2, "vitamin" = 2)
 	tastes = list("bread" = 2)
 	foodtype = GRAIN
+
+/obj/item/reagent_containers/food/snacks/tuna_sandwich
+	name = "tuna sandwich"
+	desc = "Both a salad and a sandwich in one."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "tunasandwich"
+	trash = /obj/item/trash/plate
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+	tastes = list("tuna" = 4, "mayonnaise" = 2, "bread" = 2)
+	foodtype = GRAIN | MEAT

code/modules/food_and_drinks/food/snacks_sushi.dm

@@ -0,0 +1,95 @@
+//////////////////////////Sushi Components///////////////////////
+
+/obj/item/reagent_containers/food/snacks/sushi_rice
+	name = "Sushi Rice"
+	desc = "A bowl of sticky rice for making sushi."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushi_rice"
+	list_reagents = list("sodiumchloride" = 5)
+	tastes = list("rice" = 5, "salt" = 1)
+	foodtype = GRAIN
+
+/obj/item/reagent_containers/food/snacks/sea_weed
+	name = "Sea Weed Sheet"
+	desc = "A thin, light salt sheet of plant mater. This is commenly used in sushi recipes,"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sea_weed"
+	list_reagents = list("sodiumchloride" = 2)
+	tastes = list("plants" = 2, "salt" = 1)
+	foodtype = VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/tuna
+	name = "Canned Tuna"
+	desc = "A small can of tuna fish beloved by felines."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "tuna_can"
+//trash = /obj/item/trash/tuna_used //I dont know if I like this idea - A Masked Cat
+	list_reagents = list("sodiumchloride" = 5, "mercury" = 2)
+	tastes = list("tuna" = 15, "mercury" = 1, "salt" = 3)
+	foodtype = MEAT
+
+//////////////////////////Sushi/////////////////////////////////
+/obj/item/reagent_containers/food/snacks/sushie_basic
+	name = "Funa Hosomaki"
+	desc = "A small cylindrical filled with rice and fish."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_basic"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 1)
+	bitesize = 1
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushie_adv
+	name = "Funa Nigiri"
+	desc = "A pice of carp lightly placed on some rice."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_adv"
+	bonus_reagents = list("vitamin" = 2)
+	list_reagents = list("nutriment" = 2)
+	bitesize = 1
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/sushie_pro
+	name = "Funa Nigiri"
+	desc = "A well prepared pice of the best of the carp fillet placed on rice. Looks fancy and fresh!"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_pro"
+	bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+	list_reagents = list("nutriment" = 8, "vitamin" = 1)
+	bitesize = 1
+	filling_color = "#F2EEEA" //rgb(242, 238, 234)
+	tastes = list("fish" = 1, "rice" = 1, "salt" = 1)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/tobiko
+	name = "Tobiko"
+	desc = "Spider eggs wrapped in a thin salted Kudzu pod"
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "sushie_egg"
+	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	filling_color = "#FF3333" // R225 G051 B051
+	tastes = list("seaweed" = 1, "salty" = 2)
+	foodtype = MEAT | VEGETABLES
+
+/obj/item/reagent_containers/food/snacks/riceball
+	name = "Onigiri"
+	desc = "A ball of rice with some light salt and a wrap of Kudzu skin."
+	icon = 'modular_citadel/icons/obj/food/food.dmi'
+	icon_state = "riceball"
+	list_reagents = list("nutriment" = 5, "sodiumchloride" = 2)
+	tastes = list("rice" = 4, "salt" = 1)
+	foodtype = GRAIN
+
+/obj/item/reagent_containers/food/snacks/sashimi
+	name = "carp sashimi"
+	desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
+	icon_state = "sashimi"
+	bonus_reagents = list("nutriment" = 1, "capsaicin" = 4, "vitamin" = 4)
+	list_reagents = list("nutriment" = 6, "capsaicin" = 5)
+	filling_color = "#FA8072"
+	tastes = list("fish" = 1, "hot peppers" = 1)
+	foodtype = MEAT | TOXIC

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -692,3 +692,15 @@
 	id = "pwr_game"
 	results = list("pwr_game" = 5)
 	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)
+
+/datum/chemical_reaction/pinkmilk
+	name = "Strawberry Milk"
+	id = "pinkmilk"
+	results = list("pinkmilk" = 5)
+	required_reagents = list("aphro+" = 1, "milk" = 1)
+
+/datum/chemical_reaction/pinktea
+	name = "Strawberry Tea"
+	id = "pinktea"
+	results = list("pinktea" = 5)
+	required_reagents = list("aphro" = 1, "arnold_palmer" = 1, "sugar" = 1)

code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm

@@ -102,6 +102,52 @@
 	result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice
 	subcategory = CAT_CAKE
 
+/datum/crafting_recipe/food/holycake
+	name = "Angel food cake"
+	reqs = list(
+		/datum/reagent/water/holywater = 15,
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/poundcake
+	name = "Pound cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 4
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/hardwarecake
+	name = "Hardware cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/circuitboard = 2,
+		/datum/reagent/toxin/acid = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscccake
+	name = "blackberry and strawberry chocolate cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/chocolatebar = 2,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/bscc
+	subcategory = CAT_CAKE
+
+/datum/crafting_recipe/food/bscvcake
+	name = "blackberry and strawberry vanilla cake"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/store/cake/plain = 1,
+		/obj/item/reagent_containers/food/snacks/grown/berries = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc
+	subcategory = CAT_CAKE
+
 /datum/crafting_recipe/food/cak
 	name = "Living cat/cake hybrid"
 	reqs = list(
@@ -114,4 +160,4 @@
 		/datum/reagent/teslium = 1 //To shock the whole thing into life
 	)
 	result = /mob/living/simple_animal/pet/cat/cak
-	subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT???
+	subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople

code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm

@@ -1,5 +1,3 @@
-
-
 ////////////////////////////////////////////////KEBABS////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/humankebab
@@ -71,16 +69,6 @@
 	result = /obj/item/reagent_containers/food/snacks/fishfingers
 	subcategory = CAT_MEAT
 
-/datum/crafting_recipe/food/sashimi
-	name = "Sashimi"
-	reqs = list(
-		/datum/reagent/consumable/soysauce = 5,
-		/obj/item/reagent_containers/food/snacks/spidereggs = 1,
-		/obj/item/reagent_containers/food/snacks/carpmeat = 1
-	)
-	result = /obj/item/reagent_containers/food/snacks/sashimi
-	subcategory = CAT_MEAT
-
 ////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
 
 /datum/crafting_recipe/food/spidereggsham

code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm

@@ -345,3 +345,13 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/salad/ricepudding
 	subcategory = CAT_MISCFOOD
+
+/datum/crafting_recipe/food/riceball
+	name = "Onigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 1,
+		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 1,
+		/obj/item/reagent_containers/food/snacks/salad/boiledrice = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/riceball
+	subcategory = CAT_MISCFOOD

code/modules/food_and_drinks/recipes/tablecraft/recipes_pizza.dm

@@ -101,3 +101,22 @@
 	)
 	result = /obj/item/reagent_containers/food/snacks/pizza/pineapple
 	subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/pineapplepizza/anomaly
+	name = "Anomaly Hawaiian pizza"
+	reqs = list(
+	/obj/item/assembly/signaler/anomaly = 1,
+	/obj/item/reagent_containers/food/snacks/pizza/pineapple = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/pizza/pineapple/anomaly
+	subcategory = CAT_PIZZA
+
+/datum/crafting_recipe/food/anomalypizzaboy
+	name = "Anomaly pizza box"
+	reqs = list(
+		/obj/item/pizzabox = 5,
+		/obj/item/assembly/signaler/anomaly = 1
+	)
+	tools = list(TOOL_WELDER, TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	result = /obj/item/pizzabox/infinite
+	subcategory = CAT_PIZZA

code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm

@@ -62,5 +62,13 @@
 	result = /obj/item/reagent_containers/food/snacks/notasandwich
 	subcategory = CAT_SANDWICH
 
-
-
+/datum/crafting_recipe/food/notasandwich
+	name = "Tuna sandwich"
+	reqs = list(
+		/obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+		/obj/item/reagent_containers/food/snacks/tuna = 1,
+		/obj/item/reagent_containers/food/snacks/grown/onion = 1,
+		/obj/item/reagent_containers/food/condiment/mayonnaise = 5
+	)
+	result = /obj/item/reagent_containers/food/snacks/tuna_sandwich
+	subcategory = CAT_SANDWICH

code/modules/food_and_drinks/recipes/tablecraft/recipes_sushi.dm

@@ -0,0 +1,94 @@
+//////////////////////////Sushi Components///////////////////////
+
+/datum/crafting_recipe/food/sushi_rice
+	name = "Sushi Rice"
+	reqs = list(
+		/datum/reagent/water  = 40,
+		/datum/reagent/consumable/rice = 10
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushi_rice
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/sea_weed
+	name = "Sea Weed Sheet"
+	reqs = list(
+		/datum/reagent/water = 30,
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/grown/kudzupod = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/sea_weed
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/tuna_can
+	name = "Can of Tuna"
+	reqs = list(
+		/datum/reagent/consumable/sodiumchloride = 15,
+		/datum/reagent/consumable/cooking_oil = 5,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1,
+	)
+	result = /obj/item/reagent_containers/food/snacks/tuna
+	subcategory = CAT_SUSHI
+
+//////////////////////////Sushi/////////////////////////////////
+
+/datum/crafting_recipe/food/sashimi
+	name = "Sashimi"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/spidereggs = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/sashimi
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/riceball
+	name = "Onigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 1,
+		/obj/item/reagent_containers/food/snacks/sea_weed = 1,
+		/obj/item/reagent_containers/food/snacks/sushi_rice = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/riceball
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/sushie_egg
+	name = "Tobiko"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 6,
+		/obj/item/reagent_containers/food/snacks/spidereggs = 1,
+		/obj/item/reagent_containers/food/snacks/sea_weed = 2,
+	)
+	result = /obj/item/reagent_containers/food/snacks/tobiko
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/sushie_basic
+	name = "Funa Hosomaki"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 3,
+		/obj/item/reagent_containers/food/snacks/sushi_rice = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 2,
+		/obj/item/reagent_containers/food/snacks/sea_weed = 3,
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushie_basic
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/sushie_adv
+	name = "Funa Nigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 5,
+		/obj/item/reagent_containers/food/snacks/sushi_rice = 1,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushie_adv
+	subcategory = CAT_SUSHI
+
+/datum/crafting_recipe/food/sushie_pro
+	name = "Well made Funa Nigiri"
+	reqs = list(
+		/datum/reagent/consumable/soysauce = 10,
+		/obj/item/reagent_containers/food/snacks/sushi_rice = 2,
+		/obj/item/reagent_containers/food/snacks/carpmeat = 5,
+		/obj/item/reagent_containers/food/snacks/sea_weed = 1
+	)
+	result = /obj/item/reagent_containers/food/snacks/sushie_pro
+	subcategory = CAT_SUSHI

code/modules/goonchat/browserassets/js/browserOutput.js

@@ -245,96 +245,41 @@ function output(message, flag) {
 
 	message = byondDecode(message).trim();
 
-	//The behemoth of filter-code (for Admin message filters)
-	//Note: This is proooobably hella inefficient
-	var filteredOut = false;
-	if (opts.hasOwnProperty('showMessagesFilters') && !opts.showMessagesFilters['All'].show) {
-		//Get this filter type (defined by class on message)
-		var messageHtml = $.parseHTML(message),
-			messageClasses;
-		if (opts.hasOwnProperty('filterHideAll') && opts.filterHideAll) {
-			var internal = false;
-			messageClasses = (!!$(messageHtml).attr('class') ? $(messageHtml).attr('class').split(/\s+/) : false);
-			if (messageClasses) {
-				for (var i = 0; i < messageClasses.length; i++) { //Every class
-					if (messageClasses[i] == 'internal') {
-						internal = true;
-						break;
-					}
-				}
-			}
-			if (!internal) {
-				filteredOut = 'All';
-			}
-		} else {
-			//If the element or it's child have any classes
-			if (!!$(messageHtml).attr('class') || !!$(messageHtml).children().attr('class')) {
-				messageClasses = $(messageHtml).attr('class').split(/\s+/);
-				if (!!$(messageHtml).children().attr('class')) {
-					messageClasses = messageClasses.concat($(messageHtml).children().attr('class').split(/\s+/));
-				}
-				var tempCount = 0;
-				for (var i = 0; i < messageClasses.length; i++) { //Every class
-					var thisClass = messageClasses[i];
-					$.each(opts.showMessagesFilters, function(key, val) { //Every filter
-						if (key !== 'All' && val.show === false && typeof val.match != 'undefined') {
-							for (var i = 0; i < val.match.length; i++) {
-								var matchClass = val.match[i];
-								if (matchClass == thisClass) {
-									filteredOut = key;
-									break;
-								}
-							}
-						}
-						if (filteredOut) return false;
-					});
-					if (filteredOut) break;
-					tempCount++;
-				}
-			} else {
-				if (!opts.showMessagesFilters['Misc'].show) {
-					filteredOut = 'Misc';
-				}
-			}
-		}
-	}
-
 	//Stuff we do along with appending a message
 	var atBottom = false;
-	if (!filteredOut) {
-		var bodyHeight = $('body').height();
-		var messagesHeight = $messages.outerHeight();
-		var scrollPos = $('body,html').scrollTop();
+	var bodyHeight = $('body').height();
+	var messagesHeight = $messages.outerHeight();
+	var scrollPos = $('body,html').scrollTop();
 
-		//Should we snap the output to the bottom?
-		if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) {
-			atBottom = true;
-			if ($('#newMessages').length) {
-				$('#newMessages').remove();
+	//Should we snap the output to the bottom?
+	if (bodyHeight + scrollPos >= messagesHeight - opts.scrollSnapTolerance) {
+		atBottom = true;
+		if ($('#newMessages').length) {
+			$('#newMessages').remove();
+		}
+	//If not, put the new messages box in
+	} else {
+		if ($('#newMessages').length) {
+			var messages = $('#newMessages .number').text();
+			messages = parseInt(messages);
+			messages++;
+			$('#newMessages .number').text(messages);
+			if (messages == 2) {
+				$('#newMessages .messageWord').append('s');
 			}
-		//If not, put the new messages box in
 		} else {
-			if ($('#newMessages').length) {
-				var messages = $('#newMessages .number').text();
-				messages = parseInt(messages);
-				messages++;
-				$('#newMessages .number').text(messages);
-				if (messages == 2) {
-					$('#newMessages .messageWord').append('s');
-				}
-			} else {
-				$messages.after('<a href="#" id="newMessages"><span class="number">1</span> new <span class="messageWord">message</span> <i class="icon-double-angle-down"></i></a>');
-			}
+			$messages.after('<a href="#" id="newMessages"><span class="number">1</span> new <span class="messageWord">message</span> <i class="icon-double-angle-down"></i></a>');
 		}
 	}
 
+
 	opts.messageCount++;
 
 	//Pop the top message off if history limit reached
-	if (opts.messageCount >= opts.messageLimit) {
-		$messages.children('div.entry:first-child').remove();
-		opts.messageCount--; //I guess the count should only ever equal the limit
-	}
+	//if (opts.messageCount >= opts.messageLimit) {
+		//$messages.children('div.entry:first-child').remove();
+		//opts.messageCount--; //I guess the count should only ever equal the limit
+	//}
 
 	// Create the element - if combining is off, we use it, and if it's on, we
 	// might discard it bug need to check its text content. Some messages vary
@@ -372,11 +317,6 @@ function output(message, flag) {
 		//Actually append the message
 		entry.className = 'entry';
 
-		if (filteredOut) {
-			entry.className += ' hidden';
-			entry.setAttribute('data-filter', filteredOut);
-		}
-
 		$last_message = trimmed_message;
 		$messages[0].appendChild(entry);
 		$(entry).find("img.icon").error(iconError);
@@ -401,7 +341,7 @@ function output(message, flag) {
 		}
 	}
 
-	if (!filteredOut && atBottom) {
+	if (atBottom) {
 		$('body,html').scrollTop($messages.outerHeight());
 	}
 }

code/modules/hydroponics/biogenerator.dm

@@ -304,6 +304,8 @@
 
 	else if(href_list["create"])
 		var/amount = (text2num(href_list["amount"]))
+		//Can't be outside these (if you change this keep a sane limit)
+		amount = CLAMP(amount, 1, 50)
 		var/datum/design/D = locate(href_list["create"])
 		create_product(D, amount)
 		updateUsrDialog()

code/modules/integrated_electronics/_defines.dm

@@ -0,0 +1,5 @@
+#define IC_TOPIC_UNHANDLED 0
+#define IC_TOPIC_HANDLED 1
+#define IC_TOPIC_REFRESH 2
+#define IC_FLAG_ANCHORABLE 1
+#define IC_FLAG_CAN_FIRE 2

code/modules/integrated_electronics/subtypes/atmospherics.dm

@@ -0,0 +1,762 @@
+#define SOURCE_TO_TARGET 0
+#define TARGET_TO_SOURCE 1
+#define PUMP_EFFICIENCY 0.6
+#define TANK_FAILURE_PRESSURE (ONE_ATMOSPHERE*25)
+#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE*24)
+#define PUMP_MAX_VOLUME 100
+
+
+/obj/item/integrated_circuit/atmospherics
+	category_text = "Atmospherics"
+	cooldown_per_use = 2 SECONDS
+	complexity = 10
+	size = 7
+	outputs = list(
+		"self reference" = IC_PINTYPE_SELFREF,
+		"pressure" = IC_PINTYPE_NUMBER
+			)
+	var/datum/gas_mixture/air_contents
+	var/volume = 2 //Pretty small, I know
+
+/obj/item/integrated_circuit/atmospherics/Initialize()
+	air_contents = new(volume)
+	..()
+
+/obj/item/integrated_circuit/atmospherics/return_air()
+	return air_contents
+
+//Check if the gas container is adjacent and of the right type
+/obj/item/integrated_circuit/atmospherics/proc/check_gassource(atom/gasholder)
+	if(!gasholder)
+		return FALSE
+	if(!gasholder.Adjacent(get_object()))
+		return FALSE
+	if(!istype(gasholder, /obj/item/tank) && !istype(gasholder, /obj/machinery/portable_atmospherics) && !istype(gasholder, /obj/item/integrated_circuit/atmospherics))
+		return FALSE
+	return TRUE
+
+//Needed in circuits where source and target types differ
+/obj/item/integrated_circuit/atmospherics/proc/check_gastarget(atom/gasholder)
+	return check_gassource(gasholder)
+
+
+// - gas pump - // **works**
+/obj/item/integrated_circuit/atmospherics/pump
+	name = "gas pump"
+	desc = "Somehow moves gases between two tanks, canisters, and other gas containers."
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	inputs = list(
+			"source" = IC_PINTYPE_REF,
+			"target" = IC_PINTYPE_REF,
+			"target pressure" = IC_PINTYPE_NUMBER
+			)
+	activators = list(
+			"transfer" = IC_PINTYPE_PULSE_IN,
+			"on transfer" = IC_PINTYPE_PULSE_OUT
+			)
+	var/direction = SOURCE_TO_TARGET
+	var/target_pressure = PUMP_MAX_PRESSURE
+	power_draw_per_use = 20
+
+/obj/item/integrated_circuit/atmospherics/pump/Initialize()
+	air_contents = new(volume)
+	extended_desc += " Use negative pressure to move air from target to source. \
+					Note that only part of the gas is moved on each transfer, \
+					so multiple activations will be necessary to achieve target pressure. \
+					The pressure limit for circuit pumps is [round(PUMP_MAX_PRESSURE)] kPa."
+	. = ..()
+
+// This proc gets the direction of the gas flow depending on its value, by calling update target
+/obj/item/integrated_circuit/atmospherics/pump/on_data_written()
+	var/amt = get_pin_data(IC_INPUT, 3)
+	update_target(amt)
+
+/obj/item/integrated_circuit/atmospherics/pump/proc/update_target(new_amount)
+	if(!isnum(new_amount))
+		new_amount = 0
+	// See in which direction the gas moves
+	if(new_amount < 0)
+		direction = TARGET_TO_SOURCE
+	else
+		direction = SOURCE_TO_TARGET
+	target_pressure = min(round(PUMP_MAX_PRESSURE),abs(new_amount))
+
+/obj/item/integrated_circuit/atmospherics/pump/do_work()
+	var/obj/source = get_pin_data_as_type(IC_INPUT, 1, /obj)
+	var/obj/target = get_pin_data_as_type(IC_INPUT, 2, /obj)
+	perform_magic(source, target)
+	activate_pin(2)
+
+/obj/item/integrated_circuit/atmospherics/pump/proc/perform_magic(atom/source, atom/target)
+	//Check if both atoms are of the right type: atmos circuits/gas tanks/canisters. If one is the same, use the circuit var
+	if(!check_gassource(source))
+		source = src
+
+	if(!check_gastarget(target))
+		target = src
+
+	// If both are the same, this whole proc would do nothing and just waste performance
+	if(source == target)
+		return
+
+	var/datum/gas_mixture/source_air = source.return_air()
+	var/datum/gas_mixture/target_air = target.return_air()
+
+	if(!source_air || !target_air)
+		return
+
+	// Swapping both source and target
+	if(direction == TARGET_TO_SOURCE)
+		var/temp = source_air
+		source_air = target_air
+		target_air = temp
+
+	// If what you are pumping is empty, use the circuit's storage
+	if(source_air.total_moles() <= 0)
+		source_air = air_contents
+
+	// Move gas from one place to another
+	move_gas(source_air, target_air)
+	air_update_turf()
+
+/obj/item/integrated_circuit/atmospherics/pump/proc/move_gas(datum/gas_mixture/source_air, datum/gas_mixture/target_air)
+
+	// No moles = nothing to pump
+	if(source_air.total_moles() <= 0  || target_air.return_pressure() >= PUMP_MAX_PRESSURE)
+		return
+
+	// Negative Kelvin temperatures should never happen and if they do, normalize them
+	if(source_air.temperature < TCMB)
+		source_air.temperature = TCMB
+
+	var/pressure_delta = target_pressure - target_air.return_pressure()
+	if(pressure_delta > 0.1)
+		var/transfer_moles = (pressure_delta*target_air.volume/(source_air.temperature * R_IDEAL_GAS_EQUATION))*PUMP_EFFICIENCY
+		var/datum/gas_mixture/removed = source_air.remove(transfer_moles)
+		target_air.merge(removed)
+
+
+// - volume pump - // **Works**
+/obj/item/integrated_circuit/atmospherics/pump/volume
+	name = "volume pump"
+	desc = "Moves gases between two tanks, canisters, and other gas containers by using their volume, up to 200 L/s."
+	extended_desc = " Use negative volume to move air from target to source. Note that only part of the gas is moved on each transfer. Its maximum pumping volume is capped at 1000kPa."
+
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	inputs = list(
+			"source" = IC_PINTYPE_REF,
+			"target" = IC_PINTYPE_REF,
+			"transfer volume" = IC_PINTYPE_NUMBER
+			)
+	activators = list(
+			"transfer" = IC_PINTYPE_PULSE_IN,
+			"on transfer" = IC_PINTYPE_PULSE_OUT
+			)
+	direction = SOURCE_TO_TARGET
+	var/transfer_rate = PUMP_MAX_VOLUME
+	power_draw_per_use = 20
+
+/obj/item/integrated_circuit/atmospherics/pump/volume/update_target(new_amount)
+	if(!isnum(new_amount))
+		new_amount = 0
+	// See in which direction the gas moves
+	if(new_amount < 0)
+		direction = TARGET_TO_SOURCE
+	else
+		direction = SOURCE_TO_TARGET
+	target_pressure = min(PUMP_MAX_VOLUME,abs(new_amount))
+
+/obj/item/integrated_circuit/atmospherics/pump/volume/move_gas(datum/gas_mixture/source_air, datum/gas_mixture/target_air)
+	// No moles = nothing to pump
+	if(source_air.total_moles() <= 0)
+		return
+
+	// Negative Kelvin temperatures should never happen and if they do, normalize them
+	if(source_air.temperature < TCMB)
+		source_air.temperature = TCMB
+
+	if((source_air.return_pressure() < 0.01) || (target_air.return_pressure() >= PUMP_MAX_PRESSURE))
+		return
+
+	//The second part of the min caps the pressure built by the volume pumps to the max pump pressure
+	var/transfer_ratio = min(transfer_rate,target_air.volume*PUMP_MAX_PRESSURE/source_air.return_pressure())/source_air.volume
+
+	var/datum/gas_mixture/removed = source_air.remove_ratio(transfer_ratio * PUMP_EFFICIENCY)
+
+	target_air.merge(removed)
+
+
+// - gas vent - // **works**
+/obj/item/integrated_circuit/atmospherics/pump/vent
+	name = "gas vent"
+	extended_desc = "Use negative volume to move air from target to environment. Note that only part of the gas is moved on each transfer. Unlike the gas pump, this one keeps pumping even further to pressures of 9000 pKa and it is not advised to use it on tank circuits."
+	desc = "Moves gases between the environment and adjacent gas containers."
+	inputs = list(
+			"container" = IC_PINTYPE_REF,
+			"target pressure" = IC_PINTYPE_NUMBER
+			)
+
+/obj/item/integrated_circuit/atmospherics/pump/vent/on_data_written()
+	var/amt = get_pin_data(IC_INPUT, 2)
+	update_target(amt)
+
+/obj/item/integrated_circuit/atmospherics/pump/vent/do_work()
+	var/turf/source = get_turf(src)
+	var/obj/target = get_pin_data_as_type(IC_INPUT, 1, /obj)
+	perform_magic(source, target)
+	activate_pin(2)
+
+/obj/item/integrated_circuit/atmospherics/pump/vent/check_gastarget(atom/gasholder)
+	if(!gasholder)
+		return FALSE
+	if(!gasholder.Adjacent(get_object()))
+		return FALSE
+	if(!istype(gasholder, /obj/item/tank) && !istype(gasholder, /obj/machinery/portable_atmospherics) && !istype(gasholder, /obj/item/integrated_circuit/atmospherics))
+		return FALSE
+	return TRUE
+
+
+/obj/item/integrated_circuit/atmospherics/pump/vent/check_gassource(atom/target)
+	if(!target)
+		return FALSE
+	if(!istype(target, /turf))
+		return FALSE
+	return TRUE
+
+
+// - integrated connector - // Can connect and disconnect properly
+/obj/item/integrated_circuit/atmospherics/connector
+	name = "integrated connector"
+	desc = "Creates an airtight seal with standard connectors found on the floor, \
+		 	allowing the assembly to exchange gases with a pipe network."
+	extended_desc = "This circuit will automatically attempt to locate and connect to ports on the floor beneath it when activated. \
+					You <b>must</b> set a target before connecting."
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	inputs = list(
+			"target" = IC_PINTYPE_REF
+			)
+	activators = list(
+			"toggle connection" = IC_PINTYPE_PULSE_IN,
+			"on connected" = IC_PINTYPE_PULSE_OUT,
+			"on connection failed" = IC_PINTYPE_PULSE_OUT,
+			"on disconnected" = IC_PINTYPE_PULSE_OUT
+			)
+
+	var/obj/machinery/atmospherics/components/unary/portables_connector/connector
+
+/obj/item/integrated_circuit/atmospherics/connector/Initialize()
+	air_contents = new(volume)
+	START_PROCESSING(SSobj, src)
+	. = ..()
+
+//Sucks up the gas from the connector
+/obj/item/integrated_circuit/atmospherics/connector/process()
+	set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure())
+
+/obj/item/integrated_circuit/atmospherics/connector/check_gassource(atom/gasholder)
+	if(!gasholder)
+		return FALSE
+	if(!istype(gasholder,/obj/machinery/atmospherics/components/unary/portables_connector))
+		return FALSE
+	return TRUE
+
+//If the assembly containing this is moved from the tile the connector pipe is in, the connection breaks
+/obj/item/integrated_circuit/atmospherics/connector/ext_moved()
+	if(connector)
+		if(get_dist(get_object(), connector) > 0)
+			// The assembly is set as connected device and the connector handles the rest
+			connector.connected_device = null
+			connector = null
+			activate_pin(4)
+
+/obj/item/integrated_circuit/atmospherics/connector/do_work()
+	// If there is a connection, disconnect
+	if(connector)
+		connector.connected_device = null
+		connector = null
+		activate_pin(4)
+		return
+
+	var/obj/machinery/atmospherics/components/unary/portables_connector/PC = locate() in get_turf(src)
+	// If no connector can't connect
+	if(!PC)
+		activate_pin(3)
+		return
+	connector = PC
+	connector.connected_device = src
+	activate_pin(2)
+
+// Required for making the connector port script work
+obj/item/integrated_circuit/atmospherics/connector/portableConnectorReturnAir()
+	return air_contents
+
+
+// - gas filter - // **works**
+/obj/item/integrated_circuit/atmospherics/pump/filter
+	name = "gas filter"
+	desc = "Filters one gas out of a mixture."
+	complexity = 20
+	size = 8
+	spawn_flags = IC_SPAWN_RESEARCH
+	inputs = list(
+			"source" = IC_PINTYPE_REF,
+			"filtered output" = IC_PINTYPE_REF,
+			"contaminants output" = IC_PINTYPE_REF,
+			"wanted gases" = IC_PINTYPE_LIST,
+			"target pressure" = IC_PINTYPE_NUMBER
+			)
+	power_draw_per_use = 30
+
+/obj/item/integrated_circuit/atmospherics/pump/filter/on_data_written()
+	var/amt = get_pin_data(IC_INPUT, 5)
+	target_pressure = CLAMP(amt, 0, PUMP_MAX_PRESSURE)
+
+/obj/item/integrated_circuit/atmospherics/pump/filter/do_work()
+	activate_pin(2)
+	var/obj/source = get_pin_data_as_type(IC_INPUT, 1, /obj)
+	var/obj/filtered = get_pin_data_as_type(IC_INPUT, 2, /obj)
+	var/obj/contaminants = get_pin_data_as_type(IC_INPUT, 3, /obj)
+
+	var/wanted = get_pin_data(IC_INPUT, 4)
+
+	// If there is no filtered output, this whole thing makes no sense
+	if(!check_gassource(filtered))
+		return
+
+	var/datum/gas_mixture/filtered_air = filtered.return_air()
+	if(!filtered_air)
+		return
+
+	// If no source is set, the source is possibly this circuit's content
+	if(!check_gassource(source))
+		source = src
+	var/datum/gas_mixture/source_air = source.return_air()
+
+	//No source air: source is this circuit
+	if(!source_air)
+		source_air = air_contents
+
+	// If no filtering tank is set, filter through itself
+	if(!check_gassource(contaminants))
+		contaminants = src
+	var/datum/gas_mixture/contaminated_air = contaminants.return_air()
+
+	//If there is no gas mixture datum for unfiltered, pump the contaminants back into the circuit
+	if(!contaminated_air)
+		contaminated_air = air_contents
+
+	if(contaminated_air.return_pressure() >= PUMP_MAX_PRESSURE || filtered_air.return_pressure() >= PUMP_MAX_PRESSURE)
+		return
+
+	var/pressure_delta = target_pressure - contaminated_air.return_pressure()
+	var/transfer_moles
+
+	//Negative Kelvins are an anomaly and should be normalized if encountered
+	if(source_air.temperature < TCMB)
+		source_air.temperature = TCMB
+
+	transfer_moles = (pressure_delta*contaminated_air.volume/(source_air.temperature * R_IDEAL_GAS_EQUATION))*PUMP_EFFICIENCY
+
+	//If there is nothing to transfer, just return
+	if(transfer_moles <= 0)
+		return
+
+	//This is the var that holds the currently filtered part of the gas
+	var/datum/gas_mixture/removed = source_air.remove(transfer_moles)
+	if(!removed)
+		return
+
+	//This is the gas that will be moved from source to filtered
+	var/datum/gas_mixture/filtered_out = new
+
+	for(var/filtered_gas in removed.gases)
+		//Get the name of the gas and see if it is in the list
+		if(removed.gases[filtered_gas][GAS_META][META_GAS_NAME] in wanted)
+			//The gas that is put in all the filtered out gases
+			filtered_out.temperature = removed.temperature
+			filtered_out.add_gas(filtered_gas)
+			filtered_out.gases[filtered_gas][MOLES] = removed.gases[filtered_gas][MOLES]
+
+			//The filtered out gas is entirely removed from the currently filtered gases
+			removed.gases[filtered_gas][MOLES] = 0
+			removed.garbage_collect()
+
+	//Check if the pressure is high enough to put stuff in filtered, or else just put it back in the source
+	var/datum/gas_mixture/target = (filtered_air.return_pressure() < target_pressure ? filtered_air : source_air)
+	target.merge(filtered_out)
+	contaminated_air.merge(removed)
+
+
+/obj/item/integrated_circuit/atmospherics/pump/filter/Initialize()
+	air_contents = new(volume)
+	. = ..()
+	extended_desc = "Remember to properly spell and capitalize the filtered gas name. \
+					Note that only part of the gas is moved on each transfer, \
+					so multiple activations will be necessary to achieve target pressure. \
+					The pressure limit for circuit pumps is [round(PUMP_MAX_PRESSURE)] kPa."
+
+
+// - gas mixer - // **works**
+/obj/item/integrated_circuit/atmospherics/pump/mixer
+	name = "gas mixer"
+	desc = "Mixes 2 different types of gases."
+	complexity = 20
+	size = 8
+	spawn_flags = IC_SPAWN_RESEARCH
+	inputs = list(
+			"first source" = IC_PINTYPE_REF,
+			"second source" = IC_PINTYPE_REF,
+			"output" = IC_PINTYPE_REF,
+			"first source percentage" = IC_PINTYPE_NUMBER,
+			"target pressure" = IC_PINTYPE_NUMBER
+			)
+	power_draw_per_use = 30
+
+/obj/item/integrated_circuit/atmospherics/pump/mixer/do_work()
+	activate_pin(2)
+	var/obj/source_1 = get_pin_data(IC_INPUT, 1)
+	var/obj/source_2 = get_pin_data(IC_INPUT, 2)
+	var/obj/gas_output = get_pin_data(IC_INPUT, 3)
+	if(!check_gassource(source_1))
+		source_1 = src
+
+	if(!check_gassource(source_2))
+		source_2 = src
+
+	if(!check_gassource(gas_output))
+		gas_output = src
+
+	if(source_1 == gas_output || source_2 == gas_output)
+		return
+
+	var/datum/gas_mixture/source_1_gases = source_1.return_air()
+	var/datum/gas_mixture/source_2_gases = source_2.return_air()
+	var/datum/gas_mixture/output_gases = gas_output.return_air()
+
+	if(!source_1_gases || !source_2_gases || !output_gases)
+		return
+
+	if(output_gases.return_pressure() >= PUMP_MAX_PRESSURE)
+		return
+
+	if(source_1_gases.return_pressure() <= 0 || source_2_gases.return_pressure() <= 0)
+		return
+
+	//This calculates how much should be sent
+	var/gas_percentage = round(max(min(get_pin_data(IC_INPUT, 4),100),0) / 100)
+
+	//Basically: number of moles = percentage of pressure filled up * efficiency coefficient * (pressure from both gases * volume of output) / (R * Temperature)
+	var/transfer_moles = (get_pin_data(IC_INPUT, 5) / max(1,output_gases.return_pressure())) * PUMP_EFFICIENCY * (source_1_gases.return_pressure() * gas_percentage +  source_2_gases.return_pressure() * (1 - gas_percentage)) * output_gases.volume/ (R_IDEAL_GAS_EQUATION * max(output_gases.temperature,TCMB))
+
+
+	if(transfer_moles <= 0)
+		return
+
+	var/datum/gas_mixture/mix = source_1_gases.remove(transfer_moles * gas_percentage)
+	output_gases.merge(mix)
+	mix = source_2_gases.remove(transfer_moles * (1-gas_percentage))
+	output_gases.merge(mix)
+
+
+// - integrated tank - // **works**
+/obj/item/integrated_circuit/atmospherics/tank
+	name = "integrated tank"
+	desc = "A small tank for the storage of gases."
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	size = 4
+	activators = list(
+			"push ref" = IC_PINTYPE_PULSE_IN
+			)
+	volume = 3 //emergency tank sized
+	var/broken = FALSE
+
+/obj/item/integrated_circuit/atmospherics/tank/Initialize()
+	air_contents = new(volume)
+	START_PROCESSING(SSobj, src)
+	extended_desc = "Take care not to pressurize it above [round(TANK_FAILURE_PRESSURE)] kPa, or else it will break."
+	. = ..()
+
+/obj/item/integrated_circuit/atmospherics/tank/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/item/integrated_circuit/atmospherics/tank/do_work()
+	set_pin_data(IC_OUTPUT, 1, WEAKREF(src))
+	push_data()
+
+/obj/item/integrated_circuit/atmospherics/tank/process()
+	var/tank_pressure = air_contents.return_pressure()
+	set_pin_data(IC_OUTPUT, 2, tank_pressure)
+	push_data()
+
+	//Check if tank broken
+	if(!broken && tank_pressure > TANK_FAILURE_PRESSURE)
+		broken = TRUE
+		to_chat(view(2),"<span class='notice'>The [name] ruptures, releasing its gases!</span>")
+	if(broken)
+		release()
+
+/obj/item/integrated_circuit/atmospherics/tank/proc/release()
+	if(air_contents.total_moles() > 0)
+		playsound(loc, 'sound/effects/spray.ogg', 10, 1, -3)
+		var/datum/gas_mixture/expelled_gas = air_contents.remove(air_contents.total_moles())
+		var/turf/current_turf = get_turf(src)
+		var/datum/gas_mixture/exterior_gas
+		if(!current_turf)
+			return
+
+		exterior_gas = current_turf.return_air()
+		exterior_gas.merge(expelled_gas)
+
+
+// - large integrated tank - // **works**
+/obj/item/integrated_circuit/atmospherics/tank/large
+	name = "large integrated tank"
+	desc = "A less small tank for the storage of gases."
+	volume = 9
+	size = 12
+	spawn_flags = IC_SPAWN_RESEARCH
+
+
+// - freezer tank - // **works**
+/obj/item/integrated_circuit/atmospherics/tank/freezer
+	name = "freezer tank"
+	desc = "Cools the gas it contains to a preset temperature."
+	volume = 6
+	size = 8
+	inputs = list(
+		"target temperature" = IC_PINTYPE_NUMBER,
+		"on" = IC_PINTYPE_BOOLEAN
+		)
+	inputs_default = list("1" = 300)
+	spawn_flags = IC_SPAWN_RESEARCH
+	var/temperature = 293.15
+	var/heater_coefficient = 0.1
+
+/obj/item/integrated_circuit/atmospherics/tank/freezer/on_data_written()
+	temperature = max(73.15,min(293.15,get_pin_data(IC_INPUT, 1)))
+	if(get_pin_data(IC_INPUT, 2))
+		power_draw_idle = 30
+	else
+		power_draw_idle = 0
+
+/obj/item/integrated_circuit/atmospherics/tank/freezer/process()
+	var/tank_pressure = air_contents.return_pressure()
+	set_pin_data(IC_OUTPUT, 2, tank_pressure)
+	push_data()
+
+	//Cool the tank if the power is on and the temp is above
+	if(!power_draw_idle || air_contents.temperature < temperature)
+		return
+
+	air_contents.temperature = max(73.15,air_contents.temperature - (air_contents.temperature - temperature) * heater_coefficient)
+
+
+// - heater tank - // **works**
+/obj/item/integrated_circuit/atmospherics/tank/freezer/heater
+	name = "heater tank"
+	desc = "Heats the gas it contains to a preset temperature."
+	volume = 6
+	inputs = list(
+		"target temperature" = IC_PINTYPE_NUMBER,
+		"on" = IC_PINTYPE_BOOLEAN
+		)
+	spawn_flags = IC_SPAWN_RESEARCH
+
+/obj/item/integrated_circuit/atmospherics/tank/freezer/heater/on_data_written()
+	temperature = max(293.15,min(573.15,get_pin_data(IC_INPUT, 1)))
+	if(get_pin_data(IC_INPUT, 2))
+		power_draw_idle = 30
+	else
+		power_draw_idle = 0
+
+/obj/item/integrated_circuit/atmospherics/tank/freezer/heater/process()
+	var/tank_pressure = air_contents.return_pressure()
+	set_pin_data(IC_OUTPUT, 2, tank_pressure)
+	push_data()
+
+	//Heat the tank if the power is on or its temperature is below what is set
+	if(!power_draw_idle || air_contents.temperature > temperature)
+		return
+
+	air_contents.temperature = min(573.15,air_contents.temperature + (temperature - air_contents.temperature) * heater_coefficient)
+
+
+// - atmospheric cooler - // **works**
+/obj/item/integrated_circuit/atmospherics/cooler
+	name = "atmospheric cooler circuit"
+	desc = "Cools the air around it."
+	volume = 6
+	size = 13
+	spawn_flags = IC_SPAWN_RESEARCH
+	inputs = list(
+		"target temperature" = IC_PINTYPE_NUMBER,
+		"on" = IC_PINTYPE_BOOLEAN
+		)
+	var/temperature = 293.15
+	var/heater_coefficient = 0.1
+
+/obj/item/integrated_circuit/atmospherics/cooler/Initialize()
+	air_contents = new(volume)
+	START_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/item/integrated_circuit/atmospherics/cooler/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/item/integrated_circuit/atmospherics/cooler/on_data_written()
+	temperature = max(243.15,min(293.15,get_pin_data(IC_INPUT, 1)))
+	if(get_pin_data(IC_INPUT, 2))
+		power_draw_idle = 30
+	else
+		power_draw_idle = 0
+
+/obj/item/integrated_circuit/atmospherics/cooler/process()
+	set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure())
+	push_data()
+
+
+	//Get the turf you're on and its gas mixture
+	var/turf/current_turf = get_turf(src)
+	if(!current_turf)
+		return
+
+	var/datum/gas_mixture/turf_air = current_turf.return_air()
+	if(!power_draw_idle || turf_air.temperature < temperature)
+		return
+
+	//Cool the gas
+	turf_air.temperature = max(243.15,turf_air.temperature - (turf_air.temperature - temperature) * heater_coefficient)
+
+
+// - atmospheric heater - // **works**
+/obj/item/integrated_circuit/atmospherics/cooler/heater
+	name = "atmospheric heater circuit"
+	desc = "Heats the air around it."
+
+/obj/item/integrated_circuit/atmospherics/cooler/heater/on_data_written()
+	temperature = max(293.15,min(323.15,get_pin_data(IC_INPUT, 1)))
+	if(get_pin_data(IC_INPUT, 2))
+		power_draw_idle = 30
+	else
+		power_draw_idle = 0
+
+/obj/item/integrated_circuit/atmospherics/cooler/heater/process()
+	set_pin_data(IC_OUTPUT, 2, air_contents.return_pressure())
+	push_data()
+
+	//Get the turf and its air mixture
+	var/turf/current_turf = get_turf(src)
+	if(!current_turf)
+		return
+
+	var/datum/gas_mixture/turf_air = current_turf.return_air()
+	if(!power_draw_idle || turf_air.temperature > temperature)
+		return
+
+	//Heat the gas
+	turf_air.temperature = min(323.15,turf_air.temperature + (temperature - turf_air.temperature) * heater_coefficient)
+
+
+// - tank slot - // **works**
+/obj/item/integrated_circuit/input/tank_slot
+	category_text = "Atmospherics"
+	cooldown_per_use = 1
+	name = "tank slot"
+	desc = "Lets you add a tank to your assembly and remove it even when the assembly is closed."
+	extended_desc = "It can help you extract gases easier."
+	complexity = 25
+	size = 30
+	inputs = list()
+	outputs = list(
+		"pressure used" = IC_PINTYPE_NUMBER,
+		"current tank" = IC_PINTYPE_REF
+		)
+	activators = list(
+		"push ref" = IC_PINTYPE_PULSE_IN,
+		"on insert" = IC_PINTYPE_PULSE_OUT,
+		"on remove" = IC_PINTYPE_PULSE_OUT
+		)
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+
+	can_be_asked_input = TRUE
+	demands_object_input = TRUE
+	can_input_object_when_closed = TRUE
+
+	var/obj/item/tank/internals/current_tank
+
+/obj/item/integrated_circuit/input/tank_slot/Initialize()
+	START_PROCESSING(SSobj, src)
+	. = ..()
+
+/obj/item/integrated_circuit/input/tank_slot/process()
+	push_pressure()
+
+/obj/item/integrated_circuit/input/tank_slot/attackby(var/obj/item/tank/internals/I, var/mob/living/user)
+	//Check if it truly is a tank
+	if(!istype(I,/obj/item/tank/internals))
+		to_chat(user,"<span class='warning'>The [I.name] doesn't seem to fit in here.</span>")
+		return
+
+	//Check if there is no other tank already inside
+	if(current_tank)
+		to_chat(user,"<span class='warning'>There is already a gas tank inside.</span>")
+		return
+
+	//The current tank is the one we just attached, its location is inside the circuit
+	current_tank = I
+	user.transferItemToLoc(I,src)
+	to_chat(user,"<span class='warning'>You put the [I.name] inside the tank slot.</span>")
+
+	//Set the pin to a weak reference of the current tank
+	push_pressure()
+	set_pin_data(IC_OUTPUT, 2, WEAKREF(current_tank))
+	push_data()
+	do_work(1)
+
+
+/obj/item/integrated_circuit/input/tank_slot/ask_for_input(mob/user)
+	attack_self(user)
+
+/obj/item/integrated_circuit/input/tank_slot/attack_self(mob/user)
+	//Check if no tank attached
+	if(!current_tank)
+		to_chat(user, "<span class='notice'>There is currently no tank attached.</span>")
+		return
+
+	//Remove tank and put in user's hands/location
+	to_chat(user, "<span class='notice'>You take [current_tank] out of the tank slot.</span>")
+	user.put_in_hands(current_tank)
+	current_tank = null
+
+	//Remove tank reference
+	push_pressure()
+	set_pin_data(IC_OUTPUT, 2, null)
+	push_data()
+	do_work(2)
+
+/obj/item/integrated_circuit/input/tank_slot/do_work()
+	set_pin_data(IC_OUTPUT, 2, WEAKREF(current_tank))
+	push_data()
+
+/obj/item/integrated_circuit/input/tank_slot/proc/push_pressure()
+	if(!current_tank)
+		set_pin_data(IC_OUTPUT, 1, 0)
+		return
+
+	var/datum/gas_mixture/tank_air = current_tank.return_air()
+	if(!tank_air)
+		set_pin_data(IC_OUTPUT, 1, 0)
+		return
+
+	set_pin_data(IC_OUTPUT, 1, tank_air.return_pressure())
+	push_data()
+
+
+#undef SOURCE_TO_TARGET
+#undef TARGET_TO_SOURCE
+#undef PUMP_EFFICIENCY
+#undef TANK_FAILURE_PRESSURE
+#undef PUMP_MAX_PRESSURE
+#undef PUMP_MAX_VOLUME

code/modules/integrated_electronics/subtypes/input.dm

@@ -1218,4 +1218,126 @@
 			activate_pin(2)
 	else
 		return FALSE
-	return TRUE
+	return TRUE
+
+
+//Hippie Ported Code--------------------------------------------------------------------------------------------------------
+
+
+	//Adding some color to cards aswell, because why not
+/obj/item/card/data/attackby(obj/item/I, mob/living/user)
+	if(istype(I, /obj/item/integrated_electronics/detailer))
+		var/obj/item/integrated_electronics/detailer/D = I
+		detail_color = D.detail_color
+		update_icon()
+	return ..()
+
+
+
+// -Inputlist- //
+/obj/item/integrated_circuit/input/selection
+	name = "selection circuit"
+	desc = "This circuit lets you choose between different strings from a selection."
+	extended_desc = "This circuit lets you choose between up to 4 different values from selection of up to 8 strings that you can set. Null values are ignored and the chosen value is put out in selected."
+	icon_state = "addition"
+	can_be_asked_input = 1
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	inputs = list(
+		"A" = IC_PINTYPE_STRING,
+		"B" = IC_PINTYPE_STRING,
+		"C" = IC_PINTYPE_STRING,
+		"D" = IC_PINTYPE_STRING,
+		"E" = IC_PINTYPE_STRING,
+		"F" = IC_PINTYPE_STRING,
+		"G" = IC_PINTYPE_STRING,
+		"H" = IC_PINTYPE_STRING
+	)
+	activators = list(
+		"on selected" = IC_PINTYPE_PULSE_OUT
+	)
+	outputs = list(
+		"selected" = IC_PINTYPE_STRING
+	)
+
+/obj/item/integrated_circuit/input/selection/ask_for_input(mob/user)
+	var/list/selection = list()
+	for(var/k in 1 to inputs.len)
+		var/I = get_pin_data(IC_INPUT, k)
+		if(istext(I))
+			selection.Add(I)
+	var/selected = input(user,"Choose input.","Selection") in selection
+	if(!selected)
+		return
+	set_pin_data(IC_OUTPUT, 1, selected)
+	push_data()
+	activate_pin(1)
+
+
+// -storage examiner- // **works**
+/obj/item/integrated_circuit/input/storage_examiner
+	name = "storage examiner circuit"
+	desc = "This circuit lets you scan a storage's content. (backpacks, toolboxes etc.)"
+	extended_desc = "The items are put out as reference, which makes it possible to interact with them. Additionally also gives the amount of items."
+	icon_state = "grabber"
+	can_be_asked_input = 1
+	complexity = 6
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	inputs = list(
+		"storage" = IC_PINTYPE_REF
+	)
+	activators = list(
+		"examine" = IC_PINTYPE_PULSE_IN,
+		"on examined" = IC_PINTYPE_PULSE_OUT
+	)
+	outputs = list(
+		"item amount" = IC_PINTYPE_NUMBER,
+		"item list" = IC_PINTYPE_LIST
+	)
+	power_draw_per_use = 85
+
+/obj/item/integrated_circuit/input/storage_examiner/do_work()
+	var/obj/item/storage = get_pin_data_as_type(IC_INPUT, 1, /obj/item)
+	if(!istype(storage,/obj/item/storage))
+		return
+
+	set_pin_data(IC_OUTPUT, 1, storage.contents.len)
+
+	var/list/regurgitated_contents = list()
+	for(var/obj/o in storage.contents)
+		regurgitated_contents.Add(WEAKREF(o))
+
+
+	set_pin_data(IC_OUTPUT, 2, regurgitated_contents)
+	push_data()
+	activate_pin(2)
+
+//Degens
+/obj/item/integrated_circuit/input/bonermeter
+	name = "bonermeter"
+	desc = "Detects the target's arousal and various statistics about the target's arousal levels. Invasive!"
+	icon_state = "medscan"
+	complexity = 4
+	inputs = list("target" = IC_PINTYPE_REF)
+	outputs = list(
+		"current arousal" = IC_PINTYPE_NUMBER,
+		"minimum arousal" = IC_PINTYPE_NUMBER,
+		"maximum arousal" = IC_PINTYPE_NUMBER,
+		"can be aroused" = IC_PINTYPE_BOOLEAN
+		)
+	activators = list("scan" = IC_PINTYPE_PULSE_IN, "on scanned" = IC_PINTYPE_PULSE_OUT)
+	spawn_flags = IC_SPAWN_RESEARCH
+	power_draw_per_use = 40
+
+/obj/item/integrated_circuit/input/bonermeter/do_work()
+
+	var/mob/living/L = get_pin_data_as_type(IC_INPUT, 1, /mob/living)
+
+	if(!istype(L) || !L.Adjacent(get_turf(src)) ) //Invalid input
+		return
+
+	set_pin_data(IC_OUTPUT,	1, L.getArousalLoss())
+	set_pin_data(IC_OUTPUT,	2, L.min_arousal)
+	set_pin_data(IC_OUTPUT,	3, L.max_arousal)
+	set_pin_data(IC_OUTPUT,	4, L.canbearoused)
+	push_data()
+	activate_pin(2)

code/modules/integrated_electronics/subtypes/manipulation.dm

@@ -144,7 +144,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	complexity = 10
 	cooldown_per_use = 1
-	ext_cooldown = 1
+	ext_cooldown = 2
 	inputs = list("direction" = IC_PINTYPE_DIR)
 	outputs = list("obstacle" = IC_PINTYPE_REF)
 	activators = list("step towards dir" = IC_PINTYPE_PULSE_IN,"on step"=IC_PINTYPE_PULSE_OUT,"blocked"=IC_PINTYPE_PULSE_OUT)
@@ -677,3 +677,140 @@
 	GET_COMPONENT(materials, /datum/component/material_container)
 	materials.retrieve_all()
 	.=..()
+
+
+//Hippie Ported Code--------------------------------------------------------------------------------------------------------
+
+
+// - inserter circuit - //
+/obj/item/integrated_circuit/manipulation/inserter
+	name = "inserter"
+	desc = "A nimble circuit that puts stuff inside a storage like a backpack and can take it out aswell."
+	icon_state = "grabber"
+	extended_desc = "This circuit accepts a reference to an object to be inserted or extracted depending on mode. If a storage is given for extraction, the extracted item will be put in the new storage. Modes: 1 insert, 0 to extract."
+	w_class = WEIGHT_CLASS_SMALL
+	size = 3
+	cooldown_per_use = 5
+	complexity = 10
+	inputs = list("target object" = IC_PINTYPE_REF, "target container" = IC_PINTYPE_REF,"mode" = IC_PINTYPE_NUMBER)
+	activators = list("pulse in" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT)
+	spawn_flags = IC_SPAWN_RESEARCH
+	action_flags = IC_ACTION_COMBAT
+	power_draw_per_use = 20
+	var/max_items = 10
+
+/obj/item/integrated_circuit/manipulation/inserter/do_work()
+	//There shouldn't be any target required to eject all contents
+	var/obj/item/target_obj = get_pin_data_as_type(IC_INPUT, 1, /obj/item)
+	if(!target_obj)
+		return
+
+	var/distance = get_dist(get_turf(src),get_turf(target_obj))
+	if(distance > 1 || distance < 0)
+		return
+
+	var/obj/item/storage/container = get_pin_data_as_type(IC_INPUT, 2, /obj/item)
+	var/mode = get_pin_data(IC_INPUT, 3)
+	switch(mode)
+		if(1)	//Not working
+			if(!container || !istype(container,/obj/item/storage) || !Adjacent(container))
+				return
+
+			GET_COMPONENT_FROM(STR, /datum/component/storage, container)
+			if(!STR)
+				return
+
+			STR.attackby(src, target_obj)
+
+		else
+			GET_COMPONENT_FROM(STR, /datum/component/storage, target_obj.loc)
+			if(!STR)
+				return
+
+			if(!container || !istype(container,/obj/item/storage) || !Adjacent(container))
+				STR.remove_from_storage(target_obj,drop_location())
+			else
+				STR.remove_from_storage(target_obj,container)
+
+// Renamer circuit. Renames the assembly it is in. Useful in cooperation with telecomms-based circuits.
+/obj/item/integrated_circuit/manipulation/renamer
+	name = "renamer"
+	desc = "A small circuit that renames the assembly it is in. Useful paired with speech-based circuits."
+	icon_state = "internalbm"
+	extended_desc = "This circuit accepts a string as input, and can be pulsed to rewrite the current assembly's name with said string. On success, it pulses the default pulse-out wire."
+	inputs = list("name" = IC_PINTYPE_STRING)
+	outputs = list("current name" = IC_PINTYPE_STRING)
+	activators = list("rename" = IC_PINTYPE_PULSE_IN,"get name" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT)
+	power_draw_per_use = 1
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+
+/obj/item/integrated_circuit/manipulation/renamer/do_work(var/n)
+	if(!assembly)
+		return
+	switch(n)
+		if(1)
+			var/new_name = get_pin_data(IC_INPUT, 1)
+			if(new_name)
+				assembly.name = new_name
+
+		else
+			set_pin_data(IC_OUTPUT, 1, assembly.name)
+			push_data()
+
+	activate_pin(3)
+
+
+
+// - redescribing circuit - //
+/obj/item/integrated_circuit/manipulation/redescribe
+	name = "redescriber"
+	desc = "Takes any string as an input and will set it as the assembly's description."
+	extended_desc = "Strings should can be of any length."
+	icon_state = "speaker"
+	cooldown_per_use = 10
+	complexity = 3
+	inputs = list("text" = IC_PINTYPE_STRING)
+	outputs = list("description" = IC_PINTYPE_STRING)
+	activators = list("redescribe" = IC_PINTYPE_PULSE_IN,"get description" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT)
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+
+/obj/item/integrated_circuit/manipulation/redescribe/do_work(var/n)
+	if(!assembly)
+		return
+
+	switch(n)
+		if(1)
+			assembly.desc = get_pin_data(IC_INPUT, 1)
+
+		else
+			set_pin_data(IC_OUTPUT, 1, assembly.desc)
+			push_data()
+
+	activate_pin(3)
+
+// - repainting circuit - //
+/obj/item/integrated_circuit/manipulation/repaint
+	name = "auto-repainter"
+	desc = "There's an oddly high amount of spraying cans fitted right inside this circuit."
+	extended_desc = "Takes a value in hexadecimal and uses it to repaint the assembly it is in."
+	cooldown_per_use = 10
+	complexity = 3
+	inputs = list("color" = IC_PINTYPE_COLOR)
+	outputs = list("current color" = IC_PINTYPE_COLOR)
+	activators = list("repaint" = IC_PINTYPE_PULSE_IN,"get color" = IC_PINTYPE_PULSE_IN,"pulse out" = IC_PINTYPE_PULSE_OUT)
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+
+/obj/item/integrated_circuit/manipulation/repaint/do_work(var/n)
+	if(!assembly)
+		return
+
+	switch(n)
+		if(1)
+			assembly.detail_color = get_pin_data(IC_INPUT, 1)
+			assembly.update_icon()
+
+		else
+			set_pin_data(IC_OUTPUT, 1, assembly.detail_color)
+			push_data()
+
+	activate_pin(3)

code/modules/integrated_electronics/subtypes/output.dm

@@ -385,4 +385,30 @@
 		else
 			assembly.prefered_hud_icon = "hudstat"
 		//update the diagnostic hud
-		assembly.diag_hud_set_circuitstat()
+		assembly.diag_hud_set_circuitstat()
+
+
+//Hippie Ported Code--------------------------------------------------------------------------------------------------------
+
+
+
+/obj/item/radio/headset/integrated
+
+/obj/item/integrated_circuit/output/screen/large
+	name = "medium screen"
+
+/obj/item/integrated_circuit/output/screen/extralarge // the subtype is called "extralarge" because tg brought back medium screens and they named the subtype /screen/large
+	name = "large screen"
+	desc = "Takes any data type as an input and displays it to the user upon examining, and to all nearby beings when pulsed."
+	icon_state = "screen_large"
+	power_draw_per_use = 40
+	cooldown_per_use = 10
+
+/obj/item/integrated_circuit/output/screen/extralarge/do_work()
+	..()
+	var/obj/O = assembly ? get_turf(assembly) : loc
+	O.visible_message("<span class='notice'>[icon2html(O.icon, world, O.icon_state)]  [stuff_to_display]</span>")
+	if(assembly)
+		assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT)
+	else
+		investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)

code/modules/integrated_electronics/subtypes/reagents.dm

@@ -538,3 +538,250 @@
 		reagents.handle_reactions()
 		set_pin_data(IC_OUTPUT, 3, reagents.chem_temp)
 		push_data()
+
+
+//Hippie Ported Code--------------------------------------------------------------------------------------------------------
+
+
+/obj/item/integrated_circuit/reagent/smoke
+	name = "smoke generator"
+	desc = "Unlike most electronics, creating smoke is completely intentional."
+	icon_state = "smoke"
+	extended_desc = "This smoke generator creates clouds of smoke on command. It can also hold liquids inside, which will go \
+	into the smoke clouds when activated. The reagents are consumed when the smoke is made."
+	ext_cooldown = 1
+	volume = 100
+	complexity = 20
+	cooldown_per_use = 1 SECONDS
+	inputs = list()
+	outputs = list(
+		"volume used" = IC_PINTYPE_NUMBER,
+		"self reference" = IC_PINTYPE_SELFREF
+		)
+	activators = list(
+		"create smoke" = IC_PINTYPE_PULSE_IN,
+		"on smoked" = IC_PINTYPE_PULSE_OUT,
+		"push ref" = IC_PINTYPE_PULSE_IN
+		)
+	spawn_flags = IC_SPAWN_RESEARCH
+	power_draw_per_use = 20
+	var/smoke_radius = 5
+	var/notified = FALSE
+
+/obj/item/integrated_circuit/reagent/smoke/on_reagent_change(changetype)
+	//reset warning only if we have reagents now
+	if(changetype == ADD_REAGENT)
+		notified = FALSE
+	push_vol()
+/obj/item/integrated_circuit/reagent/smoke/do_work(ord)
+	switch(ord)
+		if(1)
+			if(!reagents || (reagents.total_volume < IC_SMOKE_REAGENTS_MINIMUM_UNITS))
+				return
+			var/location = get_turf(src)
+			var/datum/effect_system/smoke_spread/chem/S = new
+			S.attach(location)
+			playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+			if(S)
+				S.set_up(reagents, smoke_radius, location, notified)
+				if(!notified)
+					notified = TRUE
+				S.start()
+			reagents.clear_reagents()
+			activate_pin(2)
+		if(3)
+			set_pin_data(IC_OUTPUT, 2, WEAKREF(src))
+			push_data()
+
+// - Integrated extinguisher - //
+/obj/item/integrated_circuit/reagent/extinguisher
+	name = "integrated extinguisher"
+	desc = "This circuit sprays any of its contents out like an extinguisher."
+	icon_state = "injector"
+	extended_desc = "This circuit can hold up to 30 units of any given chemicals. On each use, it sprays these reagents like a fire extinguisher."
+
+	volume = 30
+
+	complexity = 20
+	cooldown_per_use = 6 SECONDS
+	inputs = list(
+		"target X rel" = IC_PINTYPE_NUMBER,
+		"target Y rel" = IC_PINTYPE_NUMBER
+		)
+	outputs = list(
+		"volume" = IC_PINTYPE_NUMBER,
+		"self reference" = IC_PINTYPE_SELFREF
+		)
+	activators = list(
+		"spray" = IC_PINTYPE_PULSE_IN,
+		"on sprayed" = IC_PINTYPE_PULSE_OUT,
+		"on fail" = IC_PINTYPE_PULSE_OUT
+		)
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	power_draw_per_use = 15
+	var/busy = FALSE
+
+/obj/item/integrated_circuit/reagent/extinguisher/Initialize()
+	.=..()
+	set_pin_data(IC_OUTPUT,2, src)
+
+/obj/item/integrated_circuit/reagent/extinguisher/on_reagent_change(changetype)
+	push_vol()
+
+/obj/item/integrated_circuit/reagent/extinguisher/do_work()
+	//Check if enough volume
+	set_pin_data(IC_OUTPUT, 1, reagents.total_volume)
+	if(!reagents || reagents.total_volume < 5 || busy)
+		push_data()
+		activate_pin(3)
+		return
+
+	playsound(loc, 'sound/effects/extinguish.ogg', 75, 1, -3)
+	//Get the tile on which the water particle spawns
+	var/turf/Spawnpoint = get_turf(src)
+	if(!Spawnpoint)
+		push_data()
+		activate_pin(3)
+		return
+
+	//Get direction and target turf for each water particle
+	var/turf/T = locate(Spawnpoint.x + get_pin_data(IC_INPUT, 1),Spawnpoint.y + get_pin_data(IC_INPUT, 2),Spawnpoint.z)
+	if(!T)
+		push_data()
+		activate_pin(3)
+		return
+	var/direction = get_dir(Spawnpoint, T)
+	var/turf/T1 = get_step(T,turn(direction, 90))
+	var/turf/T2 = get_step(T,turn(direction, -90))
+	var/list/the_targets = list(T,T1,T2)
+	busy = TRUE
+
+	// Create list with particles and their targets
+	var/list/water_particles=list()
+	for(var/a=0, a<5, a++)
+		var/obj/effect/particle_effect/water/W = new /obj/effect/particle_effect/water(get_turf(src))
+		water_particles[W] = pick(the_targets)
+		var/datum/reagents/R = new/datum/reagents(5)
+		W.reagents = R
+		R.my_atom = W
+		reagents.trans_to(W,1)
+
+	//Make em move dat ass, hun
+	addtimer(CALLBACK(src, /obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles, water_particles), 2)
+
+//This whole proc is a loop
+/obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles(var/list/particles, var/repetitions=0)
+	//Check if there's anything in here first
+	if(!particles || particles.len == 0)
+		return
+	// Second loop: Get all the water particles and make them move to their target
+	for(var/obj/effect/particle_effect/water/W in particles)
+		var/turf/my_target = particles[W]
+		if(!W)
+			continue
+		step_towards(W,my_target)
+		if(!W.reagents)
+			continue
+		W.reagents.reaction(get_turf(W))
+		for(var/A in get_turf(W))
+			W.reagents.reaction(A)
+		if(W.loc == my_target)
+			break
+	if(repetitions < 4)
+		repetitions++	//Can't have math operations in addtimer(CALLBACK())
+		addtimer(CALLBACK(src, /obj/item/integrated_circuit/reagent/extinguisher/proc/move_particles, particles, repetitions), 2)
+	else
+		push_data()
+		activate_pin(2)
+		busy = FALSE
+
+// - Beaker Connector - //
+/obj/item/integrated_circuit/input/beaker_connector
+	category_text = "Reagent"
+	cooldown_per_use = 1
+	name = "beaker slot"
+	desc = "Lets you add a beaker to your assembly and remove it even when the assembly is closed."
+	icon_state = "reagent_storage"
+	extended_desc = "It can help you extract reagents easier."
+	complexity = 4
+
+	inputs = list()
+	outputs = list(
+		"volume used" = IC_PINTYPE_NUMBER,
+		"current beaker" = IC_PINTYPE_REF
+		)
+	activators = list(
+		"on insert" = IC_PINTYPE_PULSE_OUT,
+		"on remove" = IC_PINTYPE_PULSE_OUT,
+		"push ref" = IC_PINTYPE_PULSE_OUT
+		)
+
+	spawn_flags = IC_SPAWN_DEFAULT|IC_SPAWN_RESEARCH
+	can_be_asked_input = TRUE
+	demands_object_input = TRUE
+	can_input_object_when_closed = TRUE
+
+	var/obj/item/reagent_containers/glass/beaker/current_beaker
+
+
+/obj/item/integrated_circuit/input/beaker_connector/attackby(var/obj/item/reagent_containers/I, var/mob/living/user)
+	//Check if it truly is a reagent container
+	if(!istype(I,/obj/item/reagent_containers/glass/beaker))
+		to_chat(user,"<span class='warning'>The [I.name] doesn't seem to fit in here.</span>")
+		return
+
+	//Check if there is no other beaker already inside
+	if(current_beaker)
+		to_chat(user,"<span class='notice'>There is already a reagent container inside.</span>")
+		return
+
+	//The current beaker is the one we just attached, its location is inside the circuit
+	current_beaker = I
+	user.transferItemToLoc(I,src)
+
+	to_chat(user,"<span class='warning'>You put the [I.name] inside the beaker connector.</span>")
+
+	//Set the pin to a weak reference of the current beaker
+	push_vol()
+	set_pin_data(IC_OUTPUT, 2, WEAKREF(current_beaker))
+	push_data()
+	activate_pin(1)
+	activate_pin(3)
+
+
+/obj/item/integrated_circuit/input/beaker_connector/ask_for_input(mob/user)
+	attack_self(user)
+
+
+/obj/item/integrated_circuit/input/beaker_connector/attack_self(mob/user)
+	//Check if no beaker attached
+	if(!current_beaker)
+		to_chat(user, "<span class='notice'>There is currently no beaker attached.</span>")
+		return
+
+	//Remove beaker and put in user's hands/location
+	to_chat(user, "<span class='notice'>You take [current_beaker] out of the beaker connector.</span>")
+	user.put_in_hands(current_beaker)
+	current_beaker = null
+	//Remove beaker reference
+	push_vol()
+	set_pin_data(IC_OUTPUT, 2, null)
+	push_data()
+	activate_pin(2)
+	activate_pin(3)
+
+
+/obj/item/integrated_circuit/input/beaker_connector/proc/push_vol()
+	var/beakerVolume = 0
+	if(current_beaker)
+		beakerVolume = current_beaker.reagents.total_volume
+
+	set_pin_data(IC_OUTPUT, 1, beakerVolume)
+	push_data()
+
+
+/obj/item/reagent_containers/glass/beaker/on_reagent_change()
+	..()
+	if(istype(loc,/obj/item/integrated_circuit/input/beaker_connector))
+		var/obj/item/integrated_circuit/input/beaker_connector/current_circuit = loc
+		current_circuit.push_vol()