Merge branch 'master' into Unmodular

2019-08-05 00:04:44 -04:00
parent 2a78caa127 5431ad07b1
commit 3bad062c23
374 changed files with 7244 additions and 4260 deletions
@@ -12,7 +12,7 @@
 #define ui_boxcraft "EAST-4:22,SOUTH+1:6"
 #define ui_boxarea "EAST-4:6,SOUTH+1:6"
 #define ui_boxlang "EAST-5:22,SOUTH+1:6"
-#define ui_boxvore	"EAST-4:22,SOUTH+1:6"
+#define ui_boxvore	"EAST-5:22,SOUTH+1:6"

 //Filters
 #define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, border=0, color="#04080F")
@@ -115,22 +115,22 @@

 //xenobio console upgrade stuff
 #define XENOBIO_UPGRADE_MONKEYS				1
-#define XENOBIO_UPGRADE_SLIMEBASIC		2
+#define XENOBIO_UPGRADE_SLIMEBASIC			2
 #define XENOBIO_UPGRADE_SLIMEADV			4

 //stamina stuff
-#define STAMINA_SOFTCRIT							100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
-#define STAMINA_CRIT									140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
-#define STAMINA_SOFTCRIT_TRADITIONAL	0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
+#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
+#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
+#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
 #define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
-#define MIN_MELEE_STAMCOST						1.25 //Minimum cost for swinging items around. Will be extra useful when stats and skills are introduced.
+#define MIN_MELEE_STAMCOST					1.25 //Minimum cost for swinging items around. Will be extra useful when stats and skills are introduced.

 #define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob

 //Citadel toggles because bitflag memes
-#define MEDIHOUND_SLEEPER 1
-#define EATING_NOISES	2
-#define DIGESTION_NOISES 4
+#define MEDIHOUND_SLEEPER	(1<<0)
+#define EATING_NOISES		(1<<1)
+#define DIGESTION_NOISES	(1<<2)

 #define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES)

@@ -3,26 +3,35 @@
 #define COLOR_INPUT_DISABLED "#F0F0F0"
 #define COLOR_INPUT_ENABLED "#D3B5B5"

-//#define COLOR_WHITE            "#EEEEEE"
-//#define COLOR_SILVER           "#C0C0C0"
-//#define COLOR_GRAY             "#808080"
+#define COLOR_DARKMODE_INFO_BUTTONS_BG "#40628A"
+#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#ce4242"
+#define COLOR_DARKMODE_BACKGROUND "#202020"
+#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
+#define COLOR_DARKMODE_TEXT "#f0f0f0"
+
+#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90b3dd"
+#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#ef7f7f"
+#define COLOR_WHITEMODE_BACKGROUND "#ffffff"
+#define COLOR_WHITEMODE_DARKBACKGROUND "#eeeeee"
+#define COLOR_WHITEMODE_TEXT "#000000"
+
 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"
 #define COLOR_ALMOST_BLACK	   "#333333"
-//#define COLOR_BLACK            "#000000"
+#define COLOR_BLACK            "#000000"
 #define COLOR_RED              "#FF0000"
-//#define COLOR_RED_LIGHT        "#FF3333"
-//#define COLOR_MAROON           "#800000"
+#define COLOR_RED_LIGHT        "#FF3333"
+#define COLOR_MAROON           "#800000"
 #define COLOR_YELLOW           "#FFFF00"
-//#define COLOR_OLIVE            "#808000"
-//#define COLOR_LIME             "#32CD32"
+#define COLOR_OLIVE            "#808000"
+#define COLOR_LIME             "#32CD32"
 #define COLOR_GREEN            "#008000"
 #define COLOR_CYAN             "#00FFFF"
-//#define COLOR_TEAL             "#008080"
+#define COLOR_TEAL             "#008080"
 #define COLOR_BLUE             "#0000FF"
-//#define COLOR_BLUE_LIGHT       "#33CCFF"
-//#define COLOR_NAVY             "#000080"
+#define COLOR_BLUE_LIGHT       "#33CCFF"
+#define COLOR_NAVY             "#000080"
 #define COLOR_PINK             "#FFC0CB"
-//#define COLOR_MAGENTA          "#FF00FF"
+#define COLOR_MAGENTA          "#FF00FF"
 #define COLOR_PURPLE           "#800080"
 #define COLOR_ORANGE           "#FF9900"
 #define COLOR_BEIGE            "#CEB689"
@@ -73,6 +73,8 @@
 #define COMSIG_ATOM_CANREACH "atom_can_reach"					//from internal loop in atom/movable/proc/CanReach(): (list/next)
 	#define COMPONENT_BLOCK_REACH 1
 #define COMSIG_ATOM_SCREWDRIVER_ACT "atom_screwdriver_act"		//from base of atom/screwdriver_act(): (mob/living/user, obj/item/I)
+#define COMSIG_ATOM_INTERCEPT_TELEPORT "intercept_teleport"		//called when teleporting into a protected turf: (channel, turf/origin)
+	#define COMPONENT_BLOCK_TELEPORT 1
 /////////////////
 #define COMSIG_ATOM_ATTACK_GHOST "atom_attack_ghost"			//from base of atom/attack_ghost(): (mob/dead/observer/ghost)
 #define COMSIG_ATOM_ATTACK_HAND "atom_attack_hand"				//from base of atom/attack_hand(): (mob/user)
@@ -7,7 +7,7 @@
 //for convenience
 #define ENABLE_BITFIELD(variable, flag) (variable |= (flag))
 #define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag))
-#define CHECK_BITFIELD(variable, flag) (variable & flag)
+#define CHECK_BITFIELD(variable, flag) (variable & (flag))
 #define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))

 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
@@ -28,6 +28,7 @@
 #define ITEM_SLOT_POCKET		(1<<11) // this is to allow items with a w_class of WEIGHT_CLASS_NORMAL or WEIGHT_CLASS_BULKY to fit in pockets.
 #define ITEM_SLOT_DENYPOCKET	(1<<12) // this is to deny items with a w_class of WEIGHT_CLASS_SMALL or WEIGHT_CLASS_TINY to fit in pockets.
 #define ITEM_SLOT_NECK			(1<<13)
+#define ITEM_SLOT_SUITSTORE		(1<<14)

 //SLOTS
 #define SLOT_BACK			1
@@ -52,6 +53,7 @@
 #define SLOT_LEGCUFFED		19
 #define SLOT_GENERC_DEXTROUS_STORAGE	20

+
 #define SLOTS_AMT			20 // Keep this up to date!

 //I hate that this has to exist
@@ -84,6 +86,8 @@
 			. = ITEM_SLOT_ICLOTHING
 		if(SLOT_L_STORE, SLOT_R_STORE)
 			. = ITEM_SLOT_POCKET
+		if(SLOT_S_STORE)
+			. = ITEM_SLOT_SUITSTORE


 //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.
@@ -0,0 +1,10 @@
+//Martial arts defines
+
+#define MARTIALART_BOXING "boxing"
+#define MARTIALART_WRESTLING "wrestling"
+#define MARTIALART_SLEEPINGCARP "sleeping carp"
+#define MARTIALART_PSYCHOBRAWL "psychotic brawling"
+#define MARTIALART_MUSHPUNCH "mushroom punch"
+#define MARTIALART_KRAVMAGA "krav maga"
+#define MARTIALART_CQC "CQC"
+#define MARTIALART_PLASMAFIST "plasma fist"
@@ -275,10 +275,6 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi',
 								PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi'))

-//Color Defines
-#define OOC_COLOR  "#002eb8"
-#define AOOC_COLOR "#b8002e"
-
 /////////////////////////////////////
 // atom.appearence_flags shortcuts //
 /////////////////////////////////////
@@ -459,6 +455,13 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define SUMMON_GUNS "guns"
 #define SUMMON_MAGIC "magic"

+#define TELEPORT_CHANNEL_BLUESPACE "bluespace"	//Classic bluespace teleportation, requires a sender but no receiver
+#define TELEPORT_CHANNEL_QUANTUM "quantum"		//Quantum-based teleportation, requires both sender and receiver, but is free from normal disruption
+#define TELEPORT_CHANNEL_WORMHOLE "wormhole"	//Wormhole teleportation, is not disrupted by bluespace fluctuations but tends to be very random or unsafe
+#define TELEPORT_CHANNEL_MAGIC "magic"			//Magic teleportation, does whatever it wants (unless there's antimagic)
+#define TELEPORT_CHANNEL_CULT "cult"			//Cult teleportation, does whatever it wants (unless there's holiness)
+#define TELEPORT_CHANNEL_FREE "free"			//Anything else
+
 //Run the world with this parameter to enable a single run though of the game setup and tear down process with unit tests in between
 #define TEST_RUN_PARAMETER "test-run"
 //Force the log directory to be something specific in the data/logs folder
@@ -26,6 +26,7 @@
 #define ABSTRACT				(1<<8) 	// for all things that are technically items but used for various different stuff
 #define IMMUTABLE_SLOW          (1<<9) //When players should not be able to change the slowdown of the item (Speed potions, ect)
 #define SURGICAL_TOOL			(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
+#define NO_UNIFORM_REQUIRED		(1<<11) // Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.

 // Flags for the clothing_flags var on /obj/item/clothing

@@ -36,4 +37,4 @@
 #define NOSLIP                  (1<<4)   //prevents from slipping on wet floors, in space etc
 #define THICKMATERIAL				(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
 #define VOICEBOX_TOGGLABLE (1<<6) // The voicebox in this clothing can be toggled.
-#define VOICEBOX_DISABLED (1<<7) // The voicebox is currently turned off.
+#define VOICEBOX_DISABLED (1<<7) // The voicebox is currently turned off.
@@ -281,6 +281,17 @@
 		var/statspage = CONFIG_GET(string/roundstatsurl)
 		var/info = statspage ? "<a href='?action=openLink&link=[url_encode(statspage)][GLOB.round_id]'>[GLOB.round_id]</a>" : GLOB.round_id
 		parts += "[GLOB.TAB]Round ID: <b>[info]</b>"
+
+	var/list/voting_results = SSvote.stored_gamemode_votes
+
+	if(length(voting_results))
+		parts += "[GLOB.TAB]Voting: "
+		var/total_score = 0
+		for(var/choice in voting_results)
+			var/score = voting_results[choice]
+			total_score += score
+			parts += "[GLOB.TAB][GLOB.TAB][choice]: [score]"
+
 	parts += "[GLOB.TAB]Shift Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B>"
 	parts += "[GLOB.TAB]Station Integrity: <B>[mode.station_was_nuked ? "<span class='redtext'>Destroyed</span>" : "[popcount["station_integrity"]]%"]</B>"
 	var/total_players = GLOB.joined_player_list.len
@@ -100,6 +100,11 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
 #define DDUFFELBAG "Department Duffel Bag"
 GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL))

+//Suit/Skirt
+#define PREF_SUIT "Jumpsuit"
+#define PREF_SKIRT "Jumpskirt"
+GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT))
+
 //Uplink spawn loc
 #define UPLINK_PDA		"PDA"
 #define UPLINK_RADIO	"Radio"
@@ -73,7 +73,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/paper/crumpled = 1,
 	/obj/item/pen = 1,
 	/obj/item/reagent_containers/spray/pestspray = 1,
-	/obj/item/reagent_containers/glass/rag = 3,
+	/obj/item/reagent_containers/rag = 3,
 	/obj/item/stock_parts/cell = 3,
 	/obj/item/storage/belt/utility = 2,
 	/obj/item/storage/box = 2,
@@ -79,6 +79,7 @@
 #define ui_drop_throw "EAST-1:28,SOUTH+1:7"
 #define ui_pull_resist "EAST-2:26,SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
+#define ui_sprintbufferloc "EAST-2:26,SOUTH:18"
 #define ui_acti "EAST-3:24,SOUTH:5"
 #define ui_zonesel "EAST-1:28,SOUTH:5"
 #define ui_acti_alt "EAST-1:28,SOUTH:5"	//alternative intent switcher for when the interface is hidden (F12)
@@ -134,6 +134,13 @@
 	static_inventory += using
 	//END OF CITADEL CHANGES

+	//same as above but buffer.
+	using = new /obj/screen/sprint_buffer
+	using.screen_loc = ui_sprintbufferloc
+	sprint_buffer = using
+	static_inventory += using
+
+
 	using = new /obj/screen/drop()
 	using.icon = ui_style
 	using.screen_loc = ui_drop_throw
@@ -437,7 +437,7 @@ SUBSYSTEM_DEF(job)
 		if(job.custom_spawn_text)
 			to_chat(M, "<b>[job.custom_spawn_text]</b>")
 		if(CONFIG_GET(number/minimal_access_threshold))
-			to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
+			to_chat(M, "<span class='notice'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></span>")

 	if(job && H)
 		if(job.dresscodecompliant)// CIT CHANGE - dress code compliance
@@ -229,7 +229,7 @@ SUBSYSTEM_DEF(ticker)
 			if(GLOB.secret_force_mode != "secret")
 				var/datum/game_mode/smode = config.pick_mode(GLOB.secret_force_mode)
 				if(!smode.can_start())
-					message_admins("\blue Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.")
+					message_admins("<span class='notice'>Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.</span>")
 				else
 					mode = smode

@@ -302,14 +302,14 @@ SUBSYSTEM_DEF(ticker)
 	round_start_time = world.time
 	SSdbcore.SetRoundStart()

-	to_chat(world, "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>")
+	to_chat(world, "<span class='notice'><B>Welcome to [station_name()], enjoy your stay!</B></span>")
 	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))

 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)

 	if(SSevents.holidays)
-		to_chat(world, "<font color='blue'>and...</font>")
+		to_chat(world, "<span class='notice'>and...</span>")
 		for(var/holidayname in SSevents.holidays)
 			var/datum/holiday/holiday = SSevents.holidays[holidayname]
 			to_chat(world, "<h4>[holiday.greet()]</h4>")
@@ -425,7 +425,7 @@ SUBSYSTEM_DEF(ticker)
 			m = pick(memetips)

 	if(m)
-		to_chat(world, "<font color='purple'><b>Tip of the round: </b>[html_encode(m)]</font>")
+		to_chat(world, "<span class='purple'><b>Tip of the round: </b>[html_encode(m)]</span>")

 /datum/controller/subsystem/ticker/proc/check_queue()
 	var/hpc = CONFIG_GET(number/hard_popcap)
@@ -18,6 +18,8 @@ SUBSYSTEM_DEF(vote)

 	var/obfuscated = FALSE//CIT CHANGE - adds obfuscated/admin-only votes

+	var/list/stored_gamemode_votes = list() //Basically the last voted gamemode is stored here for end-of-round use.
+
 /datum/controller/subsystem/vote/fire()	//called by master_controller
 	if(mode)
 		time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10)
@@ -90,10 +92,12 @@ SUBSYSTEM_DEF(vote)
 			text += "<b>[question]</b>"
 		else
 			text += "<b>[capitalize(mode)] Vote</b>"
+		stored_gamemode_votes = list()
 		for(var/i=1,i<=choices.len,i++)
 			var/votes = choices[choices[i]]
 			if(!votes)
 				votes = 0
+			stored_gamemode_votes[choices[i]] = votes
 			text += "\n<b>[choices[i]]:</b> [obfuscated ? "???" : votes]" //CIT CHANGE - adds obfuscated votes
 		if(mode != "custom")
 			if(winners.len > 1 && !obfuscated) //CIT CHANGE - adds obfuscated votes
@@ -46,9 +46,9 @@
 	RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, .proc/add_program)
 	RegisterSignal(parent, COMSIG_NANITE_SCAN, .proc/nanite_scan)
 	RegisterSignal(parent, COMSIG_NANITE_SYNC, .proc/sync)
+	RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)

 	if(isliving(parent))
-		RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)
 		RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/on_death)
 		RegisterSignal(parent, COMSIG_MOB_ALLOWED, .proc/check_access)
 		RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_shock)
@@ -169,23 +169,19 @@
 	holder.icon_state = "nanites[nanite_percent]"

 /datum/component/nanites/proc/on_emp(datum/source, severity)
-	nanite_volume *= (rand(0.60, 0.90))		//Lose 10-40% of nanites
-	adjust_nanites(null, -(rand(5, 50)))		//Lose 5-50 flat nanite volume
-	if(prob(40/severity))
-		cloud_id = 0
+	adjust_nanites(null, -(nanite_volume * 0.3 + 50))		//Lose 30% variable and 50 flat nanite volume.
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_emp(severity)

 /datum/component/nanites/proc/on_shock(datum/source, shock_damage)
-	nanite_volume *= (rand(0.45, 0.80))		//Lose 20-55% of nanites
-	adjust_nanites(null, -(rand(5, 50)))			//Lose 5-50 flat nanite volume
+	adjust_nanites(null, -(nanite_volume * (shock_damage * 0.005) + shock_damage)) //0.5% of shock damage (@ 50 damage it'd drain 25%) + shock damage flat volume
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_shock(shock_damage)

 /datum/component/nanites/proc/on_minor_shock(datum/source)
-	adjust_nanites(null, -(rand(5, 15)))			//Lose 5-15 flat nanite volume
+	adjust_nanites(null, -25)
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_minor_shock()
@@ -27,7 +27,7 @@
 		C.stuttering = 20
 		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
 			C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
-		to_chat(C, "<font color='red' size='4'><B>DOOT</B></span>")
+		to_chat(C, "<font color='red' size='4'><B>DOOT</B></font>")
 		spectral_change(H)

 	else //the sound will spook monkeys.
@@ -1351,8 +1351,8 @@

 			if(amount != 0)
 				log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
-				var/msg = "<span class='notice'>[key_name(usr)] dealt [amount] amount of [Text] damage to [L] </span>"
-				message_admins(msg)
+				var/msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [L] </span>"
+				message_admins("<span class='notice'>[msg]</span>")
 				admin_ticket_log(L, msg)
 				vv_update_display(L, Text, "[newamt]")
 		else if(href_list["copyoutfit"])
@@ -25,7 +25,7 @@
 	if(!..())
 		return
 	var/mob/living/carbon/M = A.affected_mob
-	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, 0.5 * power)
+	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, src, power)
 	if(reverse_boost && SEND_SIGNAL(M, COMSIG_HAS_NANITES))
 		if(prob(A.stage_prob))
 			A.stage = min(A.stage + 1,A.max_stages)
@@ -60,4 +60,4 @@
 	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, -0.4 * power)
 	if(reverse_boost && SEND_SIGNAL(M, COMSIG_HAS_NANITES))
 		if(prob(A.stage_prob))
-			A.stage = min(A.stage + 1,A.max_stages)
+			A.stage = min(A.stage + 1,A.max_stages)
@@ -5,11 +5,19 @@
 // effectout: effect to show right after teleportation
 // asoundin: soundfile to play before teleportation
 // asoundout: soundfile to play after teleportation
-// force_teleport: if false, teleport will use Move() proc (dense objects will prevent teleportation)
 // no_effects: disable the default effectin/effectout of sparks
-/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, force_teleport=TRUE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE)
+// forceMove: if false, teleport will use Move() proc (dense objects will prevent teleportation)
+// forced: whether or not to ignore no_teleport
+/proc/do_teleport(atom/movable/teleatom, atom/destination, precision=null, forceMove = FALSE, datum/effect_system/effectin=null, datum/effect_system/effectout=null, asoundin=null, asoundout=null, no_effects=FALSE, channel=TELEPORT_CHANNEL_BLUESPACE, forced = FALSE)
 	// teleporting most effects just deletes them
-	if(iseffect(teleatom) && !istype(teleatom, /obj/effect/dummy/chameleon))
+	var/static/list/delete_atoms = typecacheof(list(
+		/obj/effect,
+		)) - typecacheof(list(
+		/obj/effect/dummy/chameleon,
+		/obj/effect/wisp,
+		/obj/effect/mob_spawn
+		))
+	if(delete_atoms[teleatom.type])
 		qdel(teleatom)
 		return FALSE

@@ -17,25 +25,37 @@
 	// if the precision is not specified, default to 0, but apply BoH penalties
 	if (isnull(precision))
 		precision = 0
-		if(istype(teleatom, /obj/item/storage/backpack/holding))
-			precision = rand(1,100)

-		var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
-		var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
-		if(bagholding.len)
-			precision = max(rand(1,100)*bagholding.len,100)
-			if(isliving(teleatom))
-				var/mob/living/MM = teleatom
-				to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
+	switch(channel)
+		if(TELEPORT_CHANNEL_BLUESPACE)
+			if(istype(teleatom, /obj/item/storage/backpack/holding))
+				precision = rand(1,100)

-	// if effects are not specified and not explicitly disabled, sparks
-	if ((!effectin || !effectout) && !no_effects)
-		var/datum/effect_system/spark_spread/sparks = new
-		sparks.set_up(5, 1, teleatom)
-		if (!effectin)
-			effectin = sparks
-		if (!effectout)
-			effectout = sparks
+			var/static/list/bag_cache = typecacheof(/obj/item/storage/backpack/holding)
+			var/list/bagholding = typecache_filter_list(teleatom.GetAllContents(), bag_cache)
+			if(bagholding.len)
+				precision = max(rand(1,100)*bagholding.len,100)
+				if(isliving(teleatom))
+					var/mob/living/MM = teleatom
+					to_chat(MM, "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>")
+
+			// if effects are not specified and not explicitly disabled, sparks
+			if ((!effectin || !effectout) && !no_effects)
+				var/datum/effect_system/spark_spread/sparks = new
+				sparks.set_up(5, 1, teleatom)
+				if (!effectin)
+					effectin = sparks
+				if (!effectout)
+					effectout = sparks
+		if(TELEPORT_CHANNEL_QUANTUM)
+			// if effects are not specified and not explicitly disabled, rainbow sparks
+			if ((!effectin || !effectout) && !no_effects)
+				var/datum/effect_system/spark_spread/quantum/sparks = new
+				sparks.set_up(5, 1, teleatom)
+				if (!effectin)
+					effectin = sparks
+				if (!effectout)
+					effectout = sparks

 	// perform the teleport
 	var/turf/curturf = get_turf(teleatom)
@@ -45,11 +65,15 @@
 		return FALSE

 	var/area/A = get_area(curturf)
-	if(A.noteleport)
+	var/area/B = get_area(destturf)
+	if(!forced && (A.noteleport || B.noteleport))
+		return FALSE
+
+	if(SEND_SIGNAL(destturf, COMSIG_ATOM_INTERCEPT_TELEPORT, channel, curturf, destturf))
 		return FALSE

 	tele_play_specials(teleatom, curturf, effectin, asoundin)
-	var/success = force_teleport ? teleatom.forceMove(destturf) : teleatom.Move(destturf)
+	var/success = forceMove ? teleatom.forceMove(destturf) : teleatom.Move(destturf)
 	if (success)
 		log_game("[key_name(teleatom)] has teleported from [loc_name(curturf)] to [loc_name(destturf)]")
 		tele_play_specials(teleatom, destturf, effectout, asoundout)
@@ -2,6 +2,7 @@
 	var/name = "Martial Art"
 	var/streak = ""
 	var/max_streak_length = 6
+	var/id = "" //ID, used by mind/has_martialartcode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proccode\game\objects\items\granters.dm:345:error: user.mind.has_martialart: undefined proc
 	var/current_target
 	var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
 	var/deflection_chance = 0 //Chance to deflect projectiles
@@ -1,5 +1,6 @@
 /datum/martial_art/boxing
 	name = "Boxing"
+	id = MARTIALART_BOXING

 /datum/martial_art/boxing/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	to_chat(A, "<span class='warning'>Can't disarm while boxing!</span>")
@@ -6,6 +6,7 @@

 /datum/martial_art/cqc
 	name = "CQC"
+	id = MARTIALART_CQC
 	help_verb = /mob/living/carbon/human/proc/CQC_help
 	block_chance = 75
 	var/just_a_cook = FALSE
@@ -1,5 +1,6 @@
 /datum/martial_art/krav_maga
 	name = "Krav Maga"
+	id = MARTIALART_KRAVMAGA
 	var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop()
 	var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep()
 	var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch()
@@ -85,14 +86,14 @@
 			return 1
 	return 0

-/datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
+/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(D.lying || D.IsKnockdown())
 		return 0
 	D.visible_message("<span class='warning'>[A] leg sweeps [D]!</span>", \
 					  	"<span class='userdanger'>[A] leg sweeps you!</span>")
 	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 	D.apply_damage(5, BRUTE)
-	D.Knockdown(40, override_hardstun = 0.01, 25)
+	D.Knockdown(40, override_hardstun = 0.01, override_stamdmg = 25)
 	log_combat(A, D, "leg sweeped")
 	return 1

@@ -196,7 +197,7 @@
 	name = "combat gloves plus"
 	desc = "These tactical gloves are fireproof and shock resistant, and using nanochip technology it teaches you the powers of krav maga."
 	icon_state = "combat"
-	item_state = "blackglovesplus"
+	item_state = "blackgloves"
 	siemens_coefficient = 0
 	permeability_coefficient = 0.05
 	strip_delay = 80
@@ -1,5 +1,6 @@
 /datum/martial_art/mushpunch
 	name = "Mushroom Punch"
+	id = MARTIALART_MUSHPUNCH

 /datum/martial_art/mushpunch/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	var/atk_verb
@@ -4,6 +4,7 @@

 /datum/martial_art/plasma_fist
 	name = "Plasma Fist"
+	id = MARTIALART_PLASMAFIST
 	help_verb = /mob/living/carbon/human/proc/plasma_fist_help


@@ -1,5 +1,6 @@
 /datum/martial_art/psychotic_brawling
 	name = "Psychotic Brawling"
+	id = MARTIALART_PSYCHOBRAWL

 /datum/martial_art/psychotic_brawling/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	return psycho_attack(A,D)
@@ -6,6 +6,7 @@

 /datum/martial_art/the_sleeping_carp
 	name = "The Sleeping Carp"
+	id = MARTIALART_SLEEPINGCARP
 	deflection_chance = 100
 	reroute_deflection = TRUE
 	no_guns = TRUE
@@ -10,6 +10,7 @@

 /datum/martial_art/wrestling
 	name = "Wrestling"
+	id = MARTIALART_WRESTLING
 	var/datum/action/slam/slam = new/datum/action/slam()
 	var/datum/action/throw_wrassle/throw_wrassle = new/datum/action/throw_wrassle()
 	var/datum/action/kick/kick = new/datum/action/kick()
@@ -64,6 +64,8 @@

 	var/force_escaped = FALSE  // Set by Into The Sunset command of the shuttle manipulator

+	var/list/learned_recipes //List of learned recipe TYPES.
+
 /datum/mind/New(var/key)
 	src.key = key
 	soulOwner = src
@@ -130,7 +132,8 @@
 			L.update_arousal_hud() //Removes the old icon

 /datum/mind/proc/store_memory(new_text)
-	memory += "[new_text]<BR>"
+	if((length(memory) + length(new_text)) <= MAX_MESSAGE_LEN)
+		memory += "[new_text]<BR>"

 /datum/mind/proc/wipe_memory()
 	memory = null
@@ -778,6 +781,11 @@
 	mind_initialize()	//updates the mind (or creates and initializes one if one doesn't exist)
 	mind.active = 1		//indicates that the mind is currently synced with a client

+/datum/mind/proc/has_martialart(var/string)
+	if(martial_art && martial_art.id == string)
+		return martial_art
+	return FALSE
+
 /mob/dead/new_player/sync_mind()
 	return

@@ -30,6 +30,7 @@
 			addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60)
 		if(WIRE_SHOCK)
 			A.shocked = !A.shocked
+			A.shock(usr, 50)
 			addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60)
 		if(WIRE_DISABLE)
 			A.disabled = !A.disabled
@@ -40,9 +41,11 @@
 	switch(wire)
 		if(WIRE_HACK)
 			A.adjust_hacked(!mend)
-		if(WIRE_HACK)
+		if(WIRE_SHOCK)
 			A.shocked = !mend
+			A.shock(usr, 50)
 		if(WIRE_DISABLE)
 			A.disabled = !mend
 		if(WIRE_ZAP)
-			A.shock(usr, 50)
+			A.shock(usr, 50)
+
@@ -6,6 +6,7 @@
 	name = "traitor+brothers"
 	config_tag = "traitorbro"
 	restricted_jobs = list("AI", "Cyborg")
+	protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Quartermaster", "Chief Engineer", "Research Director")

 	announce_span = "danger"
 	announce_text = "There are Syndicate agents and Blood Brothers on the station!\n\
@@ -53,7 +53,7 @@
 	name = "the chief engineer's advanced magnetic boots."
 	targetitem =  /obj/item/clothing/shoes/magboots/advance
 	difficulty = 5
-	excludefromjob = list("Chief Engineer")
+	excludefromjob = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")

 /datum/objective_item/steal/capmedal
 	name = "the medal of captaincy."
@@ -62,10 +62,10 @@
 	excludefromjob = list("Captain")

 /datum/objective_item/steal/hypo
-	name = "the hypospray."
+	name = "the Chief Medical Officer's MKII hypospray."
 	targetitem = /obj/item/hypospray/mkii/CMO //CITADEL EDIT, changing theft objective for the Hypo MK II
 	difficulty = 5
-	excludefromjob = list("Chief Medical Officer")
+	excludefromjob = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Geneticist")

 /datum/objective_item/steal/nukedisc
 	name = "the nuclear authentication disk."
@@ -83,10 +83,10 @@
 	excludefromjob = list("Head of Security", "Warden")

 /datum/objective_item/steal/reactive
-	name = "the reactive teleport armor."
+	name = "a reactive teleport armor."
 	targetitem = /obj/item/clothing/suit/armor/reactive
 	difficulty = 5
-	excludefromjob = list("Research Director")
+	excludefromjob = list("Research Director","Scientist", "Roboticist")

 /datum/objective_item/steal/documents
 	name = "any set of secret documents of any organization."
@@ -143,7 +143,7 @@
 	name = "the station blueprints."
 	targetitem = /obj/item/areaeditor/blueprints
 	difficulty = 10
-	excludefromjob = list("Chief Engineer")
+	excludefromjob = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
 	altitems = list(/obj/item/photo)

 /datum/objective_item/steal/blueprints/check_special_completion(obj/item/I)
@@ -159,7 +159,7 @@
 	name = "an unused sample of slime extract."
 	targetitem = /obj/item/slime_extract
 	difficulty = 3
-	excludefromjob = list("Research Director","Scientist")
+	excludefromjob = list("Research Director","Scientist", "Roboticist")

 /datum/objective_item/steal/slime/check_special_completion(obj/item/slime_extract/E)
 	if(E.Uses > 0)
@@ -163,15 +163,8 @@

 	H.hardset_dna(ui, se, H.real_name, null, mrace, features)

-	if(efficiency > 2)
-		var/list/unclean_mutations = (GLOB.not_good_mutations|GLOB.bad_mutations)
-		H.dna.remove_mutation_group(unclean_mutations)
-	if(efficiency > 5 && prob(20))
-		H.randmutvg()
-	if(efficiency < 3 && prob(50))
-		var/mob/M = H.randmutb()
-		if(ismob(M))
-			H = M
+	if(prob(50 - efficiency*10)) //Chance to give a bad mutation.
+		H.randmutb() //100% bad mutation. Can be cured with mutadone.

 	H.silent = 20 //Prevents an extreme edge case where clones could speak if they said something at exactly the right moment.
 	occupant = H
@@ -250,11 +250,11 @@
 						itemname = "a syndicate bomb beacon"
 						new /obj/item/sbeacondrop/bomb(loc)
 					if(2)
-						itemname = "a grenade launcher"
-						new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
-						new /obj/item/ammo_casing/a40mm(loc)
+						itemname = "a rocket launcher"
+						new /obj/item/gun/ballistic/rocketlauncher/unrestricted(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
+						new /obj/item/ammo_casing/caseless/rocket(loc)
 					if(3)
 						itemname = "two bags of c4"
 						new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)
@@ -361,14 +361,16 @@
 		return
 	button_icon_state = "warp_down"
 	owner.update_action_buttons()
+	QDEL_NULL(warping)
+	if(!do_teleport(user, T, channel = TELEPORT_CHANNEL_CULT, forced = TRUE))
+		to_chat(user, "<span class='bold sevtug_small'>Warp Failed. Something deflected our attempt to warp to [AR].</span>")
+		return
 	T.visible_message("<span class='warning'>[user] warps in!</span>")
 	playsound(user, 'sound/magic/magic_missile.ogg', 50, TRUE)
 	playsound(T, 'sound/magic/magic_missile.ogg', 50, TRUE)
-	user.forceMove(get_turf(T))
 	user.setDir(SOUTH)
 	flash_color(user, flash_color = "#AF0AAF", flash_time = 5)
 	R.remove_eye_control(user)
-	QDEL_NULL(warping)

 /datum/action/innate/servant_warp/proc/is_canceled()
 	return !cancel
@@ -13,17 +13,20 @@
 	var/scantemp_ckey
 	var/scantemp = "Ready to Scan"
 	var/menu = 1 //Which menu screen to display
-	var/list/records = list()
 	var/datum/data/record/active_record = null
 	var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything.
 	var/loading = 0 // Nice loading text
 	var/autoprocess = 0
+	var/list/records = list()

 	light_color = LIGHT_COLOR_BLUE

 /obj/machinery/computer/cloning/Initialize()
 	. = ..()
 	updatemodules(TRUE)
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	records = board.records
+

 /obj/machinery/computer/cloning/Destroy()
 	if(pods)
@@ -346,6 +349,8 @@
 					active_record = null
 					playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 					src.menu = 2
+					var/obj/item/circuitboard/computer/cloning/board = circuit
+					board.records = records
 				else
 					src.temp = "<font class='bad'>Access Denied.</font>"
 					playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
@@ -368,6 +373,8 @@
 				for(var/key in diskette.fields)
 					src.active_record.fields[key] = diskette.fields[key]
 				src.temp = "Load successful."
+				var/obj/item/circuitboard/computer/cloning/board = circuit
+				board.records = records
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)

 			if("eject")
@@ -502,5 +509,7 @@
 	R.fields["imp"] = "[REF(imp)]"

 	src.records += R
+	var/obj/item/circuitboard/computer/cloning/board = circuit
+	board.records = records
 	scantemp = "Subject successfully scanned."
 	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
@@ -30,7 +30,7 @@
 	obj_flags |= EMAGGED

 /obj/machinery/gulag_item_reclaimer/attackby(obj/item/I, mob/user)
-	if(istype(I, /obj/item/card/id/prisoner))
+	if(istype(I, /obj/item/card/id))
 		if(!inserted_id)
 			if(!user.transferItemToLoc(I, src))
 				return
@@ -83,7 +83,7 @@
 				usr.put_in_hands(inserted_id)
 				inserted_id = null
 			else
-				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id/prisoner)
+				var/obj/item/I = usr.is_holding_item_of_type(/obj/item/card/id)
 				if(I)
 					if(!usr.transferItemToLoc(I, src))
 						return
@@ -63,7 +63,7 @@
 				if(91 to INFINITY)
 					filling_overlay.icon_state = "reagent100"

-			filling_overlay.color = list("#0000", "#0000", "#0000", "#000f", mix_color_from_reagents(beaker.reagents.reagent_list))
+			filling_overlay.color = mix_color_from_reagents(beaker.reagents.reagent_list)
 			add_overlay(filling_overlay)

 /obj/machinery/iv_drip/MouseDrop(mob/living/target)
@@ -127,7 +127,7 @@
 				if(first_inner)
 					log_msg += "empty"
 				log_msg += ")"
-		do_teleport(ROI, dest, no_effects = !first)
+		do_teleport(ROI, dest, no_effects = !first, channel = TELEPORT_CHANNEL_BLUESPACE)
 		first = FALSE

 	if (first)
@@ -206,7 +206,7 @@

 /obj/item/storage/briefcase/launchpad/PopulateContents()
 	new /obj/item/pen(src)
-	new /obj/item/launchpad_remote(src, pad) 
+	new /obj/item/launchpad_remote(src, pad)

 /obj/item/storage/briefcase/launchpad/attack_self(mob/user)
 	if(!isturf(user.loc)) //no setting up in a locker
@@ -227,7 +227,7 @@
 		L.pad = src.pad
 		to_chat(user, "<span class='notice'>You link [pad] to [L].</span>")
 	else
-		return ..()	
+		return ..()

 /obj/item/launchpad_remote
 	name = "folder"
@@ -36,7 +36,7 @@
 		to_chat(user, "<span class='notice'>The panel is <i>screwed</i> in, obstructing the linking device.</span>")
 	else
 		to_chat(user, "<span class='notice'>The <i>linking</i> device is now able to be <i>scanned<i> with a multitool.</span>")
-	
+
 /obj/machinery/quantumpad/RefreshParts()
 	var/E = 0
 	for(var/obj/item/stock_parts/capacitor/C in component_parts)
@@ -74,15 +74,26 @@
 			to_chat(user, "<span class='warning'>There is no quantum pad data saved in [I]'s buffer!</span>")
 			return TRUE

+	else if(istype(I, /obj/item/quantum_keycard))
+		var/obj/item/quantum_keycard/K = I
+		if(K.qpad)
+			to_chat(user, "<span class='notice'>You insert [K] into [src]'s card slot, activating it.</span>")
+			interact(user, K.qpad)
+		else
+			to_chat(user, "<span class='notice'>You insert [K] into [src]'s card slot, initiating the link procedure.</span>")
+			if(do_after(user, 40, target = src))
+				to_chat(user, "<span class='notice'>You complete the link between [K] and [src].</span>")
+				K.qpad = src
+
 	if(default_deconstruction_crowbar(I))
 		return

 	return ..()

-/obj/machinery/quantumpad/interact(mob/user)
-	if(!linked_pad || QDELETED(linked_pad))
+/obj/machinery/quantumpad/interact(mob/user, obj/machinery/quantumpad/target_pad = linked_pad)
+	if(!target_pad || QDELETED(target_pad))
 		if(!map_pad_link_id || !initMappedLink())
-			to_chat(user, "<span class='warning'>There is no linked pad!</span>")
+			to_chat(user, "<span class='warning'>Target pad not found!</span>")
 			return

 	if(world.time < last_teleport + teleport_cooldown)
@@ -93,18 +104,18 @@
 		to_chat(user, "<span class='warning'>[src] is charging up. Please wait.</span>")
 		return

-	if(linked_pad.teleporting)
-		to_chat(user, "<span class='warning'>Linked pad is busy. Please wait.</span>")
+	if(target_pad.teleporting)
+		to_chat(user, "<span class='warning'>Target pad is busy. Please wait.</span>")
 		return

-	if(linked_pad.stat & NOPOWER)
-		to_chat(user, "<span class='warning'>Linked pad is not responding to ping.</span>")
+	if(target_pad.stat & NOPOWER)
+		to_chat(user, "<span class='warning'>Target pad is not responding to ping.</span>")
 		return
 	add_fingerprint(user)
-	doteleport(user)
+	doteleport(user, target_pad)

 /obj/machinery/quantumpad/proc/sparks()
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+	var/datum/effect_system/spark_spread/quantum/s = new
 	s.set_up(5, 1, get_turf(src))
 	s.start()

@@ -117,8 +128,8 @@
 	if(linked_pad)
 		ghost.forceMove(get_turf(linked_pad))

-/obj/machinery/quantumpad/proc/doteleport(mob/user)
-	if(linked_pad)
+/obj/machinery/quantumpad/proc/doteleport(mob/user, obj/machinery/quantumpad/target_pad = linked_pad)
+	if(target_pad)
 		playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, 1)
 		teleporting = TRUE

@@ -130,7 +141,7 @@
 				to_chat(user, "<span class='warning'>[src] is unpowered!</span>")
 				teleporting = FALSE
 				return
-			if(!linked_pad || QDELETED(linked_pad) || linked_pad.stat & NOPOWER)
+			if(!target_pad || QDELETED(target_pad) || target_pad.stat & NOPOWER)
 				to_chat(user, "<span class='warning'>Linked pad is not responding to ping. Teleport aborted.</span>")
 				teleporting = FALSE
 				return
@@ -141,26 +152,30 @@
 			// use a lot of power
 			use_power(10000 / power_efficiency)
 			sparks()
-			linked_pad.sparks()
+			target_pad.sparks()

 			flick("qpad-beam", src)
 			playsound(get_turf(src), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
-			flick("qpad-beam", linked_pad)
-			playsound(get_turf(linked_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
+			flick("qpad-beam", target_pad)
+			playsound(get_turf(target_pad), 'sound/weapons/emitter2.ogg', 25, 1, extrarange = 3, falloff = 5)
 			for(var/atom/movable/ROI in get_turf(src))
+				if(QDELETED(ROI))
+					continue //sleeps in CHECK_TICK
+
 				// if is anchored, don't let through
 				if(ROI.anchored)
 					if(isliving(ROI))
 						var/mob/living/L = ROI
-						if(L.buckled)
-							// TP people on office chairs
-							if(L.buckled.anchored)
-								continue
+						//only TP living mobs buckled to non anchored items
+						if(!L.buckled || L.buckled.anchored)
+							continue
 						else
 							continue
+					//Don't TP camera mobs
 					else if(!isobserver(ROI))
 						continue
-				do_teleport(ROI, get_turf(linked_pad))
+				do_teleport(ROI, get_turf(target_pad),null,TRUE,null,null,null,null,TRUE, channel = TELEPORT_CHANNEL_QUANTUM)
+				CHECK_TICK

 /obj/machinery/quantumpad/proc/initMappedLink()
 	. = FALSE
@@ -66,7 +66,7 @@
 		visible_message("<span class='alert'>Cannot authenticate locked on coordinates. Please reinstate coordinate matrix.</span>")
 		return
 	if (ismovableatom(M))
-		if(do_teleport(M, com.target))
+		if(do_teleport(M, com.target, channel = TELEPORT_CHANNEL_BLUESPACE))
 			use_power(5000)
 			if(!calibrated && prob(30 - ((accurate) * 10))) //oh dear a problem
 				log_game("[M] ([key_name(M)]) was turned into a fly person")
@@ -95,6 +95,12 @@
 			var/obj/item/toy/crayon/CR = WM.color_source
 			add_atom_colour(CR.paint_color, WASHABLE_COLOUR_PRIORITY)

+/obj/item/reagents_containers/rag/towel/machine_wash(obj/machinery/washing_machine/WM)
+	if(WM.color_source)
+		if(istype(WM.color_source, /obj/item/toy/crayon))
+			var/obj/item/toy/crayon/CR = WM.color_source
+			add_atom_colour(CR.paint_color, WASHABLE_COLOUR_PRIORITY)
+
 /mob/living/simple_animal/pet/dog/corgi/machine_wash(obj/machinery/washing_machine/WM)
 	gib()

@@ -76,6 +76,9 @@
 		return 0
 	if(energy_drain && !chassis.has_charge(energy_drain))
 		return 0
+	if(chassis.equipment_disabled)
+		to_chat(chassis.occupant, "<span=warn>Error -- Equipment control unit is unresponsive.</span>")
+		return 0
 	return 1

 /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
@@ -159,15 +159,15 @@
 			t1 = "*dead*"
 		else
 			t1 = "Unknown"
-	return {"<font color="[patient.health > 50 ? "blue" : "red"]"><b>Health:</b> [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]</font><br />
-				<font color="[patient.bodytemperature > 50 ? "blue" : "red"]"><b>Core Temperature:</b> [patient.bodytemperature-T0C]&deg;C ([patient.bodytemperature*1.8-459.67]&deg;F)</font><br />
-				<font color="[patient.getBruteLoss() < 60 ? "blue" : "red"]"><b>Brute Damage:</b> [patient.getBruteLoss()]%</font><br />
-				<font color="[patient.getOxyLoss() < 60 ? "blue" : "red"]"><b>Respiratory Damage:</b> [patient.getOxyLoss()]%</font><br />
-				<font color="[patient.getToxLoss() < 60 ? "blue" : "red"]"><b>Toxin Content:</b> [patient.getToxLoss()]%</font><br />
-				<font color="[patient.getFireLoss() < 60 ? "blue" : "red"]"><b>Burn Severity:</b> [patient.getFireLoss()]%</font><br />
-				<font color="red">[patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]</font><br />
-				<font color="red">[patient.getBrainLoss() ? "Significant brain damage detected." : ""]</font><br />
-				<font color="red">[length(patient.get_traumas()) ? "Brain Traumas detected." : ""]</font><br />
+	return {"<font color="[patient.health > 50 ? "#3d5bc3" : "#c51e1e"]"><b>Health:</b> [patient.stat > 1 ? "[t1]" : "[patient.health]% ([t1])"]</font><br />
+				<font color="[patient.bodytemperature > 50 ? "#3d5bc3" : "#c51e1e"]"><b>Core Temperature:</b> [patient.bodytemperature-T0C]&deg;C ([patient.bodytemperature*1.8-459.67]&deg;F)</font><br />
+				<font color="[patient.getBruteLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Brute Damage:</b> [patient.getBruteLoss()]%</font><br />
+				<font color="[patient.getOxyLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Respiratory Damage:</b> [patient.getOxyLoss()]%</font><br />
+				<font color="[patient.getToxLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Toxin Content:</b> [patient.getToxLoss()]%</font><br />
+				<font color="[patient.getFireLoss() < 60 ? "#3d5bc3" : "#c51e1e"]"><b>Burn Severity:</b> [patient.getFireLoss()]%</font><br />
+				<span class='danger'>[patient.getCloneLoss() ? "Subject appears to have cellular damage." : ""]</span><br />
+				<span class='danger'>[patient.getBrainLoss() ? "Significant brain damage detected." : ""]</span><br />
+				<span class='danger'>[length(patient.get_traumas()) ? "Brain Traumas detected." : ""]</span><br />
 				"}

 /obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_reagents()
@@ -17,7 +17,7 @@
 		return
 	var/turf/T = get_turf(target)
 	if(T)
-		do_teleport(chassis, T, 4)
+		do_teleport(chassis, T, 4, channel = TELEPORT_CHANNEL_BLUESPACE)
 		return 1


@@ -42,6 +42,7 @@
 	var/last_message = 0
 	var/add_req_access = 1
 	var/maint_access = 0
+	var/equipment_disabled = 0 //disabled due to EMP
 	var/dna_lock //dna-locking the mech
 	var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
 	var/datum/effect_system/spark_spread/spark_system = new
@@ -143,7 +144,6 @@
 	diag_hud_set_mechhealth()
 	diag_hud_set_mechcell()
 	diag_hud_set_mechstat()
-	diag_hud_set_mechtracking()

 /obj/mecha/get_cell()
 	return cell
@@ -205,6 +205,15 @@
 	GLOB.mechas_list -= src //global mech list
 	return ..()

+/obj/mecha/proc/restore_equipment()
+	equipment_disabled = 0
+	if(istype(src, /obj/mecha/combat))
+		mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
+	if(occupant)
+		SEND_SOUND(occupant, sound('sound/items/timer.ogg', volume=50))
+		to_chat(occupant, "<span=notice>Equipment control unit has been rebooted successfuly.</span>")
+		occupant.update_mouse_pointer()
+
 /obj/mecha/CheckParts(list/parts_list)
 	..()
 	cell = locate(/obj/item/stock_parts/cell) in contents
@@ -394,8 +403,6 @@
 	diag_hud_set_mechhealth()
 	diag_hud_set_mechcell()
 	diag_hud_set_mechstat()
-	diag_hud_set_mechtracking()
-

 /obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits.
 	return
@@ -11,8 +11,8 @@
 	var/obj/mecha/M = new result(drop_location())
 	QDEL_NULL(M.cell)

-	var/atom/parent_atom = parent
-	M.CheckParts(parent_atom.contents)
+	var/obj/item/mecha_parts/chassis/parent_chassis = parent
+	M.CheckParts(parent_chassis.contents)

 	SSblackbox.record_feedback("tally", "mechas_created", 1, M.name)
 	QDEL_NULL(parent)
@@ -21,8 +21,9 @@
 			var/answer = TR.get_mecha_info()
 			if(answer)
 				dat += {"<hr>[answer]<br/>
-						  <a href='?src=[REF(src)];send_message=[REF(TR)]'>Send message</a><br/>
-						  <a href='?src=[REF(src)];get_log=[REF(TR)]'>Show exosuit log</a> | <a style='color: #f00;' href='?src=[REF(src)];shock=[REF(TR)]'>(EMP pulse)</a><br>"}
+						<a href='?src=[REF(src)];send_message=[REF(TR)]'>Send message</a><br/>
+						<a href='?src=[REF(src)];get_log=[REF(TR)]'>Show exosuit log</a><br/>
+						[TR.recharging?"Recharging EMP Pulse...<br>":"<a style='color: #f00;' href='?src=[REF(src)];shock=[REF(TR)]'>(EMP Pulse)</a><br>"]"}

 	if(screen==1)
 		dat += "<h3>Log contents</h3>"
@@ -65,6 +66,7 @@
 	icon_state = "motion2"
 	w_class = WEIGHT_CLASS_SMALL
 	var/ai_beacon = FALSE //If this beacon allows for AI control. Exists to avoid using istype() on checking.
+	var/recharging = 0

 /obj/item/mecha_parts/mecha_tracking/proc/get_mecha_info()
 	if(!in_mecha())
@@ -102,10 +104,16 @@
 	return 0

 /obj/item/mecha_parts/mecha_tracking/proc/shock()
+	if(recharging)
+		return
 	var/obj/mecha/M = in_mecha()
 	if(M)
-		M.emp_act(EMP_LIGHT)
-	qdel(src)
+		M.emp_act(EMP_HEAVY)
+		addtimer(CALLBACK(src, /obj/item/mecha_parts/mecha_tracking/proc/recharge), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+		recharging = 1
+
+/obj/item/mecha_parts/mecha_tracking/proc/recharge()
+	recharging = 0

 /obj/item/mecha_parts/mecha_tracking/proc/get_mecha_log()
 	if(!ismecha(loc))
@@ -149,7 +149,14 @@
 		use_power((cell.charge/3)/(severity*2))
 		take_damage(30 / severity, BURN, "energy", 1)
 	log_message("EMP detected", color="red")
-	check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),1)
+
+	if(istype(src, /obj/mecha/combat))
+		mouse_pointer = 'icons/mecha/mecha_mouse-disable.dmi'
+		occupant?.update_mouse_pointer()
+	if(!equipment_disabled && occupant) //prevent spamming this message with back-to-back EMPs
+		to_chat(occupant, "<span=danger>Error -- Connection to equipment control unit has been lost.</span>")
+	addtimer(CALLBACK(src, /obj/mecha/proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE)
+	equipment_disabled = 1

 /obj/mecha/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature>max_temperature)
@@ -1,8 +1,3 @@
-/obj/mecha/medical/Initialize()
-	. = ..()
-	trackers += new /obj/item/mecha_parts/mecha_tracking(src)
-
-
 /obj/mecha/medical/mechturn(direction)
 	setDir(direction)
 	playsound(src,'sound/mecha/mechmove01.ogg',40,1)
@@ -18,4 +13,4 @@
 	var/result = step_rand(src)
 	if(result)
 		playsound(src,'sound/mecha/mechstep.ogg',25,1)
-	return result
+	return result
@@ -1,6 +1,3 @@
 /obj/mecha/working
 	internal_damage_threshold = 60

-/obj/mecha/working/Initialize()
-	. = ..()
-	trackers += new /obj/item/mecha_parts/mecha_tracking(src)
@@ -190,11 +190,11 @@
 /obj/effect/anomaly/bluespace/anomalyEffect()
 	..()
 	for(var/mob/living/M in range(1,src))
-		do_teleport(M, locate(M.x, M.y, M.z), 4)
+		do_teleport(M, locate(M.x, M.y, M.z), 4, channel = TELEPORT_CHANNEL_BLUESPACE)

 /obj/effect/anomaly/bluespace/Bumped(atom/movable/AM)
 	if(isliving(AM))
-		do_teleport(AM, locate(AM.x, AM.y, AM.z), 8)
+		do_teleport(AM, locate(AM.x, AM.y, AM.z), 8, channel = TELEPORT_CHANNEL_BLUESPACE)

 /obj/effect/anomaly/bluespace/detonate()
 	var/turf/T = safepick(get_area_turfs(impact_area))
@@ -16,3 +16,12 @@
 		I.alpha = 64
 		I.appearance_flags = RESET_ALPHA
 		add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessedAware, "blessing", I)
+	RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport)
+
+/obj/effect/blessing/Destroy()
+	UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT)
+	return ..()
+
+/obj/effect/blessing/proc/block_cult_teleport(datum/source, channel, turf/origin, turf/destination)
+	if(channel == TELEPORT_CHANNEL_CULT)
+		return COMPONENT_BLOCK_TELEPORT
@@ -26,7 +26,7 @@

 /obj/effect/particle_effect/sparks/Initialize()
 	. = ..()
-	flick("sparks", src) // replay the animation
+	flick(icon_state, src) // replay the animation
 	playsound(src, "sparks", 100, TRUE)
 	var/turf/T = loc
 	if(isturf(T))
@@ -48,6 +48,8 @@
 /datum/effect_system/spark_spread
 	effect_type = /obj/effect/particle_effect/sparks

+/datum/effect_system/spark_spread/quantum
+	effect_type = /obj/effect/particle_effect/sparks/quantum

 //electricity

@@ -55,5 +57,9 @@
 	name = "lightning"
 	icon_state = "electricity"

+/obj/effect/particle_effect/sparks/quantum
+	name = "quantum sparks"
+	icon_state = "quantum_sparks"
+
 /datum/effect_system/lightning_spread
 	effect_type = /obj/effect/particle_effect/sparks/electricity
@@ -20,6 +20,7 @@
 	var/mech_sized = FALSE
 	var/obj/effect/portal/linked
 	var/hardlinked = TRUE			//Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted.
+	var/teleport_channel = TELEPORT_CHANNEL_BLUESPACE
 	var/creator
 	var/turf/hard_target			//For when a portal needs a hard target and isn't to be linked.
 	var/atmos_link = FALSE			//Link source/destination atmos.
@@ -34,6 +35,7 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "anom"
 	mech_sized = TRUE
+	teleport_channel = TELEPORT_CHANNEL_WORMHOLE

 /obj/effect/portal/Move(newloc)
 	for(var/T in newloc)
@@ -160,7 +162,7 @@
 		no_effect = TRUE
 	else
 		last_effect = world.time
-	if(do_teleport(M, real_target, innate_accuracy_penalty, no_effects = no_effect))
+	if(do_teleport(M, real_target, innate_accuracy_penalty, no_effects = no_effect, channel = teleport_channel))
 		if(istype(M, /obj/item/projectile))
 			var/obj/item/projectile/P = M
 			P.ignore_source_check = TRUE
@@ -616,7 +616,7 @@ RLD
 	name = "rapid-light-device (RLD)"
 	desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges."
 	icon = 'icons/obj/tools.dmi'
-	icon_state = "rld-5"
+	icon_state = "rld"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	matter = 500
@@ -625,6 +625,7 @@ RLD
 	var/mode = LIGHT_MODE
 	actions_types = list(/datum/action/item_action/pick_color)
 	ammo_sections = 5
+	has_ammobar = TRUE

 	var/wallcost = 10
 	var/floorcost = 15
@@ -638,6 +639,10 @@ RLD
 	var/color_choice = null


+/obj/item/construction/rld/Initialize()
+	. = ..()
+	update_icon()
+
 /obj/item/construction/rld/ui_action_click(mob/user, var/datum/action/A)
 	if(istype(A, /datum/action/item_action/pick_color))
 		color_choice = input(user,"","Choose Color",color_choice) as color
@@ -645,9 +650,10 @@ RLD
 		..()

 /obj/item/construction/rld/update_icon()
-	icon_state = "rld-[round((matter/max_matter) * 5, 1)]"
 	..()
-
+	var/ratio = CEILING((matter / max_matter) * ammo_sections, 1)
+	cut_overlays()	//To prevent infinite stacking of overlays
+	add_overlay("rld_light[ratio]")

 /obj/item/construction/rld/attack_self(mob/user)
 	..()
@@ -2,7 +2,7 @@
 	name = "rapid cable layer"
 	desc = "A device used to rapidly deploy cables. It has screws on the side which can be removed to slide off the cables. Do not use without insulation!"
 	icon = 'icons/obj/tools.dmi'
-	icon_state = "rcl-0"
+	icon_state = "rcl-empty"
 	item_state = "rcl-0"
 	var/obj/structure/cable/last
 	var/obj/item/stack/cable_coil/loaded
@@ -92,22 +92,32 @@

 /obj/item/twohanded/rcl/update_icon()
 	if(!loaded)
-		icon_state = "rcl-0"
-		item_state = "rcl-0"
+		icon_state = "rcl-empty"
+		item_state = "rcl-empty"
 		return
+	cut_overlays()
+	var/cable_amount = 0
 	switch(loaded.amount)
 		if(61 to INFINITY)
-			icon_state = "rcl-30"
-			item_state = "rcl"
+			cable_amount = 3
 		if(31 to 60)
-			icon_state = "rcl-20"
-			item_state = "rcl"
+			cable_amount = 2
 		if(1 to 30)
-			icon_state = "rcl-10"
-			item_state = "rcl"
+			cable_amount = 1
 		else
-			icon_state = "rcl-0"
-			item_state = "rcl-0"
+			cable_amount = 0
+
+	var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[cable_amount]")
+	cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
+	if(cable_amount >= 1)
+		icon_state = "rcl"
+		item_state = "rcl"
+		add_overlay(cable_overlay)
+	else
+		icon_state = "rcl-empty"
+		item_state = "rcl-0"
+		add_overlay(cable_overlay)
+

 /obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1)
 	update_icon()
@@ -302,6 +312,7 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)
 		to_chat(user, "Color changed to [cwname]!")
 		if(loaded)
 			loaded.item_color= colors[current_color_index]
+			update_icon()
 		if(wiring_gui_menu)
 			wiringGuiUpdate(user)
 	else if(istype(action, /datum/action/item_action/rcl_gui))
@@ -318,13 +329,29 @@ obj/item/twohanded/rcl/proc/getMobhook(mob/to_hook)

 /obj/item/twohanded/rcl/ghetto/update_icon()
 	if(!loaded)
-		icon_state = "rclg-0"
+		icon_state = "rclg-empty"
 		item_state = "rclg-0"
 		return
+	cut_overlays()
+	var/cable_amount = 0
 	switch(loaded.amount)
-		if(1 to INFINITY)
-			icon_state = "rclg-1"
-			item_state = "rcl"
+		if(20 to INFINITY)
+			cable_amount = 3
+		if(10 to 19)
+			cable_amount = 2
+		if(1 to 9)
+			cable_amount = 1
 		else
-			icon_state = "rclg-1"
-			item_state = "rclg-1"
+			cable_amount = 0
+
+	var/mutable_appearance/cable_overlay = mutable_appearance(icon, "rcl-[cable_amount]")
+	cable_overlay.color = GLOB.cable_colors[colors[current_color_index]]
+	if(cable_amount >= 1)
+		icon_state = "rclg"
+		item_state = "rclg"
+		add_overlay(cable_overlay)
+	else
+		icon_state = "rclg-empty"
+		item_state = "rclg-0"
+		add_overlay(cable_overlay)
+
@@ -177,6 +177,8 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 	desc = "A device used to rapidly pipe things."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "rpd"
+	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	flags_1 = CONDUCT_1
 	force = 10
 	throwforce = 10
@@ -435,6 +437,10 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 				to_chat(user, "<span class='notice'>You start building a transit tube...</span>")
 				playsound(get_turf(src), 'sound/machines/click.ogg', 50, 1)
 				if(do_after(user, transit_build_speed, target = A))
+					for(var/obj/structure/c_transit_tube/tube in A)
+						if(tube.dir == queued_p_dir || (queued_p_flipped && (tube.dir == turn(queued_p_dir, 45))))
+							to_chat(user, "<span class='warning'>[src]'s error light flickers; there's already a pipe in the way!</span>")
+							return
 					activate()
 					if(queued_p_type == /obj/structure/c_transit_tube_pod)
 						var/obj/structure/c_transit_tube_pod/pod = new /obj/structure/c_transit_tube_pod(A)
@@ -110,6 +110,7 @@
 /obj/item/circuitboard/computer/cloning
 	name = "Cloning (Computer Board)"
 	build_path = /obj/machinery/computer/cloning
+	var/list/records = list()

 /obj/item/circuitboard/computer/prototype_cloning
 	name = "Prototype Cloning (Computer Board)"
@@ -0,0 +1,32 @@
+/obj/item/quantum_keycard
+	name = "quantum keycard"
+	desc = "A keycard able to link to a quantum pad's particle signature, allowing other quantum pads to travel there instead of their linked pad."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "quantum_keycard"
+	item_state = "card-id"
+	lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi'
+	w_class = WEIGHT_CLASS_TINY
+	var/obj/machinery/quantumpad/qpad
+
+/obj/item/quantum_keycard/examine(mob/user)
+	..()
+	if(qpad)
+		to_chat(user, "It's currently linked to a quantum pad.")
+		to_chat(user, "<span class='notice'>Alt-click to unlink the keycard.</span>")
+	else
+		to_chat(user, "<span class='notice'>Insert [src] into an active quantum pad to link it.</span>")
+
+/obj/item/quantum_keycard/AltClick(mob/living/user)
+	if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+		return
+	to_chat(user, "<span class='notice'>You start pressing [src]'s unlink button...</span>")
+	if(do_after(user, 40, target = src))
+		to_chat(user, "<span class='notice'>The keycard beeps twice and disconnects the quantum link.</span>")
+		qpad = null
+
+/obj/item/quantum_keycard/update_icon()
+	if(qpad)
+		icon_state = "quantum_keycard_on"
+	else
+		icon_state = initial(icon_state)
@@ -341,9 +341,19 @@ SLIME SCANNER
 		if(M.reagents)
 			var/msg = "<span class='info'>*---------*\n"
 			if(M.reagents.reagent_list.len)
-				msg += "<span class='notice'>Subject contains the following reagents:</span>\n"
+				var/list/datum/reagent/reagents = list()
 				for(var/datum/reagent/R in M.reagents.reagent_list)
-					msg += "<span class='notice'>[R.volume] units of [R.name][R.overdosed == 1 ? "</span> - <span class='boldannounce'>OVERDOSING</span>" : ".</span>"]\n"
+					if(R.invisible)
+						continue
+					reagents += R
+
+				if(length(reagents))
+					msg += "<span class='notice'>Subject contains the following reagents:</span>\n"
+					for(var/datum/reagent/R in reagents)
+						msg += "<span class='notice'>[R.volume] units of [R.name][R.overdosed == 1 ? "</span> - <span class='boldannounce'>OVERDOSING</span>" : ".</span>"]\n"
+				else
+					msg += "<span class='notice'>Subject contains no reagents.</span>\n"
+
 			else
 				msg += "<span class='notice'>Subject contains no reagents.</span>\n"
 			if(M.reagents.addiction_list.len)
@@ -621,7 +631,7 @@ SLIME SCANNER
 	to_chat(user, "Growth progress: [T.amount_grown]/[SLIME_EVOLUTION_THRESHOLD]")
 	if(T.effectmod)
 		to_chat(user, "<span class='notice'>Core mutation in progress: [T.effectmod]</span>")
-		to_chat(user, "<span_class = 'notice'>Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]</span>")
+		to_chat(user, "<span class = 'notice'>Progress in core mutation: [T.applied] / [SLIME_EXTRACT_CROSSING_REQUIRED]</span>")
 	to_chat(user, "========================")


@@ -1,4 +1,3 @@
-
 ///books that teach things (intrinsic actions like bar flinging, spells like fireball or smoke, or martial arts)///

 /obj/item/book/granter
@@ -13,19 +12,50 @@
 /obj/item/book/granter/proc/turn_page(mob/user)
 	playsound(user, pick('sound/effects/pageturn1.ogg','sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg'), 30, 1)
 	if(do_after(user,50, user))
-		to_chat(user, "<span class='notice'>[pick(remarks)]</span>")
+		if(remarks.len)
+			to_chat(user, "<span class='notice'>[pick(remarks)]</span>")
+		else
+			to_chat(user, "<span class='notice'>You keep reading...</span>")
 		return TRUE
 	return FALSE

 /obj/item/book/granter/proc/recoil(mob/user) //nothing so some books can just return

+/obj/item/book/granter/proc/already_known(mob/user)
+	return FALSE
+
+/obj/item/book/granter/proc/on_reading_start(mob/user)
+	to_chat(user, "<span class='notice'>You start reading [name]...</span>")
+
+/obj/item/book/granter/proc/on_reading_stopped(mob/user)
+	to_chat(user, "<span class='notice'>You stop reading...</span>")
+
+/obj/item/book/granter/proc/on_reading_finished(mob/user)
+	to_chat(user, "<span class='notice'>You finish reading [name]!</span>")
+
 /obj/item/book/granter/proc/onlearned(mob/user)
 	used = TRUE

+
 /obj/item/book/granter/attack_self(mob/user)
-	if(reading == TRUE)
+	if(reading)
 		to_chat(user, "<span class='warning'>You're already reading this!</span>")
 		return FALSE
+	if(already_known(user))
+		return FALSE
+	if(used && oneuse)
+		recoil(user)
+	else
+		on_reading_start(user)
+		reading = TRUE
+		for(var/i=1, i<=pages_to_mastery, i++)
+			if(!turn_page(user))
+				on_reading_stopped()
+				reading = FALSE
+				return
+		if(do_after(user,50, user))
+			on_reading_finished(user)
+		reading = FALSE
 	return TRUE

 ///ACTION BUTTONS///
@@ -34,33 +64,23 @@
 	var/granted_action
 	var/actionname = "catching bugs" //might not seem needed but this makes it so you can safely name action buttons toggle this or that without it fucking up the granter, also caps

-/obj/item/book/granter/action/attack_self(mob/user)
-	. = ..()
-	if(!.)
-		return
+/obj/item/book/granter/action/already_known(mob/user)
 	if(!granted_action)
-		return
-	var/datum/action/G = new granted_action
+		return TRUE
 	for(var/datum/action/A in user.actions)
-		if(A.type == G.type)
+		if(A.type == granted_action)
 			to_chat(user, "<span class='notice'>You already know all about [actionname].</span>")
-			qdel(G)
-			return
-	if(used == TRUE && oneuse == TRUE)
-		recoil(user)
-	else
-		to_chat(user, "<span class='notice'>You start reading about [actionname]...</span>")
-		reading = TRUE
-		for(var/i=1, i<=pages_to_mastery, i++)
-			if(!turn_page(user))
-				to_chat(user, "<span class='notice'>You stop reading...</span>")
-				reading = FALSE
-				qdel(G)
-				return
-		if(do_after(user,50, user))
-			to_chat(user, "<span class='notice'>You feel like you've got a good handle on [actionname]!</span>")
-			G.Grant(user)
-		reading = FALSE
+			return TRUE
+	return FALSE
+
+/obj/item/book/granter/action/on_reading_start(mob/user)
+	to_chat(user, "<span class='notice'>You start reading about [actionname]...</span>")
+
+/obj/item/book/granter/action/on_reading_finished(mob/user)
+	to_chat(user, "<span class='notice'>You feel like you've got a good handle on [actionname]!</span>")
+	var/datum/action/G = new granted_action
+	G.Grant(user)
+	onlearned(user)

 /obj/item/book/granter/action/drink_fling
 	granted_action = /datum/action/innate/drink_fling
@@ -120,38 +140,28 @@
 	var/spell
 	var/spellname = "conjure bugs"

-/obj/item/book/granter/spell/attack_self(mob/user)
-	. = ..()
-	if(!.)
-		return
+/obj/item/book/granter/spell/already_known(mob/user)
 	if(!spell)
-		return
-	var/obj/effect/proc_holder/spell/S = new spell
+		return TRUE
 	for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list)
-		if(knownspell.type == S.type)
+		if(knownspell.type == spell)
 			if(user.mind)
 				if(iswizard(user))
-					to_chat(user,"<span class='notice'>You're already far more versed in this spell than this flimsy howto book can provide.</span>")
+					to_chat(user,"<span class='notice'>You're already far more versed in this spell than this flimsy how-to book can provide.</span>")
 				else
 					to_chat(user,"<span class='notice'>You've already read this one.</span>")
-			return
-	if(used == TRUE && oneuse == TRUE)
-		recoil(user)
-	else
-		to_chat(user, "<span class='notice'>You start reading about casting [spellname]...</span>")
-		reading = TRUE
-		for(var/i=1, i<=pages_to_mastery, i++)
-			if(!turn_page(user))
-				to_chat(user, "<span class='notice'>You stop reading...</span>")
-				reading = FALSE
-				qdel(S)
-				return
-		if(do_after(user,50, user))
-			to_chat(user, "<span class='notice'>You feel like you've experienced enough to cast [spellname]!</span>")
-			user.mind.AddSpell(S)
-			user.log_message("learned the spell [spellname] ([S])", LOG_ATTACK, color="orange")
-			onlearned(user)
-		reading = FALSE
+			return TRUE
+	return FALSE
+
+/obj/item/book/granter/spell/on_reading_start(mob/user)
+	to_chat(user, "<span class='notice'>You start reading about casting [spellname]...</span>")
+
+/obj/item/book/granter/spell/on_reading_finished(mob/user)
+	to_chat(user, "<span class='notice'>You feel like you've experienced enough to cast [spellname]!</span>")
+	var/obj/effect/proc_holder/spell/S = new spell
+	user.mind.AddSpell(S)
+	user.log_message("learned the spell [spellname] ([S])", LOG_ATTACK, color="orange")
+	onlearned(user)

 /obj/item/book/granter/spell/recoil(mob/user)
 	user.visible_message("<span class='warning'>[src] glows in a black light!</span>")
@@ -280,7 +290,8 @@
 	if(ishuman(user))
 		to_chat(user,"<font size='15' color='red'><b>HORSIE HAS RISEN</b></font>")
 		var/obj/item/clothing/magichead = new /obj/item/clothing/mask/horsehead/cursed(user.drop_location())
-		user.dropItemToGround(user.wear_mask, TRUE)
+		if(!user.dropItemToGround(user.wear_mask))
+			qdel(user.wear_mask)
 		user.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, TRUE, TRUE)
 		qdel(src)
 	else
@@ -327,35 +338,24 @@
 	var/martialname = "bug jitsu"
 	var/greet = "You feel like you have mastered the art in breaking code. Nice work, jackass."

-/obj/item/book/granter/martial/attack_self(mob/user)
-	. = ..()
-	if(!.)
-		return
+/obj/item/book/granter/martial/already_known(mob/user)
 	if(!martial)
-		return
+		return TRUE
+	var/datum/martial_art/MA = martial
+	if(user.mind.has_martialart(initial(MA.id)))
+		to_chat(user,"<span class='warning'>You already know [martialname]!</span>")
+		return TRUE
+	return FALSE
+
+/obj/item/book/granter/martial/on_reading_start(mob/user)
+	to_chat(user, "<span class='notice'>You start reading about [martialname]...</span>")
+
+/obj/item/book/granter/martial/on_reading_finished(mob/user)
+	to_chat(user, "[greet]")
 	var/datum/martial_art/MA = new martial
-	if(user.mind.martial_art)
-		for(var/datum/martial_art/knownmartial in user.mind.martial_art)
-			if(knownmartial.type == MA.type)
-				to_chat(user,"<span class='warning'>You already know [martialname]!</span>")
-				return
-	if(used == TRUE && oneuse == TRUE)
-		recoil(user)
-	else
-		to_chat(user, "<span class='notice'>You start reading about [martialname]...</span>")
-		reading = TRUE
-		for(var/i=1, i<=pages_to_mastery, i++)
-			if(!turn_page(user))
-				to_chat(user, "<span class='notice'>You stop reading...</span>")
-				reading = FALSE
-				qdel(MA)
-				return
-		if(do_after(user,50, user))
-			to_chat(user, "[greet]")
-			MA.teach(user)
-			user.log_message("learned the martial art [martialname] ([MA])", LOG_ATTACK, color="orange")
-			onlearned(user)
-		reading = FALSE
+	MA.teach(user)
+	user.log_message("learned the martial art [martialname] ([MA])", LOG_ATTACK, color="orange")
+	onlearned(user)

 /obj/item/book/granter/martial/cqc
 	martial = /datum/martial_art/cqc
@@ -416,3 +416,44 @@
 		icon_state = "blankscroll"

 // I did not include mushpunch's grant, it is not a book and the item does it just fine.
+
+
+//Crafting Recipe books
+
+/obj/item/book/granter/crafting_recipe
+	var/list/crafting_recipe_types = list() //Use full /datum/crafting_recipe/what_you_craft
+
+/obj/item/book/granter/crafting_recipe/on_reading_finished(mob/user)
+	. = ..()
+	if(!user.mind)
+		return
+	for(var/crafting_recipe_type in crafting_recipe_types)
+		var/datum/crafting_recipe/R = crafting_recipe_type
+		user.mind.teach_crafting_recipe(crafting_recipe_type)
+		to_chat(user,"<span class='notice'>You learned how to make [initial(R.name)].</span>")
+
+/obj/item/book/granter/crafting_recipe/cooking_sweets_101 //We start at 101 for 103 and 105
+	name = "Cooking Desserts 101"
+	desc = "A cook book that teaches you some more of the newest desserts. AI approved, and a best seller on Honkplanet."
+	crafting_recipe_types = list(/datum/crafting_recipe/food/mimetart, /datum/crafting_recipe/food/berrytart, /datum/crafting_recipe/food/cocolavatart, /datum/crafting_recipe/food/clowncake, /datum/crafting_recipe/food/vanillacake)
+	icon_state = "cooking_learing_sweets"
+	oneuse = FALSE
+	remarks = list("So that is how icing is made!", "Placing fruit on top? How simple...", "Huh layering cake seems harder then this...", "This book smells like candy", "A clown must have made this page, or they forgot to spell check it before printing...", "Wait, a way to cook slime to be safe?")
+
+//Later content when I have free time - Trilby Date:02-Aug-2019
+
+/obj/item/book/granter/crafting_recipe/under_the_oven //Illegal cook book
+	name = "Under The Oven"
+	desc = "A cook book that teaches you many illegal and fun candys. MALF AI approved, and a best seller on the blackmarket."
+	crafting_recipe_types = list()
+	icon_state = "cooking_learing_illegal"
+	oneuse = FALSE
+	remarks = list()
+
+/obj/item/book/granter/crafting_recipe/coldcooking //IceCream
+	name = "Cooking with Ice"
+	desc = "A cook book that teaches you many old icecream treats."
+	crafting_recipe_types = list()
+	icon_state = "cooking_learing_ice"
+	oneuse = FALSE
+	remarks = list()
@@ -26,6 +26,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "handcuff"
+	item_state = "handcuff"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	flags_1 = CONDUCT_1
@@ -103,7 +104,6 @@
 	desc = "A pair of restraints fashioned from long strands of flesh."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "sinewcuff"
-	item_state = "sinewcuff"
 	breakouttime = 300 //Deciseconds = 30s
 	cuffsound = 'sound/weapons/cablecuff.ogg'

@@ -172,6 +172,13 @@
 	desc = "Fake handcuffs meant for gag purposes."
 	breakouttime = 10 //Deciseconds = 1s

+/obj/item/restraints/handcuffs/fake/kinky
+	name = "kinky handcuffs"
+	desc = "Fake handcuffs meant for erotic roleplay."
+	icon = 'modular_citadel/icons/obj/items_and_weapons.dmi'
+	icon_state = "handcuffgag"
+	item_state = "kinkycuff"
+
 /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/stack/rods))
@@ -206,7 +213,8 @@
 /obj/item/restraints/handcuffs/cable/zipties
 	name = "zipties"
 	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
-	icon_state = "cuff"
+	icon_state = "zipties"
+	item_state = "zipties"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	materials = list()
@@ -217,7 +225,6 @@
 /obj/item/restraints/handcuffs/cable/zipties/used
 	desc = "A pair of broken zipties."
 	icon_state = "cuff_used"
-	item_state = "cuff"

 /obj/item/restraints/handcuffs/cable/zipties/used/attack()
 	return
@@ -230,6 +237,7 @@
 	gender = PLURAL
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "handcuff"
+	item_state = "legcuff"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	flags_1 = CONDUCT_1
@@ -174,6 +174,7 @@
 /obj/item/his_grace/proc/consume(mob/living/meal) //Here's your dinner, Mr. Grace.
 	if(!meal)
 		return
+	var/victims = 0
 	meal.visible_message("<span class='warning'>[src] swings open and devours [meal]!</span>", "<span class='his_grace big bold'>[src] consumes you!</span>")
 	meal.adjustBruteLoss(200)
 	playsound(meal, 'sound/misc/desceration-02.ogg', 75, 1)
@@ -185,7 +186,10 @@
 		bloodthirst = max(LAZYLEN(contents), 1) //Never fully sated, and His hunger will only grow.
 	else
 		bloodthirst = HIS_GRACE_CONSUME_OWNER
-	if(LAZYLEN(contents) >= victims_needed)
+	for(var/mob/living/C in contents)
+		if(C.mind)
+			victims++
+	if(victims >= victims_needed)
 		ascend()
 	update_stats()

@@ -21,7 +21,7 @@
 		return
 	if(!H.mind)
 		return
-	if(istype(H.mind.martial_art, /datum/martial_art/krav_maga))
+	if(H.mind.has_martialart(MARTIALART_KRAVMAGA))
 		style.remove(H)
 	else
 		style.teach(H,1)
@@ -9,6 +9,7 @@
 	name = "inconspicious box"
 	desc = "It's so normal that you didn't notice it before."
 	icon_state = "agentbox"
+	max_integrity = 1
 	use_mob_movespeed = TRUE

 /obj/structure/closet/cardboard/agent/proc/go_invisible()
@@ -664,6 +664,27 @@
 	item_state = "box"
 	attack_verb = list("open", "closed", "packed", "hidden", "rigged", "bombed", "sent", "gave")

+/obj/item/toy/plush/slaggy
+	name = "slag plushie"
+	desc = "A piece of slag with some googly eyes and a drawn on mouth."
+	icon_state = "slaggy"
+	item_state = "slaggy"
+	attack_verb = list("melted", "refined", "stared")
+
+/obj/item/toy/plush/mr_buckety
+	name = "bucket plushie"
+	desc = "A bucket that is missing its handle with some googly eyes and a drawn on mouth."
+	icon_state = "mr_buckety"
+	item_state = "mr_buckety"
+	attack_verb = list("filled", "dumped", "stared")
+
+/obj/item/toy/plush/dr_scanny
+	name = "scanner plushie"
+	desc = "A old outdated scanner that has been modified to have googly eyes, a dawn on mouth and, heart."
+	icon_state = "dr_scanny"
+	item_state = "dr_scanny"
+	attack_verb = list("scanned", "beeped", "stared")
+
 /obj/item/toy/plush/borgplushie
 	name = "robot plushie"
 	desc = "An adorable stuffed toy of a robot."
@@ -66,7 +66,8 @@
 		to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")
 		return

-	user.forceMove(pick(L))
-
-	smoke.start()
-	uses--
+	if(do_teleport(user, pick(L), forceMove = TRUE, channel = TELEPORT_CHANNEL_MAGIC, forced = TRUE))
+		smoke.start()
+		uses--
+	else
+		to_chat(user, "The spell matrix was disrupted by something near the destination.")
@@ -33,7 +33,7 @@
 	use(1)

 /obj/item/stack/ore/bluespace_crystal/proc/blink_mob(mob/living/L)
-	do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
+	do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg', channel = TELEPORT_CHANNEL_BLUESPACE)

 /obj/item/stack/ore/bluespace_crystal/throw_impact(atom/hit_atom)
 	if(!..()) // not caught in mid-air
@@ -18,7 +18,7 @@

 /obj/item/stack/medical/attack(mob/living/M, mob/user)

-	if(M.stat == DEAD)
+	if(M.stat == DEAD && !stop_bleeding)
 		var/t_him = "it"
 		if(M.gender == MALE)
 			t_him = "him"
@@ -248,7 +248,8 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \
 	new/datum/stack_recipe("bio bag", /obj/item/storage/bag/bio, 4), \
 	null, \
 	new/datum/stack_recipe("improvised gauze", /obj/item/stack/medical/gauze/improvised, 1, 2, 6), \
-	new/datum/stack_recipe("rag", /obj/item/reagent_containers/glass/rag, 1), \
+	new/datum/stack_recipe("rag", /obj/item/reagent_containers/rag, 1), \
+	new/datum/stack_recipe("towel", /obj/item/reagent_containers/rag/towel, 3), \
 	new/datum/stack_recipe("bedsheet", /obj/item/bedsheet, 3), \
 	new/datum/stack_recipe("empty sandbag", /obj/item/emptysandbag, 4), \
 	null, \
@@ -653,6 +653,9 @@
 	icon_state = "sheath"
 	item_state = "sheath"
 	w_class = WEIGHT_CLASS_BULKY
+	var/list/fitting_swords = list(/obj/item/melee/sabre, /obj/item/melee/baton/stunsword)
+	var/starting_sword = /obj/item/melee/sabre
+	var/sword_overlay

 /obj/item/storage/belt/sabre/ComponentInitialize()
 	. = ..()
@@ -660,35 +663,7 @@
 	STR.max_items = 1
 	STR.rustle_sound = FALSE
 	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.can_hold = typecacheof(list(
-		/obj/item/melee/sabre
-		))
-
-/obj/item/storage/belt/sabre/rapier
-	name = "rapier sheath"
-	desc = "A black, thin sheath that looks to house only a long thin blade. Feels like its made of metal."
-	icon_state = "rsheath"
-	item_state = "rsheath"
-	force = 5
-	throwforce = 15
-	block_chance = 30
-	w_class = WEIGHT_CLASS_BULKY
-	attack_verb = list("bashed", "slashes", "prods", "pokes")
-
-/obj/item/storage/belt/sabre/rapier/ComponentInitialize()
-	. = ..()
-	GET_COMPONENT(STR, /datum/component/storage)
-	STR.max_items = 1
-	STR.rustle_sound = FALSE
-	STR.max_w_class = WEIGHT_CLASS_BULKY
-	STR.can_hold = typecacheof(list(
-		/obj/item/melee/rapier
-		))
-
-/obj/item/storage/belt/sabre/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	if(attack_type == PROJECTILE_ATTACK)
-		final_block_chance = 0 //To thin to block bullets
-	return ..()
+	STR.can_hold = typecacheof(fitting_swords)

 /obj/item/storage/belt/sabre/examine(mob/user)
 	..()
@@ -709,18 +684,40 @@
 /obj/item/storage/belt/sabre/update_icon()
 	icon_state = initial(icon_state)
 	item_state = initial(item_state)
+	sword_overlay = null
 	if(contents.len)
-		icon_state += "-sabre"
-		item_state += "-sabre"
+		var/obj/item/I = contents[1]
+		sword_overlay = initial(I.icon_state)
+		add_overlay("-[sword_overlay]")
+		item_state += "-[I.icon_state]"
 	if(loc && isliving(loc))
 		var/mob/living/L = loc
 		L.regenerate_icons()
 	..()

+/obj/item/storage/belt/sabre/worn_overlays(isinhands, icon_file)
+	. = ..()
+	if(!isinhands)
+		. += mutable_appearance(icon_file, "-[sword_overlay]")
+
 /obj/item/storage/belt/sabre/PopulateContents()
-	new /obj/item/melee/sabre(src)
+	new starting_sword(src)
 	update_icon()

-/obj/item/storage/belt/sabre/rapier/PopulateContents()
-	new /obj/item/melee/rapier(src)
-	update_icon()
+/obj/item/storage/belt/sabre/rapier
+	name = "rapier sheath"
+	desc = "A black, thin sheath that looks to house only a long thin blade. Feels like its made of metal."
+	icon_state = "rsheath"
+	item_state = "rsheath"
+	force = 5
+	throwforce = 15
+	block_chance = 30
+	w_class = WEIGHT_CLASS_BULKY
+	attack_verb = list("bashed", "slashes", "prods", "pokes")
+	fitting_swords = list(/obj/item/melee/rapier)
+	starting_sword = /obj/item/melee/rapier
+
+/obj/item/storage/belt/sabre/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(attack_type == PROJECTILE_ATTACK)
+		final_block_chance = 0 //To thin to block bullets
+	return ..()
@@ -1196,3 +1196,20 @@
 	new /obj/item/reagent_containers/food/snacks/grown/chili(src)
 	new /obj/item/reagent_containers/food/drinks/coffee/type2(src)
 	new /obj/item/tank/internals/emergency_oxygen(src)
+
+//Where do I put this?
+/obj/item/secbat
+	name = "Secbat box"
+	desc = "Contained inside is a secbat for use with law enforcement."
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "box"
+	item_state = "syringe_kit"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+
+/obj/item/secbat/attack_self(mob/user)
+	new /mob/living/simple_animal/hostile/retaliate/bat/secbat(user.loc)
+	to_chat(user, "<span class='notice'>You open the box, releasing the secbat!</span>")
+	var/obj/item/stack/sheet/cardboard/I = new(user.drop_location())
+	qdel(src)
+	user.put_in_hands(I)
@@ -16,7 +16,7 @@
 	AddComponent(component_type)

 /obj/item/storage/AllowDrop()
-	return TRUE
+	return FALSE

 /obj/item/storage/contents_explosion(severity, target)
 	for(var/atom/A in contents)
@@ -10,7 +10,7 @@
 	. = ..()
 	if(!. || !istype(M) || M.anchored)
 		return
-	do_teleport(M, get_turf(M), 15)
+	do_teleport(M, get_turf(M), 15, channel = TELEPORT_CHANNEL_BLUESPACE)

 /obj/item/melee/baton/cattleprod/teleprod/clowning_around(mob/living/user)
 	user.visible_message("<span class='danger'>[user] accidentally hits [user.p_them()]self with [src]!</span>", \
@@ -18,7 +18,7 @@
 	SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK)
 	user.Knockdown(stunforce*3)
 	playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
-	if(do_teleport(user, get_turf(user), 50))
+	if(do_teleport(user, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE))
 		deductcharge(hitcost)
 	else
 		deductcharge(hitcost * 0.25)
@@ -99,7 +99,7 @@ GLOBAL_LIST_INIT(globalBlankCanvases, new(AMT_OF_CANVASES))
 		return

 	//Cleaning one pixel with a soap or rag
-	if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/glass/rag))
+	if(istype(I, /obj/item/soap) || istype(I, /obj/item/reagent_containers/rag))
 		//Pixel info created only when needed
 		var/icon/masterpiece = icon(icon,icon_state)
 		var/thePix = masterpiece.GetPixel(pixX,pixY)
@@ -34,7 +34,8 @@
 	var/delivery_icon = "deliverycloset" //which icon to use when packagewrapped. null to be unwrappable.
 	var/anchorable = TRUE
 	var/icon_welded = "welded"
-
+	var/obj/item/electronics/airlock/lockerelectronics //Installed electronics
+	var/lock_in_use = FALSE //Someone is doing some stuff with the lock here, better not proceed further

 /obj/structure/closet/Initialize(mapload)
 	. = ..()
@@ -42,47 +43,56 @@
 	PopulateContents()
 	if(mapload && !opened)		// if closed, any item at the crate's loc is put in the contents
 		take_contents()
+	if(secure)
+		lockerelectronics = new(src)
+		lockerelectronics.accesses = req_access

 //USE THIS TO FILL IT, NOT INITIALIZE OR NEW
 /obj/structure/closet/proc/PopulateContents()
 	return

 /obj/structure/closet/Destroy()
-	dump_contents()
+	dump_contents(override = FALSE)
 	return ..()

 /obj/structure/closet/update_icon()
 	cut_overlays()
-	if(!opened)
+	if(opened & icon_door_override)
+		add_overlay("[icon_door]_open")
 		layer = OBJ_LAYER
-		if(icon_door)
-			add_overlay("[icon_door]_door")
-		else
-			add_overlay("[icon_state]_door")
-		if(welded)
-			add_overlay(icon_welded)
-		if(secure && !broken)
-			if(locked)
-				add_overlay("locked")
-			else
-				add_overlay("unlocked")
-
+		return
+	else if(opened)
+		add_overlay("[icon_state]_open")
+		return
+	if(icon_door)
+		add_overlay("[icon_door]_door")
 	else
 		layer = BELOW_OBJ_LAYER
-		if(icon_door_override)
-			add_overlay("[icon_door]_open")
-		else
-			add_overlay("[icon_state]_open")
+		add_overlay("[icon_state]_door")
+	if(welded)
+		add_overlay("welded")
+	if(!secure)
+		return
+	if(broken)
+		add_overlay("off")
+		add_overlay("sparking")
+	else if(locked)
+		add_overlay("locked")
+	else
+		add_overlay("unlocked")

 /obj/structure/closet/examine(mob/user)
 	..()
 	if(welded)
-		to_chat(user, "<span class='notice'>It's welded shut.</span>")
+		to_chat(user, "<span class='notice'>It's <b>welded</b> shut.</span>")
 	if(anchored)
 		to_chat(user, "<span class='notice'>It is <b>bolted</b> to the ground.</span>")
 	if(opened)
 		to_chat(user, "<span class='notice'>The parts are <b>welded</b> together.</span>")
 	else if(secure && !opened)
+	else if(broken)
+		to_chat(user, "<span class='notice'>The lock is <b>screwed</b> in.</span>")
+	else if(secure)
 		to_chat(user, "<span class='notice'>Alt-click to [locked ? "unlock" : "lock"].</span>")
 	if(isliving(user))
 		var/mob/living/L = user
@@ -117,9 +127,37 @@
 			return FALSE
 	return TRUE

-/obj/structure/closet/proc/dump_contents()
+/obj/structure/closet/proc/can_lock(mob/living/user, var/check_access = TRUE) //set check_access to FALSE if you only need to check if a locker has a functional lock rather than access
+	if(!secure)
+		return FALSE
+	if(broken)
+		to_chat(user, "<span class='notice'>[src] is broken!</span>")
+		return FALSE
+	if(QDELETED(lockerelectronics) && !locked) //We want to be able to unlock it regardless of electronics, but only lockable with electronics
+		to_chat(user, "<span class='notice'>[src] is missing locker electronics!</span>")
+		return FALSE
+	if(!check_access)
+		return TRUE
+	if(allowed(user))
+		return TRUE
+	to_chat(user, "<span class='notice'>Access denied.</span>")
+
+/obj/structure/closet/proc/togglelock(mob/living/user)
+	add_fingerprint(user)
+	if(opened)
+		return
+	if(!can_lock(user))
+		return
+	locked = !locked
+	user.visible_message("<span class='notice'>[user] [locked ? null : "un"]locks [src].</span>",
+	"<span class='notice'>You [locked ? null : "un"]lock [src].</span>")
+	update_icon()
+
+/obj/structure/closet/proc/dump_contents(var/override = TRUE) //Override is for not revealing the locker electronics when you open the locker, for example
 	var/atom/L = drop_location()
 	for(var/atom/movable/AM in src)
+		if(AM == lockerelectronics && override)
+			continue
 		AM.forceMove(L)
 		if(throwing) // you keep some momentum when getting out of a thrown closet
 			step(AM, dir)
@@ -207,6 +245,73 @@
 	else
 		return open(user)

+/obj/structure/closet/proc/bust_open()
+	welded = FALSE //applies to all lockers
+	locked = FALSE //applies to critter crates and secure lockers only
+	broken = TRUE //applies to secure lockers only
+	open()
+
+/obj/structure/closet/proc/handle_lock_addition(mob/user, obj/item/electronics/airlock/E)
+	add_fingerprint(user)
+	if(lock_in_use)
+		to_chat(user, "<span class='notice'>Wait for work on [src] to be done first!</span>")
+		return
+	if(secure)
+		to_chat(user, "<span class='notice'>This locker already has a lock!</span>")
+		return
+	if(broken)
+		to_chat(user, "<span class='notice'><b>Unscrew</b> the broken lock first!</span>")
+		return
+	if(!istype(E))
+		return
+	user.visible_message("<span class='notice'>[user] begins installing a lock on [src]...</span>","<span class='notice'>You begin installing a lock on [src]...</span>")
+	lock_in_use = TRUE
+	playsound(loc, 'sound/items/screwdriver.ogg', 50, 1)
+	if(!do_after(user, 60, target = src))
+		lock_in_use = FALSE
+		return
+	lock_in_use = FALSE
+	to_chat(user, "<span class='notice'>You finish the lock on [src]!</span>")
+	E.forceMove(src)
+	lockerelectronics = E
+	req_access = E.accesses
+	secure = TRUE
+	update_icon()
+	return TRUE
+
+/obj/structure/closet/proc/handle_lock_removal(mob/user, obj/item/screwdriver/S)
+	if(lock_in_use)
+		to_chat(user, "<span class='notice'>Wait for work on [src] to be done first!</span>")
+		return
+	if(locked)
+		to_chat(user, "<span class='notice'>Unlock it first!</span>")
+		return
+	if(!secure)
+		to_chat(user, "<span class='notice'>[src] doesn't have a lock that you can remove!</span>")
+		return
+	if(!istype(S))
+		return
+	var/brokenword = broken ? "broken " : null
+	user.visible_message("<span class='notice'>You begin removing the [brokenword]lock on [src]...</span>", "<span class='notice'>[user] begins removing the [brokenword]lock on [src]...</span>")
+	playsound(loc, S.usesound, 50, 1)
+	lock_in_use = TRUE
+	if(!do_after(user, 100 * S.toolspeed, target = src))
+		lock_in_use = FALSE
+		return
+	to_chat(user, "<span class='notice'>You remove the [brokenword]lock from [src]!</span>")
+	if(!QDELETED(lockerelectronics))
+		lockerelectronics.add_fingerprint(user)
+		lockerelectronics.forceMove(user.loc)
+	lockerelectronics = null
+	req_access = null
+	secure = FALSE
+	broken = FALSE
+	locked = FALSE
+	lock_in_use = FALSE
+	update_icon()
+	return TRUE
+
+
 /obj/structure/closet/deconstruct(disassembled = TRUE)
 	if(ispath(material_drop) && material_drop_amount && !(flags_1 & NODECONSTRUCT_1))
 		new material_drop(loc, material_drop_amount)
@@ -247,7 +352,11 @@
 				deconstruct(TRUE)
 				return
 		if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too
-			return
+			return TRUE
+	else if(istype(W, /obj/item/electronics/airlock))
+		handle_lock_addition(user, W)
+	else if(istype(W, /obj/item/screwdriver))
+		handle_lock_removal(user, W)
 	else if(istype(W, /obj/item/weldingtool) && can_weld_shut)
 		if(!W.tool_start_check(user, amount=0))
 			return
@@ -258,7 +367,7 @@
 				return
 			welded = !welded
 			after_weld(welded)
-			user.visible_message("<span class='notice'>[user] [welded ? "welds shut" : "unwelded"] \the [src].</span>",
+			user.visible_message("<span class='notice'>[user] [welded ? "welds shut" : "unwelds"] \the [src].</span>",
 							"<span class='notice'>You [welded ? "weld" : "unwelded"] \the [src] with \the [W].</span>",
 							"<span class='italics'>You hear welding.</span>")
 			update_icon()
@@ -401,20 +510,12 @@
 		if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
 			to_chat(user, "<span class='warning'>You fail to break out of [src]!</span>")

-/obj/structure/closet/proc/bust_open()
-	welded = FALSE //applies to all lockers
-	locked = FALSE //applies to critter crates and secure lockers only
-	broken = TRUE //applies to secure lockers only
-	open()
-
 /obj/structure/closet/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(src, BE_CLOSE) || !isturf(loc))
+	if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc))
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(opened || !secure)
-		return
-	else
-		togglelock(user)
+	togglelock(user)

 /obj/structure/closet/CtrlShiftClick(mob/living/user)
 	if(!HAS_TRAIT(user, TRAIT_SKITTISH))
@@ -423,20 +524,6 @@
 		return
 	dive_into(user)

-/obj/structure/closet/proc/togglelock(mob/living/user, silent)
-	if(secure && !broken)
-		if(allowed(user))
-			if(iscarbon(user))
-				add_fingerprint(user)
-			locked = !locked
-			user.visible_message("<span class='notice'>[user] [locked ? null : "un"]locks [src].</span>",
-							"<span class='notice'>You [locked ? null : "un"]lock [src].</span>")
-			update_icon()
-		else if(!silent)
-			to_chat(user, "<span class='notice'>Access Denied</span>")
-	else if(secure && broken)
-		to_chat(user, "<span class='warning'>\The [src] is broken!</span>")
-
 /obj/structure/closet/emag_act(mob/user)
 	if(secure && !broken)
 		user.visible_message("<span class='warning'>Sparks fly from [src]!</span>",
@@ -445,6 +532,9 @@
 		playsound(src, "sparks", 50, 1)
 		broken = TRUE
 		locked = FALSE
+		if(!QDELETED(lockerelectronics))
+			qdel(lockerelectronics)
+		lockerelectronics = null
 		update_icon()

 /obj/structure/closet/get_remote_view_fullscreens(mob/user)
@@ -458,16 +548,19 @@
 	if (!(. & EMP_PROTECT_CONTENTS))
 		for(var/obj/O in src)
 			O.emp_act(severity)
-	if(secure && !broken && !(. & EMP_PROTECT_SELF))
-		if(prob(50 / severity))
-			locked = !locked
-			update_icon()
-		if(prob(20 / severity) && !opened)
-			if(!locked)
-				open()
-			else
-				req_access = list()
-				req_access += pick(get_all_accesses())
+	if(!secure || broken)
+		return ..()
+	if(prob(50 / severity))
+		locked = !locked
+		update_icon()
+	if(prob(20 / severity) && !opened)
+		if(!locked)
+			open()
+		else
+			req_access = list()
+			req_access += pick(get_all_accesses())
+			if(!QDELETED(lockerelectronics))
+				lockerelectronics.accesses = req_access

 /obj/structure/closet/contents_explosion(severity, target)
 	for(var/atom/A in contents)
@@ -49,6 +49,12 @@
 		return 1
 	return 0

+/obj/structure/closet/body_bag/handle_lock_addition()
+	return
+
+/obj/structure/closet/body_bag/handle_lock_removal()
+	return
+
 /obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
 	. = ..()
 	if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
@@ -57,6 +57,11 @@
 	I.alpha = 0
 	animate(I, pixel_z = 32, alpha = 255, time = 5, easing = ELASTIC_EASING)

+/obj/structure/closet/cardboard/handle_lock_addition() //Whoever heard of a lockable cardboard box anyway
+	return
+
+/obj/structure/closet/cardboard/handle_lock_removal()
+	return

 /obj/structure/closet/cardboard/metal
 	name = "large metal box"
@@ -21,8 +21,8 @@
 	new /obj/item/clothing/head/soft/black(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
-	new /obj/item/reagent_containers/glass/rag(src)
-	new /obj/item/reagent_containers/glass/rag(src)
+	new /obj/item/reagent_containers/rag(src)
+	new /obj/item/reagent_containers/rag(src)
 	new /obj/item/storage/box/beanbag(src)
 	new /obj/item/clothing/suit/armor/vest/alt(src)
 	new /obj/item/circuitboard/machine/dish_drive(src)
@@ -53,7 +53,7 @@
 	new /obj/item/clothing/suit/toggle/chef(src)
 	new /obj/item/clothing/under/rank/chef(src)
 	new /obj/item/clothing/head/chefhat(src)
-	new /obj/item/reagent_containers/glass/rag(src)
+	new /obj/item/reagent_containers/rag(src)

 /obj/structure/closet/jcloset
 	name = "custodial closet"
@@ -358,3 +358,8 @@
 	new /obj/item/clothing/shoes/workboots/mining(src)
 	new /obj/item/storage/backpack/satchel/explorer(src)

+/obj/structure/closet/coffin/handle_lock_addition()
+	return
+
+/obj/structure/closet/coffin/handle_lock_removal()
+	return
@@ -9,6 +9,7 @@
 	new /obj/item/clothing/head/beret/qm(src)
 	new /obj/item/storage/lockbox/medal/cargo(src)
 	new /obj/item/clothing/under/rank/cargo(src)
+	new /obj/item/clothing/under/rank/cargo/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/radio/headset/headset_cargo(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
@@ -8,6 +8,7 @@
 	new /obj/item/clothing/neck/cloak/ce(src)
 	new /obj/item/clothing/head/beret/ce(src)
 	new /obj/item/clothing/under/rank/chief_engineer(src)
+	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)
 	new /obj/item/clothing/head/hardhat/white(src)
 	new /obj/item/clothing/head/welding(src)
 	new /obj/item/clothing/gloves/color/yellow(src)
@@ -61,6 +61,7 @@
 	new /obj/item/clothing/head/bio_hood/cmo(src)
 	new /obj/item/clothing/suit/toggle/labcoat/cmo(src)
 	new /obj/item/clothing/under/rank/chief_medical_officer(src)
+	new /obj/item/clothing/under/rank/chief_medical_officer/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown	(src)
 	new /obj/item/cartridge/cmo(src)
 	new /obj/item/radio/headset/heads/cmo(src)
@@ -4,6 +4,18 @@
 	req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
 	var/registered_name = null

+/obj/structure/closet/secure_closet/personal/examine(mob/user)
+	..()
+	if(registered_name)
+		to_chat(user, "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>")
+
+/obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I)
+	. = ..()
+	if(!I || !istype(I))
+		return
+	if(registered_name == I.registered_name)
+		return TRUE
+
 /obj/structure/closet/secure_closet/personal/PopulateContents()
 	..()
 	if(prob(50))
@@ -33,21 +45,21 @@

 /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
 	var/obj/item/card/id/I = W.GetID()
-	if(istype(I))
-		if(broken)
-			to_chat(user, "<span class='danger'>It appears to be broken.</span>")
-			return
-		if(!I || !I.registered_name)
-			return
-		if(allowed(user) || !registered_name || (istype(I) && (registered_name == I.registered_name)))
-			//they can open all lockers, or nobody owns this, or they own this locker
-			locked = !locked
-			update_icon()
-
-			if(!registered_name)
-				registered_name = I.registered_name
-				desc = "Owned by [I.registered_name]."
-		else
-			to_chat(user, "<span class='danger'>Access Denied.</span>")
-	else
+	if(!I || !istype(I))
 		return ..()
+	if(!can_lock(user, FALSE)) //Can't do anything if there isn't a lock!
+		return
+	if(I.registered_name && !registered_name)
+		to_chat(user, "<span class='notice'>You claim [src].</span>")
+		registered_name = I.registered_name
+	else
+		..()
+
+/obj/structure/closet/secure_closet/personal/handle_lock_addition() //If lock construction is successful we don't care what access the electronics had, so we override it
+	if(..())
+		req_access = list(ACCESS_ALL_PERSONAL_LOCKERS)
+		lockerelectronics.accesses = req_access
+
+/obj/structure/closet/secure_closet/personal/handle_lock_removal()
+	if(..())
+		registered_name = null
@@ -11,8 +11,11 @@
 	new /obj/item/clothing/head/bio_hood/scientist(src)
 	new /obj/item/clothing/suit/toggle/labcoat(src)
 	new /obj/item/clothing/under/rank/research_director(src)
+	new /obj/item/clothing/under/rank/research_director/skirt(src)
 	new /obj/item/clothing/under/rank/research_director/alt(src)
+	new /obj/item/clothing/under/rank/research_director/alt/skirt(src)
 	new /obj/item/clothing/under/rank/research_director/turtleneck(src)
+	new /obj/item/clothing/under/rank/research_director/turtleneck/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/cartridge/rd(src)
 	new /obj/item/clothing/gloves/color/latex(src)
@@ -2,7 +2,6 @@
 	name = "\proper captain's locker"
 	req_access = list(ACCESS_CAPTAIN)
 	icon_state = "cap"
-
 /obj/structure/closet/secure_closet/captains/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/hooded/wintercoat/captain(src)
@@ -14,6 +13,7 @@
 	new /obj/item/pet_carrier(src)
 	new /obj/item/clothing/shoes/sneakers/brown(src)
 	new /obj/item/clothing/under/rank/captain(src)
+	new /obj/item/clothing/under/rank/captain/skirt(src)
 	new /obj/item/clothing/suit/armor/vest/capcarapace(src)
 	new /obj/item/clothing/head/caphat(src)
 	new /obj/item/clothing/under/captainparade(src)
@@ -34,16 +34,15 @@
 	new /obj/item/gun/energy/e_gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/storage/photo_album/Captain(src)
-
 /obj/structure/closet/secure_closet/hop
 	name = "\proper head of personnel's locker"
 	req_access = list(ACCESS_HOP)
 	icon_state = "hop"
-
 /obj/structure/closet/secure_closet/hop/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/hop(src)
 	new /obj/item/clothing/under/rank/head_of_personnel(src)
+	new /obj/item/clothing/under/rank/head_of_personnel/skirt(src)
 	new /obj/item/clothing/head/hopcap(src)
 	new /obj/item/clothing/head/hopcap/beret(src)
 	new /obj/item/cartridge/hop(src)
@@ -62,12 +61,10 @@
 	new /obj/item/door_remote/civillian(src)
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
 	new /obj/item/storage/photo_album/HoP(src)
-
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
 	req_access = list(ACCESS_HOS)
 	icon_state = "hos"
-
 /obj/structure/closet/secure_closet/hos/PopulateContents()
 	..()
 	new /obj/item/clothing/neck/cloak/hos(src)
@@ -77,7 +74,9 @@
 	new /obj/item/clothing/under/hosparademale(src)
 	new /obj/item/clothing/suit/armor/vest/leather(src)
 	new /obj/item/clothing/suit/armor/hos(src)
+	new /obj/item/clothing/under/rank/head_of_security/skirt(src)
 	new /obj/item/clothing/under/rank/head_of_security/alt(src)
+	new /obj/item/clothing/under/rank/head_of_security/alt/skirt(src)
 	new /obj/item/clothing/head/HoS(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses/gars/supergars(src)
@@ -95,12 +94,10 @@
 	new /obj/item/pinpointer/nuke(src)
 	new /obj/item/circuitboard/machine/techfab/department/security(src)
 	new /obj/item/storage/photo_album/HoS(src)
-
 /obj/structure/closet/secure_closet/warden
 	name = "\proper warden's locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "warden"
-
 /obj/structure/closet/secure_closet/warden/PopulateContents()
 	..()
 	new /obj/item/radio/headset/headset_sec(src)
@@ -110,6 +107,7 @@
 	new /obj/item/clothing/head/beret/sec/navywarden(src)
 	new /obj/item/clothing/suit/armor/vest/warden/alt(src)
 	new /obj/item/clothing/under/rank/warden/navyblue(src)
+	new /obj/item/clothing/under/rank/warden/skirt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/holosign_creator/security(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
@@ -120,12 +118,10 @@
 	new /obj/item/clothing/gloves/krav_maga/sec(src)
 	new /obj/item/door_remote/head_of_security(src)
 	new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
-
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
 	req_access = list(ACCESS_SECURITY)
 	icon_state = "sec"
-
 /obj/structure/closet/secure_closet/security/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/armor/vest(src)
@@ -134,55 +130,45 @@
 	new /obj/item/radio/headset/headset_sec/alt(src)
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/flashlight/seclite(src)
-
 /obj/structure/closet/secure_closet/security/sec
-
 /obj/structure/closet/secure_closet/security/sec/PopulateContents()
 	..()
 	new /obj/item/storage/belt/security/full(src)
-
 /obj/structure/closet/secure_closet/security/cargo
-
 /obj/structure/closet/secure_closet/security/cargo/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/cargo(src)
 	new /obj/item/encryptionkey/headset_cargo(src)
-
 /obj/structure/closet/secure_closet/security/engine
-
 /obj/structure/closet/secure_closet/security/engine/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/engine(src)
 	new /obj/item/encryptionkey/headset_eng(src)
-
 /obj/structure/closet/secure_closet/security/science
-
 /obj/structure/closet/secure_closet/security/science/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/science(src)
 	new /obj/item/encryptionkey/headset_sci(src)
-
 /obj/structure/closet/secure_closet/security/med
-
 /obj/structure/closet/secure_closet/security/med/PopulateContents()
 	..()
 	new /obj/item/clothing/accessory/armband/medblue(src)
 	new /obj/item/encryptionkey/headset_med(src)
-
 /obj/structure/closet/secure_closet/detective
 	name = "\improper detective's cabinet"
 	req_access = list(ACCESS_FORENSICS_LOCKERS)
 	icon_state = "cabinet"
 	resistance_flags = FLAMMABLE
 	max_integrity = 70
-
 /obj/structure/closet/secure_closet/detective/PopulateContents()
 	..()
 	new /obj/item/clothing/under/rank/det(src)
+	new /obj/item/clothing/under/rank/det/skirt(src)
 	new /obj/item/clothing/suit/det_suit(src)
 	new /obj/item/clothing/head/fedora/det_hat(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/clothing/under/rank/det/grey(src)
+	new /obj/item/clothing/under/rank/det/grey/skirt(src)
 	new /obj/item/clothing/accessory/waistcoat(src)
 	new /obj/item/clothing/suit/det_suit/grey(src)
 	new /obj/item/clothing/head/fedora(src)
@@ -200,33 +186,29 @@
 /obj/structure/closet/secure_closet/injection
 	name = "lethal injections"
 	req_access = list(ACCESS_HOS)
-
 /obj/structure/closet/secure_closet/injection/PopulateContents()
 	..()
 	for(var/i in 1 to 5)
 		new /obj/item/reagent_containers/syringe/lethal/execution(src)
-
 /obj/structure/closet/secure_closet/brig
 	name = "brig locker"
 	req_access = list(ACCESS_BRIG)
 	anchored = TRUE
 	var/id = null
-
 /obj/structure/closet/secure_closet/evidence
 	anchored = TRUE
 	name = "Secure Evidence Closet"
 	req_access_txt = "0"
 	req_one_access_txt = list(ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS)
-
 /obj/structure/closet/secure_closet/brig/PopulateContents()
 	..()
 	new /obj/item/clothing/under/rank/prisoner( src )
+	new /obj/item/clothing/under/rank/prisoner/skirt( src )
 	new /obj/item/clothing/shoes/sneakers/orange( src )

 /obj/structure/closet/secure_closet/courtroom
 	name = "courtroom locker"
 	req_access = list(ACCESS_COURT)
-
 /obj/structure/closet/secure_closet/courtroom/PopulateContents()
 	..()
 	new /obj/item/clothing/shoes/sneakers/brown(src)
@@ -236,22 +218,18 @@
 	new /obj/item/clothing/suit/judgerobe (src)
 	new /obj/item/clothing/head/powdered_wig (src)
 	new /obj/item/storage/briefcase(src)
-
 /obj/structure/closet/secure_closet/contraband/armory
 	anchored = TRUE
 	name = "Contraband Locker"
 	req_access = list(ACCESS_ARMORY)
-
 /obj/structure/closet/secure_closet/contraband/heads
 	anchored = TRUE
 	name = "Contraband Locker"
 	req_access = list(ACCESS_HEADS)
-
 /obj/structure/closet/secure_closet/armory1
 	name = "armory armor locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory1/PopulateContents()
 	..()
 	new /obj/item/clothing/suit/armor/laserproof(src)
@@ -261,12 +239,10 @@
 		new /obj/item/clothing/head/helmet/riot(src)
 	for(var/i in 1 to 3)
 		new /obj/item/shield/riot(src)
-
 /obj/structure/closet/secure_closet/armory2
 	name = "armory ballistics locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory2/PopulateContents()
 	..()
 	new /obj/item/storage/box/firingpins(src)
@@ -274,12 +250,10 @@
 		new /obj/item/storage/box/rubbershot(src)
 	for(var/i in 1 to 3)
 		new /obj/item/gun/ballistic/shotgun/riot(src)
-
 /obj/structure/closet/secure_closet/armory3
 	name = "armory energy gun locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "armory"
-
 /obj/structure/closet/secure_closet/armory3/PopulateContents()
 	..()
 	new /obj/item/storage/box/firingpins(src)
@@ -288,24 +262,20 @@
 		new /obj/item/gun/energy/e_gun(src)
 	for(var/i in 1 to 3)
 		new /obj/item/gun/energy/laser(src)
-
 /obj/structure/closet/secure_closet/tac
 	name = "armory tac locker"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
-
 /obj/structure/closet/secure_closet/tac/PopulateContents()
 	..()
 	new /obj/item/gun/ballistic/automatic/wt550(src)
 	new /obj/item/clothing/head/helmet/alt(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/clothing/suit/armor/bulletproof(src)
-
 /obj/structure/closet/secure_closet/lethalshots
 	name = "shotgun lethal rounds"
 	req_access = list(ACCESS_ARMORY)
 	icon_state = "tac"
-
 /obj/structure/closet/secure_closet/lethalshots/PopulateContents()
 	..()
 	for(var/i in 1 to 3)
@@ -9,6 +9,7 @@
 /obj/structure/closet/syndicate/personal/PopulateContents()
 	..()
 	new /obj/item/clothing/under/syndicate(src)
+	new /obj/item/clothing/under/syndicate/skirt(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/radio/headset/syndicate(src)
 	new /obj/item/ammo_box/magazine/m10mm(src)
@@ -2,33 +2,34 @@
 	name = "wardrobe"
 	desc = "It's a storage unit for standard-issue Nanotrasen attire."
 	icon_door = "blue"
-
 /obj/structure/closet/wardrobe/PopulateContents()
 	..()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/blue(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/blue(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
-
 /obj/structure/closet/wardrobe/pink
 	name = "pink wardrobe"
 	icon_door = "pink"
-
 /obj/structure/closet/wardrobe/pink/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/pink(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/pink(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/brown(src)
 	return
-
 /obj/structure/closet/wardrobe/black
 	name = "black wardrobe"
 	icon_door = "black"
-
 /obj/structure/closet/wardrobe/black/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/black(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/black(src)
 	if(prob(25))
 		new /obj/item/clothing/suit/jacket/leather(src)
 	if(prob(20))
@@ -44,66 +45,60 @@
 	if(prob(40))
 		new /obj/item/clothing/mask/bandana/skull(src)
 	return
-
-
 /obj/structure/closet/wardrobe/green
 	name = "green wardrobe"
 	icon_door = "green"
-
 /obj/structure/closet/wardrobe/green/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/green(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/green(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/mask/bandana/green(src)
 	new /obj/item/clothing/mask/bandana/green(src)
 	return
-
-
 /obj/structure/closet/wardrobe/orange
 	name = "prison wardrobe"
 	desc = "It's a storage unit for Nanotrasen-regulation prisoner attire."
 	icon_door = "orange"
-
 /obj/structure/closet/wardrobe/orange/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/rank/prisoner(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/rank/prisoner/skirt(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
 	return
-
-
 /obj/structure/closet/wardrobe/yellow
 	name = "yellow wardrobe"
 	icon_door = "yellow"
-
 /obj/structure/closet/wardrobe/yellow/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/yellow(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/yellow(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/orange(src)
 	new /obj/item/clothing/mask/bandana/gold(src)
 	new /obj/item/clothing/mask/bandana/gold(src)
 	return
-
-
 /obj/structure/closet/wardrobe/white
 	name = "white wardrobe"
 	icon_door = "white"
-
 /obj/structure/closet/wardrobe/white/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/white(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/white(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/head/soft/mime(src)
 	return
-
 /obj/structure/closet/wardrobe/pjs
 	name = "pajama wardrobe"
 	icon_door = "white"
-
 /obj/structure/closet/wardrobe/pjs/PopulateContents()
 	new /obj/item/clothing/under/pj/red(src)
 	new /obj/item/clothing/under/pj/red(src)
@@ -112,15 +107,14 @@
 	for(var/i in 1 to 4)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	return
-
-
 /obj/structure/closet/wardrobe/grey
 	name = "grey wardrobe"
 	icon_door = "grey"
-
 /obj/structure/closet/wardrobe/grey/PopulateContents()
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/under/color/grey(src)
+	for(var/i in 1 to 3)
+		new /obj/item/clothing/under/skirt/color/grey(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/shoes/sneakers/black(src)
 	for(var/i in 1 to 3)
@@ -140,28 +134,36 @@
 	if(prob(30))
 		new /obj/item/clothing/accessory/pocketprotector(src)
 	return
-
-
 /obj/structure/closet/wardrobe/mixed
 	name = "mixed wardrobe"
 	icon_door = "mixed"
-
 /obj/structure/closet/wardrobe/mixed/PopulateContents()
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
 	if(prob(40))
 		new /obj/item/clothing/suit/jacket(src)
 	new /obj/item/clothing/under/color/white(src)
+	new /obj/item/clothing/under/skirt/color/white(src)
 	new /obj/item/clothing/under/color/blue(src)
+	new /obj/item/clothing/under/skirt/color/blue(src)
 	new /obj/item/clothing/under/color/yellow(src)
+	new /obj/item/clothing/under/skirt/color/yellow(src)
 	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/skirt/color/green(src)
 	new /obj/item/clothing/under/color/orange(src)
+	new /obj/item/clothing/under/skirt/color/orange(src)
 	new /obj/item/clothing/under/color/pink(src)
+	new /obj/item/clothing/under/skirt/color/pink(src)
 	new /obj/item/clothing/under/color/red(src)
+	new /obj/item/clothing/under/skirt/color/red(src)
 	new /obj/item/clothing/under/color/darkblue(src)
+	new /obj/item/clothing/under/skirt/color/darkblue(src)
 	new /obj/item/clothing/under/color/teal(src)
+	new /obj/item/clothing/under/skirt/color/teal(src)
 	new /obj/item/clothing/under/color/lightpurple(src)
+	new /obj/item/clothing/under/skirt/color/lightpurple(src)
 	new /obj/item/clothing/under/color/green(src)
+	new /obj/item/clothing/under/skirt/color/green(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/red(src)
 	new /obj/item/clothing/mask/bandana/blue(src)
@@ -54,6 +54,12 @@
 		manifest = null
 		update_icon()

+/obj/structure/closet/crate/handle_lock_addition()
+	return
+
+/obj/structure/closet/crate/handle_lock_removal()
+	return
+
 /obj/structure/closet/crate/proc/tear_manifest(mob/user)
 	to_chat(user, "<span class='notice'>You tear the manifest off of [src].</span>")
 	playsound(src, 'sound/items/poster_ripped.ogg', 75, 1)
@@ -79,4 +79,4 @@
 	var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
 	if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return default_color
-	return n_color
+	return sanitize_hexcolor(n_color, include_crunch= TRUE)
@@ -537,7 +537,7 @@

 	if(istype(O, /obj/item/stack/medical/gauze))
 		var/obj/item/stack/medical/gauze/G = O
-		new /obj/item/reagent_containers/glass/rag(src.loc)
+		new /obj/item/reagent_containers/rag(src.loc)
 		to_chat(user, "<span class='notice'>You tear off a strip of gauze and make a rag.</span>")
 		G.use(1)
 		return
@@ -272,7 +272,7 @@
 				return 0
 			if(ishuman(C) && (lube&NO_SLIP_WHEN_WALKING))
 				var/mob/living/carbon/human/H = C
-				if(!H.sprinting && H.getStaminaLoss() >= 20)
+				if(!H.sprinting && H.getStaminaLoss() <= 20)
 					return 0
 		if(!(lube&SLIDE_ICE))
 			to_chat(C, "<span class='notice'>You slipped[ O ? " on the [O.name]" : ""]!</span>")
@@ -15,9 +15,9 @@
 	H.real_name = random_unique_name(H.gender)
 	H.name = H.real_name
 	H.underwear = random_underwear(H.gender)
-	H.undie_color = random_color()
+	H.undie_color = random_short_color()
 	H.undershirt = random_undershirt(H.gender)
-	H.shirt_color = random_color()
+	H.shirt_color = random_short_color()
 	H.skin_tone = random_skin_tone()
 	H.hair_style = random_hair_style(H.gender)
 	H.facial_hair_style = random_facial_hair_style(H.gender)
@@ -6,7 +6,7 @@
 	set category = null
 	set name = "Admin PM Mob"
 	if(!holder)
-		to_chat(src, "<font color='red'>Error: Admin-PM-Context: Only administrators may use this command.</font>")
+		to_chat(src, "<span class='danger'>Error: Admin-PM-Context: Only administrators may use this command.</span>")
 		return
 	if( !ismob(M) || !M.client )
 		return
@@ -18,7 +18,7 @@
 	set category = "Admin"
 	set name = "Admin PM"
 	if(!holder)
-		to_chat(src, "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>")
+		to_chat(src, "<span class='danger'>Error: Admin-PM-Panel: Only administrators may use this command.</span>")
 		return
 	var/list/client/targets[0]
 	for(var/client/T)
@@ -37,7 +37,7 @@

 /client/proc/cmd_ahelp_reply(whom)
 	if(prefs.muted & MUTE_ADMINHELP)
-		to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
+		to_chat(src, "<span class='danger'>Error: Admin-PM: You are unable to use admin PM-s (muted).</span>")
 		return
 	var/client/C
 	if(istext(whom))
@@ -48,7 +48,7 @@
 		C = whom
 	if(!C)
 		if(holder)
-			to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+			to_chat(src, "<span class='danger'>Error: Admin-PM: Client not found.</span>")
 		return

 	var/datum/admin_help/AH = C.current_ticket
@@ -65,12 +65,12 @@
 //Fetching a message if needed. src is the sender and C is the target client
 /client/proc/cmd_admin_pm(whom, msg)
 	if(prefs.muted & MUTE_ADMINHELP)
-		to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
+		to_chat(src, "<span class='danger'>Error: Admin-PM: You are unable to use admin PM-s (muted).</span>")
 		return

 	if(!holder && !current_ticket)	//no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo
-		to_chat(src, "<font color='red'>You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.</font>")
-		to_chat(src, "<font color='blue'>Message: [msg]</font>")
+		to_chat(src, "<span class='danger'>You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.</span>")
+		to_chat(src, "<span class='notice'>Message: [msg]</span>")
 		return

 	var/client/recipient
@@ -95,14 +95,14 @@
 		if(!msg)
 			return
 		if(holder)
-			to_chat(src, "<font color='red'>Error: Use the admin IRC channel, nerd.</font>")
+			to_chat(src, "<span class='danger'>Error: Use the admin IRC channel, nerd.</span>")
 			return


 	else
 		if(!recipient)
 			if(holder)
-				to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+				to_chat(src, "<span class='danger'>Error: Admin-PM: Client not found.</span>")
 				if(msg)
 					to_chat(src, msg)
 				return
@@ -118,12 +118,12 @@
 				return

 			if(prefs.muted & MUTE_ADMINHELP)
-				to_chat(src, "<font color='red'>Error: Admin-PM: You are unable to use admin PM-s (muted).</font>")
+				to_chat(src, "<span class='danger'>Error: Admin-PM: You are unable to use admin PM-s (muted).</span>")
 				return

 			if(!recipient)
 				if(holder)
-					to_chat(src, "<font color='red'>Error: Admin-PM: Client not found.</font>")
+					to_chat(src, "<span class='danger'>Error: Admin-PM: Client not found.</span>")
 				else
 					current_ticket.MessageNoRecipient(msg)
 				return
@@ -145,15 +145,15 @@
 	var/keywordparsedmsg = keywords_lookup(msg)

 	if(irc)
-		to_chat(src, "<font color='blue'>PM to-<b>Admins</b>: <span class='linkify'>[rawmsg]</span></font>")
+		to_chat(src, "<span class='notice'>PM to-<b>Admins</b>: <span class='linkify'>[rawmsg]</span></span>")
 		var/datum/admin_help/AH = admin_ticket_log(src, "<font color='red'>Reply PM from-<b>[key_name(src, TRUE, TRUE)] to <i>IRC</i>: [keywordparsedmsg]</font>")
 		ircreplyamount--
 		send2irc("[AH ? "#[AH.id] " : ""]Reply: [ckey]", rawmsg)
 	else
 		if(recipient.holder)
 			if(holder)	//both are admins
-				to_chat(recipient, "<font color='red'>Admin PM from-<b>[key_name(src, recipient, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span></font>")
-				to_chat(src, "<font color='blue'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span></font>")
+				to_chat(recipient, "<span class='danger'>Admin PM from-<b>[key_name(src, recipient, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span></span>")
+				to_chat(src, "<span class='notice'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span></span>")

 				//omg this is dumb, just fill in both their tickets
 				var/interaction_message = "<font color='purple'>PM from-<b>[key_name(src, recipient, 1)]</b> to-<b>[key_name(recipient, src, 1)]</b>: [keywordparsedmsg]</font>"
@@ -162,10 +162,10 @@
 					admin_ticket_log(recipient, interaction_message)

 			else		//recipient is an admin but sender is not
-				var/replymsg = "<font color='red'>Reply PM from-<b>[key_name(src, recipient, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span></font>"
-				admin_ticket_log(src, replymsg)
-				to_chat(recipient, replymsg)
-				to_chat(src, "<font color='blue'>PM to-<b>Admins</b>: <span class='linkify'>[msg]</span></font>")
+				var/replymsg = "Reply PM from-<b>[key_name(src, recipient, 1)]</b>: <span class='linkify'>[keywordparsedmsg]</span>"
+				admin_ticket_log(src, "<font color='red'>[replymsg]</font>")
+				to_chat(recipient, "<span class='danger'>[replymsg]</span>")
+				to_chat(src, "<span class='notice'>PM to-<b>Admins</b>: <span class='linkify'>[msg]</span></span>")

 			//play the receiving admin the adminhelp sound (if they have them enabled)
 			if(recipient.prefs.toggles & SOUND_ADMINHELP)
@@ -177,11 +177,11 @@
 					new /datum/admin_help(msg, recipient, TRUE)

 				to_chat(recipient, "<font color='red' size='4'><b>-- Administrator private message --</b></font>")
-				to_chat(recipient, "<font color='red'>Admin PM from-<b>[key_name(src, recipient, 0)]</b>: <span class='linkify'>[msg]</span></font>")
-				to_chat(recipient, "<font color='red'><i>Click on the administrator's name to reply.</i></font>")
-				to_chat(src, "<font color='blue'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: <span class='linkify'>[msg]</span></font>")
+				to_chat(recipient, "<span class='danger'>Admin PM from-<b>[key_name(src, recipient, 0)]</b>: <span class='linkify'>[msg]</span></span>")
+				to_chat(recipient, "<span class='danger'><i>Click on the administrator's name to reply.</i></span>")
+				to_chat(src, "<span class='notice'>Admin PM to-<b>[key_name(recipient, src, 1)]</b>: <span class='linkify'>[msg]</span></span>")

-				admin_ticket_log(recipient, "<font color='blue'>PM From [key_name_admin(src)]: [keywordparsedmsg]</font>")
+				admin_ticket_log(recipient, "<font color='purple'>PM From [key_name_admin(src)]: [keywordparsedmsg]</font>")

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

 			else		//neither are admins
-				to_chat(src, "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>")
+				to_chat(src, "<span class='danger'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</span>")
 				return

 	if(irc)
 		log_admin_private("PM: [key_name(src)]->IRC: [rawmsg]")
 		for(var/client/X in GLOB.admins)
-			to_chat(X, "<font color='blue'><B>PM: [key_name(src, X, 0)]-&gt;IRC:</B> [keywordparsedmsg]</font>")
+			to_chat(X, "<span class='notice'><B>PM: [key_name(src, X, 0)]-&gt;IRC:</B> [keywordparsedmsg]</span>")
 	else
 		window_flash(recipient, ignorepref = TRUE)
 		log_admin_private("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]")
 		//we don't use message_admins here because the sender/receiver might get it too
 		for(var/client/X in GLOB.admins)
 			if(X.key!=key && X.key!=recipient.key)	//check client/X is an admin and isn't the sender or recipient
-				to_chat(X, "<font color='blue'><B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]</font>" )
+				to_chat(X, "<span class='notice'><B>PM: [key_name(src, X, 0)]-&gt;[key_name(recipient, X, 0)]:</B> [keywordparsedmsg]</span>" )



@@ -296,10 +296,10 @@
 	msg = emoji_parse(msg)

 	to_chat(C, "<font color='red' size='4'><b>-- Administrator private message --</b></font>")
-	to_chat(C, "<font color='red'>Admin PM from-<b><a href='?priv_msg=[stealthkey]'>[adminname]</A></b>: [msg]</font>")
-	to_chat(C, "<font color='red'><i>Click on the administrator's name to reply.</i></font>")
+	to_chat(C, "<span class='adminsay'>Admin PM from-<b><a href='?priv_msg=[stealthkey]'>[adminname]</A></b>: [msg]</span>")
+	to_chat(C, "<span class='adminsay'><i>Click on the administrator's name to reply.</i></span>")

-	admin_ticket_log(C, "<font color='blue'>PM From [irc_tagged]: [msg]</font>")
+	admin_ticket_log(C, "<font color='purple'>PM From [irc_tagged]: [msg]</font>")

 	window_flash(C, ignorepref = TRUE)
 	//always play non-admin recipients the adminhelp sound
@@ -298,7 +298,7 @@
 		if(candidates.len)
 			ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates
 		else
-			to_chat(usr, "<font color='red'>Error: create_xeno(): no suitable candidates.</font>")
+			to_chat(usr, "<span class='danger'>Error: create_xeno(): no suitable candidates.</span>")
 	if(!istext(ckey))
 		return 0

@@ -244,6 +244,7 @@
 	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
 	item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL | NOBLUDGEON
+	slot_flags = NONE
 	flags_1 = NONE
 	w_class = WEIGHT_CLASS_HUGE
 	ammo_type = /obj/item/ammo_casing/magic/tentacle
@@ -62,13 +62,13 @@


 /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 loud, and might cause our blood to react violently to heat."
+	name = "Temporary Transformation Sting"
+	desc = "We silently sting a human, injecting a chemical that forces them to transform into a chosen being for a limited time. Additional stings extend the duration."
+	helptext = "The victim will transform much like a changeling would for a limited time. 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 = 2
+	chemical_cost = 10
+	dna_cost = 2
+	loudness = 1
 	var/datum/changelingprofile/selected_dna = null
 	action_icon = 'icons/mob/actions/actions_changeling.dmi'
 	action_icon_state = "ling_sting_transform"
@@ -97,19 +97,19 @@
 	return 1

 /obj/effect/proc_holder/changeling/sting/transformation/sting_action(mob/user, mob/target)
-	log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'")
-	var/datum/dna/NewDNA = selected_dna.dna
+
 	if(ismonkey(target))
 		to_chat(user, "<span class='notice'>Our genes cry out as we sting [target.name]!</span>")

 	var/mob/living/carbon/C = target
 	. = TRUE
 	if(istype(C))
-		C.real_name = NewDNA.real_name
-		NewDNA.transfer_identity(C)
-		if(ismonkey(C))
-			C.humanize(TR_KEEPITEMS | TR_KEEPIMPLANTS | TR_KEEPORGANS | TR_KEEPDAMAGE | TR_KEEPVIRUS | TR_DEFAULTMSG)
-		C.updateappearance(mutcolor_update=1)
+		if(C.reagents.has_reagent("changeling_sting_real"))
+			C.reagents.add_reagent("changeling_sting_real",120)
+			log_combat(user, target, "stung", "transformation sting", ", extending the duration.")
+		else
+			C.reagents.add_reagent("changeling_sting_real",120,list("desired_dna" = selected_dna.dna))
+			log_combat(user, target, "stung", "transformation sting", " new identity is '[selected_dna.dna.real_name]'")


 /obj/effect/proc_holder/changeling/sting/false_armblade
@@ -230,24 +230,23 @@

 /obj/effect/proc_holder/changeling/sting/LSD
 	name = "Hallucination Sting"
-	desc = "Causes terror in the target."
-	helptext = "We evolve the ability to sting a target with a powerful hallucinogenic chemical. The target does not notice they have been stung, and the effect begins after a few seconds."
+	desc = "Causes terror in the target and deals a minor amount of toxin damage."
+	helptext = "We evolve the ability to sting a target with a powerful toxic hallucinogenic chemical. The target does not notice they have been stung, and the effect begins instantaneously. This ability is somewhat loud, and carries a small risk of our blood gaining violent sensitivity to heat."
 	sting_icon = "sting_lsd"
 	chemical_cost = 10
 	dna_cost = 1
+	loudness = 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)
+/obj/effect/proc_holder/changeling/sting/LSD/sting_action(mob/user, mob/target)
 	log_combat(user, target, "stung", "LSD sting")
-	addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(100,200))
+	if(target.reagents)
+		target.reagents.add_reagent("regenerative_materia", 5)
+		target.reagents.add_reagent("mindbreaker", 5)
 	return TRUE

-/obj/effect/proc_holder/changeling/sting/LSD/proc/hallucination_time(mob/living/carbon/target)
-	if(target)
-		target.hallucination = max(90, target.hallucination)
-
 /obj/effect/proc_holder/changeling/sting/cryo
 	name = "Cryogenic Sting"
 	desc = "We silently sting a human with a cocktail of chemicals that freeze them."
@@ -133,6 +133,9 @@
 		return FALSE
 	if(!uses)
 		return FALSE
+	if(!do_teleport(A, get_turf(linked_gateway), channel = TELEPORT_CHANNEL_CULT, forced = TRUE))
+		visible_message("<span class='warning'>[A] bounces off [src]!</span>")
+		return FALSE
 	if(isliving(A))
 		var/mob/living/user = A
 		to_chat(user, "<span class='warning'><b>You pass through [src] and appear elsewhere!</b></span>")
@@ -141,7 +144,6 @@
 	playsound(linked_gateway, 'sound/effects/empulse.ogg', 50, 1)
 	transform = matrix() * 1.5
 	linked_gateway.transform = matrix() * 1.5
-	A.forceMove(get_turf(linked_gateway))
 	if(!no_cost)
 		uses = max(0, uses - 1)
 		linked_gateway.uses = max(0, linked_gateway.uses - 1)
--- a/Show More
+++ b/Show More