Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update

2019-12-08 14:17:00 -06:00
parent e686be55c5 e300bb6b84
commit 1e2a4f606c
378 changed files with 12243 additions and 8059 deletions
@@ -69,6 +69,7 @@
 #define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device"
 #define ADMIN_PUNISHMENT_FIREBALL "Fireball"
 #define ADMIN_PUNISHMENT_ROD "Immovable Rod"
+#define ADMIN_PUNISHMENT_SUPPLYPOD_QUICK "Supply Pod (Quick)"
 #define ADMIN_PUNISHMENT_SUPPLYPOD "Supply Pod"
 #define ADMIN_PUNISHMENT_MAZING "Puzzle"
 #define ADMIN_PUNISHMENT_PIE "Cream Pie"
@@ -11,6 +11,7 @@
 #define STYLE_FRUIT 11
 #define STYLE_INVISIBLE 12
 #define STYLE_GONDOLA 13
+#define STYLE_SEETHROUGH 14

 #define POD_ICON_STATE 1
 #define POD_NAME 2
@@ -29,5 +30,6 @@
 	list("honkpod", "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\
 	list("fruitpod", "\improper Orange", "An angry orange."),\
 	list("", "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\
-	list("gondolapod", "gondola", "The silent walker. This one seems to be part of a delivery agency.")\
+    list("gondolapod", "gondola", "The silent walker. This one seems to be part of a delivery agency."),\
+    list("", "", "")\
 )
@@ -98,6 +98,7 @@

 //the define for visible message range in combat
 #define COMBAT_MESSAGE_RANGE 3
+#define DEFAULT_MESSAGE_RANGE 7

 //Shove knockdown lengths (deciseconds)
 #define SHOVE_KNOCKDOWN_SOLID 30
@@ -5,6 +5,17 @@
 #define COMPONENT_INCOMPATIBLE 1
 #define COMPONENT_NOTRANSFER 2

+#define ELEMENT_INCOMPATIBLE 1 // Return value to cancel attaching
+
+// /datum/element flags
+/// Causes the detach proc to be called when the host object is being deleted
+#define ELEMENT_DETACH		(1 << 0)
+/**
+  * Only elements created with the same arguments given after `id_arg_index` share an element instance
+  * The arguments are the same when the text and number values are the same and all other values have the same ref
+  */
+#define ELEMENT_BESPOKE		(1 << 1)
+
 // How multiple components of the exact same type are handled in the same datum

 #define COMPONENT_DUPE_HIGHLANDER		0		//old component is deleted (default)
@@ -28,7 +39,7 @@
 #define COMSIG_COMPONENT_ADDED "component_added"				//when a component is added to a datum: (/datum/component)
 #define COMSIG_COMPONENT_REMOVING "component_removing"			//before a component is removed from a datum because of RemoveComponent: (/datum/component)
 #define COMSIG_PARENT_PREQDELETED "parent_preqdeleted"			//before a datum's Destroy() is called: (force), returning a nonzero value will cancel the qdel operation
-#define COMSIG_PARENT_QDELETED "parent_qdeleted"				//after a datum's Destroy() is called: (force, qdel_hint), at this point none of the other components chose to interrupt qdel and Destroy has been called
+#define COMSIG_PARENT_QDELETING "parent_qdeleting"				//just before a datum's Destroy() is called: (force), at this point none of the other components chose to interrupt qdel and Destroy will be called

 // /atom signals
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from base of atom/attackby(): (/obj/item, /mob/living, params)
@@ -148,6 +159,7 @@
 #define COMSIG_MOB_HUD_CREATED "mob_hud_created"				//from base of mob/create_mob_hud(): ()
 #define COMSIG_MOB_ATTACK_HAND "mob_attack_hand"				//from base of
 #define COMSIG_MOB_ITEM_ATTACK "mob_item_attack"				//from base of /obj/item/attack(): (mob/M, mob/user)
+	#define COMPONENT_ITEM_NO_ATTACK 1
 #define COMSIG_MOB_ITEM_AFTERATTACK "mob_item_afterattack"		//from base of obj/item/afterattack(): (atom/target, mob/user, proximity_flag, click_parameters)
 #define COMSIG_MOB_ATTACK_RANGED "mob_attack_ranged"			//from base of mob/RangedAttack(): (atom/A, params)
 #define COMSIG_MOB_THROW "mob_throw"							//from base of /mob/throw_item(): (atom/target)
@@ -313,3 +325,11 @@
 //Ouch my toes!
 #define CALTROP_BYPASS_SHOES 1
 #define CALTROP_IGNORE_WALKERS 2
+
+//Xenobio hotkeys
+#define COMSIG_XENO_SLIME_CLICK_CTRL "xeno_slime_click_ctrl"				//from slime CtrlClickOn(): (/mob)
+#define COMSIG_XENO_SLIME_CLICK_ALT "xeno_slime_click_alt"					//from slime AltClickOn(): (/mob)
+#define COMSIG_XENO_SLIME_CLICK_SHIFT "xeno_slime_click_shift"				//from slime ShiftClickOn(): (/mob)
+#define COMSIG_XENO_TURF_CLICK_SHIFT "xeno_turf_click_shift"				//from turf ShiftClickOn(): (/mob)
+#define COMSIG_XENO_TURF_CLICK_CTRL "xeno_turf_click_alt"					//from turf AltClickOn(): (/mob)
+#define COMSIG_XENO_MONKEY_CLICK_CTRL "xeno_monkey_click_ctrl"				//from monkey CtrlClickOn(): (/mob)
@@ -32,6 +32,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define TESLA_IGNORE_1				(1<<13) // TESLA_IGNORE grants immunity from being targeted by tesla-style electricity
 #define INITIALIZED_1				(1<<14)  //Whether /atom/Initialize() has already run for the object
 #define ADMIN_SPAWNED_1			(1<<15) 	//was this spawned by an admin? used for stat tracking stuff.
+#define PREVENT_CONTENTS_EXPLOSION_1 (1<<16) /// should not get harmed if this gets caught by an explosion?

 //turf-only flags
 #define NOJAUNT_1					(1<<0)
@@ -25,23 +25,22 @@
 #define NO_MAT_REDEMPTION		(1<<5)	//Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
 #define DROPDEL					(1<<6)	//When dropped, it calls qdel on itself
 #define NOBLUDGEON				(1<<7)	//when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define ABSTRACT				(1<<8)	//for all things that are technically items but used for various different stuff
+#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.
+#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

 #define LAVAPROTECT 			(1<<0)
 #define STOPSPRESSUREDAMAGE		(1<<1)	//SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
 #define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	//blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
-#define ALLOWINTERNALS			(1<<3)	//mask allows internals
+#define ALLOWINTERNALS		  	(1<<3)	//mask allows internals
 #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 SNUG_FIT               	(1<<8)	//Prevents knock-off from things like hat-throwing.
-#define ANTI_TINFOIL_MANEUVER   (1<<9)	//Hats with negative effects when worn (i.e the tinfoil hat).
+#define IGNORE_HAT_TOSS			(1<<8)	//Hats with negative effects when worn (i.e the tinfoil hat).

 // Flags for the organ_flags var on /obj/item/organ

@@ -50,4 +49,4 @@
 #define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
 #define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
 #define ORGAN_VITAL				(1<<4)	//Currently only the brain
-#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
+#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
@@ -75,8 +75,16 @@
 #define LINGHIVE_LING 2
 #define LINGHIVE_LINK 3

+//whether the emote is visible or audible.
+#define EMOTE_VISIBLE 1
+#define EMOTE_AUDIBLE 2
+
 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
 #define MAX_MESSAGE_LEN			2048		//Citadel edit: What's the WORST that could happen?
 #define MAX_NAME_LEN			42
 #define MAX_BROADCAST_LEN		512
 #define MAX_CHARTER_LEN			80
+
+// Audio/Visual Flags. Used to determine what sense are required to notice a message.
+#define MSG_VISUAL (1<<0)
+#define MSG_AUDIBLE (1<<1)
@@ -58,6 +58,8 @@
 #define MAX_MANIA_SEVERITY 100 //how high the mania severity can go
 #define MANIA_DAMAGE_TO_CONVERT 90 //how much damage is required before it'll convert affected targets

+#define STATUS_EFFECT_CHOKINGSTRAND /datum/status_effect/strandling //Choking Strand
+
 #define STATUS_EFFECT_HISWRATH /datum/status_effect/his_wrath //His Wrath.

 #define STATUS_EFFECT_SUMMONEDGHOST /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes
@@ -120,8 +120,9 @@
 #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech"
 #define TRAIT_SOOTHED_THROAT    "soothed-throat"
 #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
-#define	TRAIT_STRONG_GRABBER	"strong_grabber"
-#define	TRAIT_CALCIUM_HEALER	"calcium_healer"
+#define TRAIT_STRONG_GRABBER	"strong_grabber"
+#define TRAIT_CALCIUM_HEALER	"calcium_healer"
+#define TRAIT_MAGIC_CHOKE		"magic_choke"
 #define TRAIT_CAPTAIN_METABOLISM "captain-metabolism"
 #define TRAIT_ABDUCTOR_TRAINING "abductor-training"
 #define TRAIT_ABDUCTOR_SCIENTIST_TRAINING "abductor-scientist-training"
@@ -162,6 +163,7 @@
 #define TRAIT_FRIENDLY			"friendly"
 #define TRAIT_ASSBLASTUSA       "assblastusa"
 #define TRAIT_CULT_EYES 		"cult_eyes"
+#define TRAIT_FREESPRINT		"free_sprinting"


 // common trait sources
@@ -216,4 +218,4 @@
 #define NINJA_SUIT_TRAIT "ninja-suit"
 #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
 #define ABDUCTOR_ANTAGONIST "abductor-antagonist"
-#define MADE_UNCLONEABLE "made-uncloneable"
+#define MADE_UNCLONEABLE "made-uncloneable"
@@ -85,6 +85,9 @@ GLOBAL_VAR_INIT(cmp_field, "name")
 /proc/cmp_job_display_asc(datum/job/A, datum/job/B)
 	return A.display_order - B.display_order

+/proc/cmp_uplink_items_dsc(datum/uplink_item/A, datum/uplink_item/B)
+	return sorttext(initial(B.name), initial(A.name))
+
 /proc/cmp_numbered_displays_name_asc(datum/numbered_display/A, datum/numbered_display/B)
 	return sorttext(A.sample_object.name, B.sample_object.name)

@@ -97,6 +97,16 @@
 		var/datum/emote/E = new path()
 		E.emote_list[E.key] = E

+	//Uplink Items
+	for(var/path in subtypesof(/datum/uplink_item))
+		var/datum/uplink_item/I = path
+		if(!initial(I.item)) //We add categories to a separate list.
+			GLOB.uplink_categories |= initial(I.category)
+			continue
+		GLOB.uplink_items += path
+	//(sub)typesof entries are listed by the order they are loaded in the code, so we'll have to rearrange them here.
+	GLOB.uplink_items = sortList(GLOB.uplink_items, /proc/cmp_uplink_items_dsc)
+
 	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)

 //creates every subtype of prototype (excluding prototype) and adds it to list L.
@@ -313,14 +313,13 @@
 		parts += "[FOURSPACES]Threat level: [mode.threat_level]"
 		parts += "[FOURSPACES]Threat left: [mode.threat]"
 		parts += "[FOURSPACES]Executed rules:"
+		for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
+			parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - <b>[rule.name]</b>: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat"
+		parts += "[FOURSPACES]Other threat changes:"
 		for(var/str in mode.threat_log)
 			parts += "[FOURSPACES][FOURSPACES][str]"
 		for(var/entry in mode.threat_tallies)
 			parts += "[FOURSPACES][FOURSPACES][entry] added [mode.threat_tallies[entry]]"
-		/*
-		for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
-			parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - <b>[rule.name]</b>: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat"
-		*/
 	return parts.Join("<br>")

 /client/proc/roundend_report_file()
@@ -142,8 +142,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"THICKMATERIAL" = THICKMATERIAL,
 		"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
 		"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
-		"SNUG_FIT" = SNUG_FIT,
-		"ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
+		"IGNORE_HAT_TOSS" = IGNORE_HAT_TOSS,
 		),
 	"tesla_flags" = list(
 		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
@@ -46,10 +46,15 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
 	":thinking:",
 	"Alien",
 	"Angel",
+	"Angryface",
+	"AtlantisCZE",
 	"Banned",
 	"Bliss",
 	"Blue",
-	"Clown",
+	"Boy",
+	"Boy-Malf",
+	"Girl",
+	"Girl-Malf",
 	"Database",
 	"Dorf",
 	"Firewall",
@@ -61,26 +66,44 @@ GLOBAL_LIST_INIT(ai_core_display_screens, list(
 	"Hades",
 	"Heartline",
 	"Helios",
+	"Hotdog",
+	"Hourglass",
 	"House",
 	"Inverted",
+	"Jack",
 	"Matrix",
 	"Monochrome",
+	"Mothman",
 	"Murica",
 	"Nanotrasen",
 	"Not Malf",
+	"Patriot",
+	"Pirate",
 	"President",
-	"Random",
 	"Rainbow",
-	"Red",
+	"Clown",
+	"Random",
+	"Ravensdale",
 	"Red October",
+	"Red",
+	"Royal",
+	"Searif",
+	"Serithi",
+	"SilveryFerret",
+	"Smiley",
 	"Static",
 	"Syndicat Meow",
 	"TechDemon",
+	"Terminal",
 	"Text",
 	"Too Deep",
 	"Triumvirate",
 	"Triumvirate-M",
-	"Weird"))
+	"Wasp",
+	"Weird",
+	"Xerxes",
+	"Yes-Man"
+	))

 /proc/resolve_ai_icon(input)
 	if(!input || !(input in GLOB.ai_core_display_screens))
@@ -19,6 +19,8 @@ GLOBAL_LIST(chemical_reagents_list)				//list of all /datum/reagent datums index
 GLOBAL_LIST_EMPTY(materials_list)				//list of all /datum/material datums indexed by material id.
 GLOBAL_LIST_EMPTY(tech_list)					//list of all /datum/tech datums indexed by id.
 GLOBAL_LIST_EMPTY(surgeries_list)				//list of all surgeries by name, associated with their path.
+GLOBAL_LIST_EMPTY(uplink_items)					//list of all uplink item typepaths, ascendingly sorted by their initial name.
+GLOBAL_LIST_EMPTY(uplink_categories)			//list of all uplink categories, listed by the order they are loaded in code. Be careful.
 GLOBAL_LIST_EMPTY(crafting_recipes)				//list of all table craft recipes
 GLOBAL_LIST_EMPTY(rcd_list)					//list of Rapid Construction Devices.
 GLOBAL_LIST_EMPTY(apcs_list)					//list of all Area Power Controller machines, separate from machines for powernet speeeeeeed.
@@ -10,3 +10,5 @@ GLOBAL_LIST_INIT(typecache_living, typecacheof(/mob/living))
 GLOBAL_LIST_INIT(typecache_stack, typecacheof(/obj/item/stack))

 GLOBAL_LIST_INIT(typecache_machine_or_structure, typecacheof(list(/obj/machinery, /obj/structure)))
+
+GLOBAL_LIST_INIT(freezing_objects, typecacheof(list(/obj/structure/closet/crate/freezer, /obj/structure/closet/secure_closet/freezer, /obj/structure/bodycontainer, /obj/item/autosurgeon, /obj/machinery/smartfridge/organ)))			//list of all cold objects, that freeze organs when inside
@@ -39,23 +39,12 @@
 	if(..())
 		return TRUE
 	user.changeNext_move(CLICK_CD_MELEE)
-	if(user.a_intent == INTENT_HARM && stat == DEAD && (butcher_results || guaranteed_butcher_results)) //can we butcher it?
-		var/datum/component/butchering/butchering = I.GetComponent(/datum/component/butchering)
-		if(butchering && butchering.butchering_enabled)
-			to_chat(user, "<span class='notice'>You begin to butcher [src]...</span>")
-			playsound(loc, butchering.butcher_sound, 50, TRUE, -1)
-			if(do_mob(user, src, butchering.speed) && Adjacent(I))
-				butchering.Butcher(user, src)
-			return 1
-		else if(I.get_sharpness() && !butchering) //give sharp objects butchering functionality, for consistency
-			I.AddComponent(/datum/component/butchering, 80 * I.toolspeed)
-			attackby(I, user, params) //call the attackby again to refresh and do the butchering check again
-			return
 	return I.attack(src, user)


 /obj/item/proc/attack(mob/living/M, mob/living/user)
-	SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user)
+	if(SEND_SIGNAL(src, COMSIG_ITEM_ATTACK, M, user) & COMPONENT_ITEM_NO_ATTACK)
+		return
 	SEND_SIGNAL(user, COMSIG_MOB_ITEM_ATTACK, M, user)
 	if(item_flags & NOBLUDGEON)
 		return
@@ -1,6 +1,27 @@
-SUBSYSTEM_DEF(dcs)
+PROCESSING_SUBSYSTEM_DEF(dcs)
 	name = "Datum Component System"
-	flags = SS_NO_INIT | SS_NO_FIRE
+	flags = SS_NO_INIT
+	var/list/elements_by_type = list()

-/datum/controller/subsystem/dcs/Recover()
+/datum/controller/subsystem/processing/dcs/Recover()
 	comp_lookup = SSdcs.comp_lookup
+
+/datum/controller/subsystem/processing/dcs/proc/GetElement(datum/element/eletype, ...)
+	var/element_id = eletype
+
+	if(initial(eletype.element_flags) & ELEMENT_BESPOKE)
+		var/list/fullid = list("[eletype]")
+		for(var/i in initial(eletype.id_arg_index) to length(args))
+			var/argument = args[i]
+			if(istext(argument) || isnum(argument))
+				fullid += "[argument]"
+			else
+				fullid += "[REF(argument)]"
+		element_id = fullid.Join("&")
+
+	. = elements_by_type[element_id]
+	if(.)
+		return
+	if(!ispath(eletype, /datum/element))
+		CRASH("Attempted to instantiate [eletype] as a /datum/element")
+	. = elements_by_type[element_id] = new eletype
@@ -98,7 +98,7 @@ SUBSYSTEM_DEF(garbage)
 					state = SS_RUNNING
 				break

-	
+


 /datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK)
@@ -266,8 +266,8 @@ SUBSYSTEM_DEF(garbage)
 		D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED
 		var/start_time = world.time
 		var/start_tick = world.tick_usage
+		SEND_SIGNAL(D, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy
 		var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up.
-		SEND_SIGNAL(D, COMSIG_PARENT_QDELETED, force, hint) // Let the (remaining) components know about the result of Destroy
 		if(world.time != start_time)
 			I.slept_destroy++
 		else
@@ -87,7 +87,7 @@ SUBSYSTEM_DEF(traumas)
 					"skeletons" = typecacheof(list(/obj/item/organ/tongue/bone, /obj/item/clothing/suit/armor/bone, /obj/item/stack/sheet/bone,
 												 /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton,
 												 /obj/effect/decal/remains/human)),
-				   	"conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_security,
+					"conspiracies" = typecacheof(list(/obj/item/clothing/under/rank/captain, /obj/item/clothing/under/rank/head_of_security,
 												 /obj/item/clothing/under/rank/chief_engineer, /obj/item/clothing/under/rank/chief_medical_officer,
 												 /obj/item/clothing/under/rank/head_of_personnel, /obj/item/clothing/under/rank/research_director,
 												 /obj/item/clothing/under/rank/head_of_security/grey, /obj/item/clothing/under/rank/head_of_security/alt,
@@ -68,4 +68,4 @@
 				new /datum/hallucination/chat(owner, TRUE, FALSE, "<span class='hypnophrase'>[hypnotic_phrase]</span>")

 /datum/brain_trauma/hypnosis/handle_hearing(datum/source, list/hearing_args)
-	hearing_args[HEARING_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_MESSAGE], "<span class='hypnophrase'>$1</span>")
+	hearing_args[HEARING_RAW_MESSAGE] = target_phrase.Replace(hearing_args[HEARING_RAW_MESSAGE], "<span class='hypnophrase'>$1</span>")
@@ -241,7 +241,7 @@
 		if(prob(25))
 			var/deja_vu = pick_n_take(hear_dejavu)
 			var/static/regex/quoted_spoken_message = regex("\".+\"", "gi")
-			hearing_args[HEARING_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name
+			hearing_args[HEARING_RAW_MESSAGE] = quoted_spoken_message.Replace(hearing_args[HEARING_RAW_MESSAGE], "\"[deja_vu]\"") //Quotes included to avoid cases where someone says part of their name
 			return
 	if(hear_dejavu.len >= 15)
 		if(prob(50))
@@ -88,7 +88,7 @@

 		if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
 			addtimer(CALLBACK(src, .proc/freak_out, null, word), 10) //to react AFTER the chat message
-			hearing_args[HEARING_MESSAGE] = reg.Replace(hearing_args[HEARING_MESSAGE], "<span class='phobia'>$1</span>")
+			hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "<span class='phobia'>$1</span>")
 			break

 /datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
@@ -198,9 +198,9 @@
 /datum/brain_trauma/severe/split_personality/brainwashing/handle_hearing(datum/source, list/hearing_args)
 	if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == hearing_args[HEARING_SPEAKER])
 		return
-	var/message = hearing_args[HEARING_MESSAGE]
+	var/message = hearing_args[HEARING_RAW_MESSAGE]
 	if(findtext(message, codeword))
-		hearing_args[HEARING_MESSAGE] = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")
+		hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")
 		addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)

 /datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
@@ -184,6 +184,7 @@

 // The type arg is casted so initial works, you shouldn't be passing a real instance into this
 /datum/proc/GetComponent(datum/component/c_type)
+	RETURN_TYPE(c_type)
 	if(initial(c_type.dupe_mode) == COMPONENT_DUPE_ALLOWED)
 		stack_trace("GetComponent was called to get a component of which multiple copies could be on an object. This can easily break and should be changed. Type: \[[c_type]\]")
 	var/list/dc = datum_components
@@ -4,8 +4,9 @@
 	var/bonus_modifier = 0 //percentage increase to bonus item chance
 	var/butcher_sound = 'sound/weapons/slice.ogg' //sound played when butchering
 	var/butchering_enabled = TRUE
+	var/can_be_blunt = FALSE

-/datum/component/butchering/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled)
+/datum/component/butchering/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled, _can_be_blunt)
 	if(_speed)
 		speed = _speed
 	if(_effectiveness)
@@ -16,6 +17,22 @@
 		butcher_sound = _butcher_sound
 	if(disabled)
 		butchering_enabled = FALSE
+	if(_can_be_blunt)
+		can_be_blunt = _can_be_blunt
+	if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/onItemAttack)
+
+/datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user)
+	if(user.a_intent == INTENT_HARM && M.stat == DEAD && (M.butcher_results || M.guaranteed_butcher_results)) //can we butcher it?
+		if(butchering_enabled && (can_be_blunt || source.get_sharpness()))
+			INVOKE_ASYNC(src, .proc/startButcher, source, M, user)
+			return COMPONENT_ITEM_NO_ATTACK
+
+/datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user)
+	to_chat(user, "<span class='notice'>You begin to butcher [M]...</span>")
+	playsound(M.loc, butcher_sound, 50, TRUE, -1)
+	if(do_mob(user, M, speed) && M.Adjacent(source))
+		Butcher(user, M)

 /datum/component/butchering/proc/Butcher(mob/living/butcher, mob/living/meat)
 	var/turf/T = meat.drop_location()
@@ -50,3 +67,23 @@

 /datum/component/butchering/proc/ButcherEffects(mob/living/meat) //extra effects called on butchering, override this via subtypes
 	return
+
+///Special snowflake component only used for the recycler.
+/datum/component/butchering/recycler
+
+/datum/component/butchering/recycler/Initialize(_speed, _effectiveness, _bonus_modifier, _butcher_sound, disabled, _can_be_blunt)
+	if(!istype(parent, /obj/machinery/recycler)) //EWWW
+		return COMPONENT_INCOMPATIBLE
+	. = ..()
+	if(. == COMPONENT_INCOMPATIBLE)
+		return
+	RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/onCrossed)
+
+/datum/component/butchering/recycler/proc/onCrossed(datum/source, mob/living/L)
+	if(!istype(L))
+		return
+	var/obj/machinery/recycler/eater = parent
+	if(eater.safety_mode || (eater.stat & (BROKEN|NOPOWER))) //I'm so sorry.
+		return
+	if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
+		Butcher(parent, L)
@@ -1,30 +0,0 @@
-// An item worn in the ear slot with this component will heal your ears each
-// Life() tick, even if normally your ears would be too damaged to heal.
-
-/datum/component/earhealing
-	var/mob/living/carbon/wearer
-
-/datum/component/earhealing/Initialize()
-	if(!isitem(parent))
-		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged)
-
-/datum/component/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot)
-	if (slot == SLOT_EARS && istype(user))
-		if (!wearer)
-			START_PROCESSING(SSobj, src)
-		wearer = user
-	else
-		if (wearer)
-			STOP_PROCESSING(SSobj, src)
-		wearer = null
-
-/datum/component/earhealing/process()
-	if (!wearer)
-		STOP_PROCESSING(SSobj, src)
-		return
-	if(!HAS_TRAIT(wearer, TRAIT_DEAF))
-		var/obj/item/organ/ears/ears = wearer.getorganslot(ORGAN_SLOT_EARS)
-		if (ears)
-			ears.deaf = max(ears.deaf - 1, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged
-			ears.damage = max(ears.damage - 0.1, 0)
@@ -248,7 +248,7 @@
 	var/datum/hud/hud = owner.hud_used
 	screen_obj = new
 	hud.infodisplay += screen_obj
-	RegisterSignal(hud, COMSIG_PARENT_QDELETED, .proc/unmodify_hud)
+	RegisterSignal(hud, COMSIG_PARENT_QDELETING, .proc/unmodify_hud)
 	RegisterSignal(screen_obj, COMSIG_CLICK, .proc/hud_click)

 /datum/component/mood/proc/unmodify_hud(datum/source)
@@ -57,7 +57,7 @@
 	var/screen_start_x = 4								//These two are where the storage starts being rendered, screen_loc wise.
 	var/screen_start_y = 2
 	//End
-	
+
 	var/limited_random_access = FALSE					//Quick if statement in accessible_items to determine if we care at all about what people can access at once.
 	var/limited_random_access_stack_position = 0					//If >0, can only access top <x> items
 	var/limited_random_access_stack_bottom_up = FALSE				//If TRUE, above becomes bottom <x> items
@@ -647,9 +647,9 @@
 		if(M == viewing)
 			to_chat(usr, "<span class='notice'>You put [I] [insert_preposition]to [parent].</span>")
 		else if(in_range(M, viewing)) //If someone is standing close enough, they can tell what it is...
-			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", 1)
+			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", MSG_VISUAL)
 		else if(I && I.w_class >= 3) //Otherwise they can only see large or normal items from a distance...
-			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", 1)
+			viewing.show_message("<span class='notice'>[M] puts [I] [insert_preposition]to [parent].</span>", MSG_VISUAL)

 /datum/component/storage/proc/update_icon()
 	if(isobj(parent))
@@ -12,7 +12,7 @@
 		return COMPONENT_INCOMPATIBLE
 	var/mob/vr_M = parent
 	mastermind = M.mind
-	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED), .proc/game_over)
+	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
 	RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, .proc/switch_player)
 	RegisterSignal(mastermind, COMSIG_MIND_TRANSFER, .proc/switch_player)
 	you_die_in_the_game_you_die_for_real = yolo
@@ -32,7 +32,7 @@
 	current_mind = M.mind
 	quit_action.Grant(M)
 	RegisterSignal(quit_action, COMSIG_ACTION_TRIGGER, .proc/revert_to_reality)
-	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED), .proc/game_over)
+	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
 	RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/be_a_quitter)
 	RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, .proc/pass_me_the_remote)
 	RegisterSignal(current_mind, COMSIG_MIND_TRANSFER, .proc/pass_me_the_remote)
@@ -42,7 +42,7 @@

 /datum/component/virtual_reality/UnregisterFromParent()
 	quit_action.Remove(parent)
-	UnregisterSignal(parent, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED, COMSIG_MOB_KEY_CHANGE, COMSIG_MOB_GHOSTIZE))
+	UnregisterSignal(parent, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MOB_KEY_CHANGE, COMSIG_MOB_GHOSTIZE))
 	UnregisterSignal(current_mind, COMSIG_MIND_TRANSFER)
 	UnregisterSignal(quit_action, COMSIG_ACTION_TRIGGER)
 	current_mind = null
@@ -174,3 +174,13 @@
 /datum/dog_fashion/back/deathsquad
 	name = "Trooper REAL_NAME"
 	desc = "That's not red paint. That's real corgi blood."
+
+/datum/dog_fashion/head/colour
+	name = "Stylish REAL_NAME"
+	desc = "From the tips of their paws to the top of their head, they look like a made bed."
+	emote_see = list("tries to tap dances.","looks sadly at others outfits...","barks at bad fashion!")
+
+/datum/dog_fashion/head/telegram
+	name = "Messenger REAL_NAME"
+	desc = "Dont shoot the messenger..."
+	emote_see = list("licks an envelope.","looks ready to set off to send a letter...","works on barking!")
@@ -0,0 +1,39 @@
+/datum/element
+	var/element_flags = NONE
+	/**
+	  * The index of the first attach argument to consider for duplicate elements
+	  * Is only used when flags contains ELEMENT_BESPOKE
+	  * This is infinity so you must explicitly set this
+	  */
+	var/id_arg_index = INFINITY
+
+/datum/element/proc/Attach(datum/target)
+	if(type == /datum/element)
+		return ELEMENT_INCOMPATIBLE
+	if(element_flags & ELEMENT_DETACH)
+		RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Detach)
+
+/datum/element/proc/Detach(datum/source, force)
+	UnregisterSignal(source, COMSIG_PARENT_QDELETING)
+
+/datum/element/Destroy(force)
+	if(!force)
+		return QDEL_HINT_LETMELIVE
+	SSdcs.elements_by_type -= type
+	return ..()
+
+//DATUM PROCS
+
+/datum/proc/AddElement(eletype, ...)
+	var/datum/element/ele = SSdcs.GetElement(arglist(args))
+	args[1] = src
+	if(ele.Attach(arglist(args)) == ELEMENT_INCOMPATIBLE)
+		CRASH("Incompatible [eletype] assigned to a [type]! args: [json_encode(args)]")
+
+/**
+  * Finds the singleton for the element type given and detaches it from src
+  * You only need additional arguments beyond the type if you're using ELEMENT_BESPOKE
+  */
+/datum/proc/RemoveElement(eletype, ...)
+	var/datum/element/ele = SSdcs.GetElement(arglist(args))
+	ele.Detach(src)
@@ -1,13 +1,15 @@
-/datum/component/cleaning
-	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+/datum/element/cleaning/Attach(datum/target)
+	. = ..()
+	if(!ismovableatom(target))
+		return ELEMENT_INCOMPATIBLE
+	RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Clean)

-/datum/component/cleaning/Initialize()
-	if(!ismovableatom(parent))
-		return COMPONENT_INCOMPATIBLE
-	RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Clean)
+/datum/element/cleaning/Detach(datum/target)
+	. = ..()
+	UnregisterSignal(target, COMSIG_MOVABLE_MOVED)

-/datum/component/cleaning/proc/Clean()
-	var/atom/movable/AM = parent
+/datum/element/cleaning/proc/Clean(datum/source)
+	var/atom/movable/AM = source
 	var/turf/T = AM.loc
 	SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
 	for(var/A in T)
@@ -43,4 +45,4 @@
 				cleaned_human.clean_blood()
 				cleaned_human.wash_cream()
 				cleaned_human.regenerate_icons()
-				to_chat(cleaned_human, "<span class='danger'>[src] cleans your face!</span>")
+				to_chat(cleaned_human, "<span class='danger'>[src] cleans your face!</span>")
@@ -0,0 +1,37 @@
+
+/datum/element/earhealing
+	element_flags = ELEMENT_DETACH
+	var/list/user_by_item = list()
+
+/datum/element/earhealing/New()
+	START_PROCESSING(SSdcs, src)
+
+/datum/element/earhealing/Attach(datum/target)
+	. = ..()
+	if(!isitem(target))
+		return ELEMENT_INCOMPATIBLE
+
+	RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/equippedChanged)
+
+/datum/element/earhealing/Detach(datum/target)
+	. = ..()
+	UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
+	user_by_item -= target
+
+/datum/element/earhealing/proc/equippedChanged(datum/source, mob/living/carbon/user, slot)
+	if(slot == SLOT_EARS && istype(user))
+		user_by_item[source] = user
+	else
+		user_by_item -= source
+
+/datum/element/earhealing/process()
+	for(var/i in user_by_item)
+		var/mob/living/carbon/user = user_by_item[i]
+		if(HAS_TRAIT(user, TRAIT_DEAF))
+			continue
+		var/obj/item/organ/ears/ears = user.getorganslot(ORGAN_SLOT_EARS)
+		if(!ears)
+			continue
+		ears.deaf = max(ears.deaf - 0.25, (ears.damage < ears.maxHealth ? 0 : 1)) // Do not clear deafness if our ears are too damaged
+		ears.damage = max(ears.damage - 0.025, 0)
+		CHECK_TICK
@@ -1,6 +1,3 @@
-#define EMOTE_VISIBLE 1
-#define EMOTE_AUDIBLE 2
-
 /datum/emote
 	var/key = "" //What calls the emote
 	var/key_third_person = "" //This will also call the emote
@@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(explosions)
 			var/list/items = list()
 			for(var/I in T)
 				var/atom/A = I
-				if (!A.prevent_content_explosion()) //The atom/contents_explosion() proc returns null if the contents ex_acting has been handled by the atom, and TRUE if it hasn't.
+				if (!(A.flags_1 & PREVENT_CONTENTS_EXPLOSION_1)) //The atom/contents_explosion() proc returns null if the contents ex_acting has been handled by the atom, and TRUE if it hasn't.
 					items += A.GetAllContents()
 			for(var/O in items)
 				var/atom/A = O
@@ -91,7 +91,10 @@
 	if(current)	// remove ourself from our old body's mind variable
 		current.mind = null
 		SStgui.on_transfer(current, new_character)
-
+		if(iscarbon(current))
+			var/mob/living/carbon/C = current
+			if(C.combatmode)
+				C.toggle_combat_mode(TRUE, TRUE)
 	if(!language_holder)
 		var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
 		language_holder = mob_holder.copy(src)
@@ -53,3 +53,63 @@
 	mood_change = -20
 	timeout = 300
 	//special_screen_obj = "mood_happiness_bad" Originally in tg
+
+/datum/mood_event/eigenstate
+	mood_change = -3
+	description = "<span class='warning'>Where the hell am I? Is this an alternative dimension ?</span>\n"
+
+/datum/mood_event/enthrall
+	mood_change = 5
+
+/datum/mood_event/enthrall/add_effects(message)
+	description = "<span class='nicegreen'>[message]</span>\n"
+
+/datum/mood_event/enthrallpraise
+	mood_change = 10
+	timeout = 1 MINUTES
+
+/datum/mood_event/enthrallpraise/add_effects(message)
+	description = "<span class='nicegreen'>[message]</span>\n"
+
+/datum/mood_event/enthrallscold
+	mood_change = -10
+	timeout = 1 MINUTES
+
+/datum/mood_event/enthrallscold/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"//aaa I'm not kinky enough for this
+
+/datum/mood_event/enthrallmissing1
+	mood_change = -5
+
+/datum/mood_event/enthrallmissing1/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"
+
+/datum/mood_event/enthrallmissing2
+	mood_change = -10
+
+/datum/mood_event/enthrallmissing2/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"
+
+/datum/mood_event/enthrallmissing3
+	mood_change = -15
+
+/datum/mood_event/enthrallmissing3/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"
+
+/datum/mood_event/enthrallmissing4
+	mood_change = -25
+
+/datum/mood_event/enthrallmissing4/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"
+
+/datum/mood_event/InLove
+	mood_change = 10
+
+/datum/mood_event/InLove/add_effects(message)
+	description = "<span class='nicegreen'>[message]</span>\n"
+
+/datum/mood_event/MissingLove
+	mood_change = -10
+
+/datum/mood_event/MissingLove/add_effects(message)
+	description = "<span class='warning'>[message]</span>\n"
@@ -176,3 +176,25 @@

 /datum/mood_event/revenant_blight/add_effects()
 	description = "<span class='umbra'>Just give up, [pick("no one will miss you", "there is nothing you can do to help", "even a clown would be more useful than you", "does it even matter in the end?")]...</span>\n"
+
+/datum/mood_event/plushjack
+	description = "<span class='warning'>I have butchered a plush recently.</span>\n"
+	mood_change = -1
+	timeout = 2 MINUTES
+
+/datum/mood_event/plush_nostuffing
+	description = "<span class='warning'>A plush I tried to pet had no stuffing...</span>\n"
+	mood_change = -1
+	timeout = 2 MINUTES
+
+//Cursed stuff below
+
+/datum/mood_event/emptypred
+	description = "<span class='nicegreen'>I had to let someone out.</span>\n"
+	mood_change = -2
+	timeout = 1 MINUTES
+
+/datum/mood_event/emptyprey
+	description = "<span class='nicegreen'>It feels quite cold out here.</span>\n"
+	mood_change = -2
+	timeout = 1 MINUTES
@@ -113,3 +113,38 @@

 /datum/mood_event/happy_empath/add_effects(var/mob/happytarget)
 	description = "<span class='nicegreen'>[happytarget.name]'s happiness is infectious!</span>\n"
+
+/datum/mood_event/headpat
+	description = "<span class='nicegreen'>Headpats are nice.</span>\n"
+	mood_change = 2
+	timeout = 2 MINUTES
+
+/datum/mood_event/hugbox
+	description = "<span class='nicegreen'>I hugged a box of hugs recently.</span>\n"
+	mood_change = 1
+	timeout = 2 MINUTES
+
+/datum/mood_event/plushpet
+	description = "<span class='nicegreen'>I pet a plush recently.</span>\n"
+	mood_change = 1
+	timeout = 3000
+
+/datum/mood_event/plushplay
+	description = "<span class='nicegreen'>I've played with plushes recently.</span>\n"
+	mood_change = 3
+	timeout = 3000
+
+//Cursed stuff below.
+
+/datum/mood_event/orgasm
+	description = "<span class='userlove'>I came!</span>\n" //funny meme haha
+	mood_change = 3
+	timeout = 100 SECONDS
+
+/datum/mood_event/fedpred
+	description = "<span class='nicegreen'>I've devoured someone!</span>\n"
+	mood_change = 3
+
+/datum/mood_event/fedprey
+	description = "<span class='nicegreen'>It feels quite cozy in here.</span>\n"
+	mood_change = 3
@@ -541,6 +541,38 @@
 	icon_state = "ichorial_stain"
 	alerttooltipstyle = "clockcult"

+
+//GOLEM GANG
+
+/datum/status_effect/strandling //get it, strand as in durathread strand + strangling = strandling hahahahahahahahahahhahahaha i want to die
+	id = "strandling"
+	status_type = STATUS_EFFECT_UNIQUE
+	alert_type = /obj/screen/alert/status_effect/strandling
+
+/datum/status_effect/strandling/on_apply()
+	ADD_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
+	return ..()
+
+/datum/status_effect/strandling/on_remove()
+	REMOVE_TRAIT(owner, TRAIT_MAGIC_CHOKE, "dumbmoron")
+	return ..()
+
+/obj/screen/alert/status_effect/strandling
+	name = "Choking strand"
+	desc = "A magical strand of Durathread is wrapped around your neck, preventing you from breathing! Click this icon to remove the strand."
+	icon_state = "his_grace"
+	alerttooltipstyle = "hisgrace"
+
+/obj/screen/alert/status_effect/strandling/Click(location, control, params)
+	. = ..()
+	to_chat(mob_viewer, "<span class='notice'>You attempt to remove the durathread strand from around your neck.</span>")
+	if(do_after(mob_viewer, 35, null, mob_viewer))
+		if(isliving(mob_viewer))
+			var/mob/living/L = mob_viewer
+			to_chat(mob_viewer, "<span class='notice'>You succesfuly remove the durathread strand.</span>")
+			L.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+
+
 datum/status_effect/pacify
 	id = "pacify"
 	status_type = STATUS_EFFECT_REPLACE
@@ -316,9 +316,6 @@
 		to_chat(user, "<span class='warning'>You can't move while buckled to [src]!</span>")
 	return

-/atom/proc/prevent_content_explosion()
-	return FALSE
-
 /atom/proc/contents_explosion(severity, target)
 	return //For handling the effects of explosions on contents that would not normally be effected

@@ -189,7 +189,13 @@
 		if(tod)
 			var/tdelta = round(world.time - timeofdeath)
 			if(tdelta < (DEFIB_TIME_LIMIT * 10))
-				holder.icon_state = "huddefib"
+				var/obj/item/organ/heart/He = getorgan(/obj/item/organ/heart)
+				if(He)
+					holder.icon_state = "huddefib"
+					if(He.organ_flags & ORGAN_FAILING)
+						holder.icon_state = "huddefibheart"
+				else
+					holder.icon_state = "huddefibheart"
 				return
 		holder.icon_state = "huddead"
 	else
@@ -510,7 +510,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	var/added_threat = starting_rule.scale_up(extra_rulesets_amount, threat)
 	if (starting_rule.pre_execute())
 		spend_threat(starting_rule.cost + added_threat)
-		log_threat("[starting_rule.ruletype] - <b>[starting_rule.name]</b> -[starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat")
+		log_threat("[starting_rule.ruletype] - <b>[starting_rule.name]</b> -[starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE)
 		if(starting_rule.flags & HIGHLANDER_RULESET)
 			highlander_executed = TRUE
 		else if(starting_rule.flags & ONLY_RULESET)
@@ -605,7 +605,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 		new_rule.trim_candidates()
 		if (new_rule.ready(forced))
 			spend_threat(new_rule.cost)
-			log_threat("[new_rule.ruletype] - <b>[new_rule.name]</b> -[new_rule.cost] threat")
+			log_threat("[new_rule.ruletype] - <b>[new_rule.name]</b> -[new_rule.cost] threat", verbose = TRUE)
 			if (new_rule.execute()) // This should never fail since ready() returned 1
 				if(new_rule.flags & HIGHLANDER_RULESET)
 					highlander_executed = TRUE
@@ -626,7 +626,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	if (rule.execute())
 		log_game("DYNAMIC: Injected a [rule.ruletype == "latejoin" ? "latejoin" : "midround"] ruleset [rule.name].")
 		spend_threat(rule.cost)
-		log_threat("[rule.ruletype] [rule.name] spent [rule.cost]")
+		log_threat("[rule.ruletype] [rule.name] spent [rule.cost]", verbose = TRUE)
 		if(rule.flags & HIGHLANDER_RULESET)
 			highlander_executed = TRUE
 		else if(rule.flags & ONLY_RULESET)
@@ -815,16 +815,19 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 /// Refund threat, but no more than threat_level.
 /datum/game_mode/dynamic/proc/refund_threat(regain)
 	threat = min(threat_level,threat+regain)
+	log_threat("[regain] refunded. Threat is now [threat].", verbose = TRUE)

 /// Generate threat and increase the threat_level if it goes beyond, capped at 100
 /datum/game_mode/dynamic/proc/create_threat(gain)
 	threat = min(100, threat+gain)
 	if(threat > threat_level)
 		threat_level = threat
+	log_threat("[gain] created. Threat is now [threat] and threat level is now [threat_level].", verbose = TRUE)

 /// Expend threat, can't fall under 0.
 /datum/game_mode/dynamic/proc/spend_threat(cost)
 	threat = max(threat-cost,0)
+	log_threat("[cost] spent. Threat is now [threat].", verbose = TRUE)

 /// Turns the value generated by lorentz distribution to threat value between 0 and 100.
 /datum/game_mode/dynamic/proc/lorentz_to_threat(x)
@@ -12,6 +12,7 @@
 	density = FALSE
 	state_open = TRUE
 	circuit = /obj/item/circuitboard/machine/sleeper
+	req_access = list(ACCESS_CMO) //Used for reagent deletion and addition of non medicines
 	var/efficiency = 1
 	var/min_health = -25
 	var/list/available_chems
@@ -28,9 +29,27 @@

 /obj/machinery/sleeper/Initialize()
 	. = ..()
+	create_reagents(500, NO_REACT)
 	occupant_typecache = GLOB.typecache_living
 	update_icon()
 	reset_chem_buttons()
+	RefreshParts()
+	add_inital_chems()
+
+/obj/machinery/sleeper/on_deconstruction()
+	var/obj/item/reagent_containers/sleeper_buffer/buffer = new (loc)
+	buffer.volume = reagents.maximum_volume
+	buffer.reagents.maximum_volume = reagents.maximum_volume
+	reagents.trans_to(buffer.reagents, reagents.total_volume)
+
+/obj/machinery/sleeper/proc/add_inital_chems()
+	for(var/i in available_chems)
+		var/datum/reagent/R = reagents.has_reagent(i)
+		if(!R)
+			reagents.add_reagent(i, (20))
+			continue
+		if(R.volume < 20)
+			reagents.add_reagent(i, (20 - R.volume))

 /obj/machinery/sleeper/RefreshParts()
 	var/E
@@ -47,6 +66,11 @@
 		available_chems |= possible_chems[i]
 	reset_chem_buttons()

+	//Total container size 500 - 2000u
+	if(reagents)
+		reagents.maximum_volume = (500*E)
+
+
 /obj/machinery/sleeper/update_icon()
 	icon_state = initial(icon_state)
 	if(state_open)
@@ -81,7 +105,42 @@
 	if (. & EMP_PROTECT_SELF)
 		return
 	if(is_operational() && occupant)
+		var/datum/reagent/R = pick(reagents.reagent_list)
+		inject_chem(R.id, occupant)
 		open_machine()
+	//Is this too much?
+	if(severity == EMP_HEAVY)
+		var/chem = pick(available_chems)
+		available_chems -= chem
+		available_chems += get_random_reagent_id()
+		reset_chem_buttons()
+
+/obj/machinery/sleeper/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/reagent_containers/sleeper_buffer))
+		var/obj/item/reagent_containers/sleeper_buffer/SB = I
+		if((SB.reagents.total_volume + reagents.total_volume) < reagents.maximum_volume)
+			SB.reagents.trans_to(reagents, SB.reagents.total_volume)
+			visible_message("[user] places the [SB] into the [src].")
+			qdel(SB)
+			return
+		else
+			SB.reagents.trans_to(reagents, SB.reagents.total_volume)
+			visible_message("[user] adds as much as they can to the [src] from the [SB].")
+			return
+	if(istype(I, /obj/item/reagent_containers))
+		var/obj/item/reagent_containers/RC = I
+		if(RC.reagents.total_volume == 0)
+			to_chat(user, "<span class='notice'>The [I] is empty!</span>")
+		for(var/datum/reagent/R in RC.reagents.reagent_list)
+			if((obj_flags & EMAGGED) || (allowed(usr)))
+				break
+			if(!istype(R, /datum/reagent/medicine))
+				visible_message("The [src] gives out a hearty boop and rejects the [I]. The Sleeper's screen flashes with a pompous \"Medicines only, please.\"")
+				return
+		RC.reagents.trans_to(reagents, 1000)
+		visible_message("[user] adds as much as they can to the [src] from the [I].")
+		return
+

 /obj/machinery/sleeper/MouseDrop_T(mob/target, mob/user)
 	if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())
@@ -141,18 +200,24 @@

 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "sleeper", name, 375, 550, master_ui, state)
+		ui = new(user, src, ui_key, "sleeper", name, 550, 700, master_ui, state)
 		ui.open()

 /obj/machinery/sleeper/ui_data()
 	var/list/data = list()
 	data["occupied"] = occupant ? 1 : 0
 	data["open"] = state_open
+	data["efficiency"] = efficiency
+	data["current_vol"] = reagents.total_volume
+	data["tot_capacity"] = reagents.maximum_volume

 	data["chems"] = list()
 	for(var/chem in available_chems)
-		var/datum/reagent/R = GLOB.chemical_reagents_list[chem]
-		data["chems"] += list(list("name" = R.name, "id" = R.id, "allowed" = chem_allowed(chem)))
+		var/datum/reagent/R = reagents.has_reagent(chem)
+		R = GLOB.chemical_reagents_list[chem]
+		data["synthchems"] += list(list("name" = R.name, "id" = R.id, "synth_allowed" = synth_allowed(chem)))
+	for(var/datum/reagent/R in reagents.reagent_list)
+		data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "purity" = R.purity, "allowed" = chem_allowed(R.id)))

 	data["occupant"] = list()
 	var/mob/living/mob_occupant = occupant
@@ -184,8 +249,15 @@
 		if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)
 				data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume))
+		data["occupant"]["failing_organs"] = list()
+		var/mob/living/carbon/C = mob_occupant
+		if(C)
+			for(var/obj/item/organ/Or in C.getFailingOrgans())
+				if(istype(Or, /obj/item/organ/brain))
+					continue
+				data["occupant"]["failing_organs"] += list(list("name" = Or.name))
+
 		if(mob_occupant.has_dna()) // Blood-stuff is mostly a copy-paste from the healthscanner.
-			var/mob/living/carbon/C = mob_occupant
 			var/blood_id = C.get_blood_id()
 			if(blood_id)
 				data["occupant"]["blood"] = list() // We can start populating this list.
@@ -196,7 +268,7 @@
 						blood_type = R.name
 					else
 						blood_type = blood_id
-				data["occupant"]["blood"]["maxBloodVolume"] = BLOOD_VOLUME_NORMAL
+				data["occupant"]["blood"]["maxBloodVolume"] = (BLOOD_VOLUME_NORMAL*C.blood_ratio)
 				data["occupant"]["blood"]["currentBloodVolume"] = C.blood_volume
 				data["occupant"]["blood"]["dangerBloodVolume"] = BLOOD_VOLUME_SAFE
 				data["occupant"]["blood"]["bloodType"] = blood_type
@@ -216,24 +288,49 @@
 			. = TRUE
 		if("inject")
 			var/chem = params["chem"]
+			var/amount = text2num(params["volume"])
 			if(!is_operational() || !mob_occupant)
 				return
 			if(mob_occupant.health < min_health && chem != "epinephrine")
 				return
-			if(inject_chem(chem, usr))
+			if(inject_chem(chem, usr, amount))
 				. = TRUE
 				if(scrambled_chems && prob(5))
 					to_chat(usr, "<span class='warning'>Chemical system re-route detected, results may not be as expected!</span>")
+		if("synth")
+			var/chem = params["chem"]
+			if(!is_operational())
+				return
+			reagents.add_reagent(chem_buttons[chem], 10) //other_purity = 0.75 for when the mechanics are in
+		if("purge")
+			var/chem = params["chem"]
+			if(allowed(usr))
+				if(!is_operational())
+					return
+				reagents.remove_reagent(chem, 10)
+				return
+			if(chem in available_chems)
+				if(!is_operational())
+					return
+				/*var/datum/reagent/R = reagents.has_reagent(chem) //For when purity effects are in
+				if(R.purity < 0.8)*/
+				reagents.remove_reagent(chem, 10)
+			else
+				visible_message("<span class='warning'>Access Denied.</span>")
+				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
+

 /obj/machinery/sleeper/emag_act(mob/user)
 	. = ..()
+	obj_flags |= EMAGGED
 	scramble_chem_buttons()
 	to_chat(user, "<span class='warning'>You scramble the sleeper's user interface!</span>")
 	return TRUE

-/obj/machinery/sleeper/proc/inject_chem(chem, mob/user)
-	if((chem in available_chems) && chem_allowed(chem))
-		occupant.reagents.add_reagent(chem_buttons[chem], 10) //emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU
+//trans to
+/obj/machinery/sleeper/proc/inject_chem(chem, mob/user, volume = 10)
+	if(chem_allowed(chem))
+		reagents.trans_id_to(occupant, chem, volume)//emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU
 		if(user)
 			log_combat(user, occupant, "injected [chem] into", addition = "via [src]")
 		return TRUE
@@ -246,6 +343,14 @@
 	var/occ_health = mob_occupant.health > min_health || chem == "epinephrine"
 	return amount && occ_health

+/obj/machinery/sleeper/proc/synth_allowed(chem)
+	var/datum/reagent/R = reagents.has_reagent(chem)
+	if(!R)
+		return TRUE
+	if(R.volume < 50)
+		return TRUE
+	return FALSE
+
 /obj/machinery/sleeper/proc/reset_chem_buttons()
 	scrambled_chems = FALSE
 	LAZYINITLIST(chem_buttons)
@@ -42,12 +42,6 @@
 	. = ..()
 	GLOB.shuttle_caller_list += src

-/obj/machinery/computer/communications/process()
-	if(..())
-		var/ai_autoupdate = aistate != STATE_STATUSDISPLAY && aistate != STATE_CALLSHUTTLE && aistate != STATE_PURCHASE && aistate != STATE_VIEWMESSAGE
-		var/machine_user_autoupdate = state != STATE_STATUSDISPLAY && state != STATE_CALLSHUTTLE && state != STATE_PURCHASE && state != STATE_VIEWMESSAGE
-		updateDialog(machine_user_autoupdate,ai_autoupdate)
-
 /obj/machinery/computer/communications/Topic(href, href_list)
 	if(..())
 		return
@@ -586,8 +580,6 @@

 	popup.set_content(dat)
 	popup.open()
-	popup.set_content(dat)
-	popup.open()

 /obj/machinery/computer/communications/proc/get_javascript_header(form_id)
 	var/dat = {"<script type="text/javascript">
@@ -18,8 +18,8 @@
 	var/item_recycle_sound = 'sound/items/welder.ogg'

 /obj/machinery/recycler/Initialize()
+	AddComponent(/datum/component/butchering/recycler, 1, amount_produced,amount_produced/5)
 	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
-	AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
 	. = ..()
 	update_icon()
 	req_one_access = get_all_accesses() + get_all_centcom_access()
@@ -35,7 +35,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	materials.max_amount = mat_mod
 	amount_produced = min(50, amt_made) + 50
-	var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
+	var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering/recycler)
 	butchering.effectiveness = amount_produced
 	butchering.bonus_modifier = amount_produced/5

@@ -83,20 +83,24 @@
 		is_powered = FALSE
 	icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end

-/obj/machinery/recycler/Bumped(atom/movable/AM)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
+/obj/machinery/recycler/CanPass(atom/movable/AM)
+	. = ..()
 	if(!anchored)
 		return
-	if(safety_mode)
-		return

 	var/move_dir = get_dir(loc, AM.loc)
 	if(move_dir == eat_dir)
-		eat(AM)
+		return TRUE
+
+/obj/machinery/recycler/Crossed(atom/movable/AM)
+	eat(AM)
+	. = ..()

 /obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+	if(stat & (BROKEN|NOPOWER))
+		return
+	if(safety_mode)
+		return
 	var/list/to_eat
 	if(isitem(AM0))
 		to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
@@ -194,9 +198,6 @@
 	// Instantly lie down, also go unconscious from the pain, before you die.
 	L.Unconscious(100)
 	L.adjustBruteLoss(crush_damage)
-	if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
-		var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
-		butchering.Butcher(src,L)

 /obj/machinery/recycler/deathtrap
 	name = "dangerous old crusher"
@@ -86,7 +86,7 @@
 					else if(isobj(mobtype))
 						race = "Machinery"

-					else if(ispath(mobtype, ))
+					else if(ispath(mobtype, /mob/living/simple_animal))
 						race = "Domestic Animal"

 					else
@@ -426,7 +426,7 @@
 						))
 						// this will log the signal and transmit it to the target
 						linkedServer.receive_information(signal, null)
-						usr.log_message("(PDA: [name]) sent \"[custommessage]\" to [signal.format_target()]", LOG_PDA)
+						usr.log_message("(PDA: [name] | [usr.real_name]) sent \"[custommessage]\" to [signal.format_target()]", LOG_PDA)


 		//Request Console Logs - KEY REQUIRED
@@ -35,7 +35,7 @@
 		signal.data["slow"] += rand(1, 5) // slow the signal down only slightly

 	// Try sending it!
-	var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster, /obj/machinery/telecomms/bus)
+	var/list/try_send = list(signal.server_type, /obj/machinery/telecomms/hub, /obj/machinery/telecomms/broadcaster)

 	var/i = 0
 	for(var/send in try_send)
@@ -39,5 +39,5 @@
 	network = "tcommsat"
 	autolinkers = list("hub", "relay", "s_relay", "m_relay", "r_relay", "h_relay", "science", "medical",
 	"supply", "service", "common", "command", "engineering", "security",
-	"receiverA", "receiverB", "broadcasterA", "broadcasterB")
+	"receiverA", "receiverB", "broadcasterA", "broadcasterB", "autorelay")

@@ -49,6 +49,11 @@
 /obj/machinery/telecomms/relay/preset
 	network = "tcommsat"

+/obj/machinery/telecomms/relay/Initialize(mapload)
+	. = ..()
+	if(autolinkers.len) //We want lateloaded presets to autolink (lateloaded aways/ruins/shuttles)
+		return INITIALIZE_HINT_LATELOAD
+
 /obj/machinery/telecomms/relay/preset/station
 	id = "Station Relay"
 	autolinkers = list("s_relay")
@@ -74,3 +79,8 @@
 	icon = 'icons/obj/clockwork_objects.dmi'
 	hide = TRUE
 	autolinkers = list("h_relay")
+
+//Generic preset relay
+/obj/machinery/telecomms/relay/preset/auto
+	hide = TRUE
+	autolinkers = list("autorelay")
@@ -107,6 +107,7 @@ GLOBAL_LIST_EMPTY(telecomms_list)
 			for(var/x in autolinkers)
 				if(x in T.autolinkers)
 					links |= T
+					T.links |= src

 /obj/machinery/telecomms/update_icon()
 	if(on)
@@ -20,7 +20,7 @@

 /obj/item/mecha_parts/mecha_equipment/drill/Initialize()
 	. = ..()
-	AddComponent(/datum/component/butchering, 50, 100)
+	AddComponent(/datum/component/butchering, 50, 100, null, null, TRUE)

 /obj/item/mecha_parts/mecha_equipment/drill/action(atom/target)
 	if(!action_checks(target))
@@ -234,5 +234,5 @@
 /obj/effect/turf_decal/trimline/neutral/filled/corner
 	icon_state = "trimline_corner_fill"

-/obj/effect/turf_decal/trimline/brown/filled/end
+/obj/effect/turf_decal/trimline/neutral/filled/end
 	icon_state = "trimline_end_fill"
@@ -81,6 +81,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)

 	var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
 	var/heat = 0
+	///All items with sharpness of IS_SHARP or higher will automatically get the butchering component.
 	var/sharpness = IS_BLUNT

 	var/tool_behaviour = NONE
@@ -139,6 +140,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	else if (!istype(embedding, /datum/embedding_behavior))
 		stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize()")

+	if(sharpness) //give sharp objects butchering functionality, for consistency
+		AddComponent(/datum/component/butchering, 80 * toolspeed)
+
 /obj/item/Destroy()
 	item_flags &= ~DROPDEL	//prevent reqdels
 	if(ismob(loc))
@@ -393,13 +397,14 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		return
 	if(over == src)
 		return usr.client.Click(src, src_location, src_control, params)
-	var/list/directaccess = usr.DirectAccess()
+	var/list/directaccess = usr.DirectAccess()	//This, specifically, is what requires the copypaste. If this were after the adjacency check, then it'd be impossible to use items in your inventory, among other things.
+												//If this were before the above checks, then trying to click on items would act a little funky and signal overrides wouldn't work.
 	if((usr.CanReach(src) || (src in directaccess)) && (usr.CanReach(over) || (over in directaccess)))
 		if(!usr.get_active_held_item())
 			usr.UnarmedAttack(src, TRUE)
 			if(usr.get_active_held_item() == src)
 				melee_attack_chain(usr, over)
-			return
+			return TRUE //returning TRUE as a "is this overridden?" flag
 	if(!Adjacent(usr) || !over.Adjacent(usr))
 		return // should stop you from dragging through windows

@@ -998,4 +998,4 @@
 		/obj/item/stack/sheet/glass = 2,
 		/obj/item/stock_parts/capacitor = 1,
 		/obj/item/stack/cable_coil = 5,
-		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
+		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems
@@ -104,7 +104,7 @@

 /obj/item/defibrillator/MouseDrop(obj/over_object)
 	. = ..()
-	if(ismob(loc))
+	if(!. && ismob(loc) && loc == usr)
 		var/mob/M = loc
 		if(!M.incapacitated() && istype(over_object, /obj/screen/inventory/hand))
 			var/obj/screen/inventory/hand/H = over_object
@@ -762,5 +762,3 @@
 	desc = "An upgrade to the defibrillator capacitors, which let it charge faster"
 	icon_state = "fast_disk"
 	materials = list(MAT_METAL=16000, MAT_GLASS = 8000, MAT_GOLD = 26000, MAT_SILVER = 26000)
-
-#undef HALFWAYCRITDEATH
@@ -1044,7 +1044,7 @@ GLOBAL_LIST_EMPTY(PDAs)

 	if (ismob(loc))
 		var/mob/M = loc
-		M.show_message("<span class='userdanger'>Your [src] explodes!</span>", 1)
+		M.show_message("<span class='userdanger'>Your [src] explodes!</span>", MSG_VISUAL, "<span class='warning'>You hear a loud *pop*!</span>", MSG_AUDIBLE)
 	else
 		visible_message("<span class='danger'>[src] explodes!</span>", "<span class='warning'>You hear a loud *pop*!</span>")

@@ -24,6 +24,7 @@
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
+	rad_flags = RAD_PROTECT_CONTENTS //So the cartridges dont annoyingly get irradiated, and the signallers inside being radded as well

 	var/obj/item/integrated_signaler/radio = null

@@ -689,15 +690,16 @@ Code:
 				active_bot = null

 			if("summon") //Args are in the correct order, they are stated here just as an easy reminder.
-				active_bot.bot_control(command= "summon", user_turf= get_turf(usr), user_access= host_pda.GetAccess())
+				active_bot.bot_control("summon", usr, host_pda.GetAccess())

 			else //Forward all other bot commands to the bot itself!
-				active_bot.bot_control(command= href_list["op"], user= usr)
+				active_bot.bot_control(href_list["op"], usr)
 		playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 	if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work.
-
-		active_bot.bot_control(href_list["mule"], usr, TRUE)
+		var/mob/living/simple_animal/bot/mulebot/mule = active_bot
+		if (istype(mule))
+			active_bot.bot_control(href_list["mule"], usr, TRUE)

 	if(!host_pda)
 		return
@@ -72,12 +72,12 @@
 				difficulty += 2
 		var/datum/component/uplink/hidden_uplink = target.GetComponent(/datum/component/uplink)
 		if(!target.detonatable || prob(difficulty * 15) || (hidden_uplink))
-			U.show_message("<span class='danger'>An error flashes on your [src].</span>", 1)
+			U.show_message("<span class='danger'>An error flashes on your [src].</span>", MSG_VISUAL)
 		else
 			message_admins("[!is_special_character(U) ? "Non-antag " : ""][ADMIN_LOOKUPFLW(U)] triggered a PDA explosion on [target.name] at [ADMIN_VERBOSEJMP(target)].")
 			var/message_log = "triggered a PDA explosion on [target.name] at [AREACOORD(target)]."
 			U.log_message(message_log, LOG_ATTACK)
-			U.show_message("<span class='notice'>Success!</span>", 1)
+			U.show_message("<span class='notice'>Success!</span>", MSG_VISUAL)
 			target.explode()
 	else
 		to_chat(U, "PDA not found.")
@@ -431,6 +431,7 @@
 	icon_state = "glowstick"
 	item_state = "glowstick"
 	grind_results = list("phenol" = 15, "hydrogen" = 10, "oxygen" = 5) //Meth-in-a-stick
+	rad_flags = RAD_NO_CONTAMINATE
 	var/fuel = 0

 /obj/item/flashlight/glowstick/Initialize()
@@ -131,232 +131,228 @@ SLIME SCANNER
 		mob_status = "<span class='alert'><b>Deceased</b></span>"
 		oxy_loss = max(rand(1, 40), oxy_loss, (300 - (tox_loss + fire_loss + brute_loss))) // Random oxygen loss

-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		if(H.undergoing_cardiac_arrest() && H.stat != DEAD)
-			to_chat(user, "<span class='danger'>Subject suffering from heart attack: Apply defibrillation or other electric shock immediately!</span>")
-		if(H.undergoing_liver_failure() && H.stat != DEAD) //might be depreciated BUG_PROBABLE_CAUSE
-			to_chat(user, "<span class='danger'>Subject is suffering from liver failure: Apply Corazone and begin a liver transplant immediately!</span>")
-
-	var/msg = "<span class='info'>*---------*\nAnalyzing results for [M]:\n\tOverall status: [mob_status]\n"
+	var/msg = "<span class='info'>*---------*\nAnalyzing results for [M]:\n\tOverall status: [mob_status]"

 	// Damage descriptions
 	if(brute_loss > 10)
-		msg += "\t<span class='alert'>[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.</span>\n"
+		msg += "\n\t<span class='alert'>[brute_loss > 50 ? "Severe" : "Minor"] tissue damage detected.</span>"
 	if(fire_loss > 10)
-		msg += "\t<span class='alert'>[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.</span>\n"
+		msg += "\n\t<span class='alert'>[fire_loss > 50 ? "Severe" : "Minor"] burn damage detected.</span>"
 	if(oxy_loss > 10)
-		msg += "\t<span class='info'><span class='alert'>[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.</span>\n"
+		msg += "\n\t<span class='info'><span class='alert'>[oxy_loss > 50 ? "Severe" : "Minor"] oxygen deprivation detected.</span>"
 	if(tox_loss > 10)
-		msg += "\t<span class='alert'>[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.</span>\n"
+		msg += "\n\t<span class='alert'>[tox_loss > 50 ? "Severe" : "Minor"] amount of toxin damage detected.</span>"
 	if(M.getStaminaLoss())
-		msg += "\t<span class='alert'>Subject appears to be suffering from fatigue.</span>\n"
+		msg += "\n\t<span class='alert'>Subject appears to be suffering from fatigue.</span>"
 		if(advanced)
-			msg += "\t<span class='info'>Fatigue Level: [M.getStaminaLoss()]%.</span>\n"
+			msg += "\n\t<span class='info'>Fatigue Level: [M.getStaminaLoss()]%.</span>"
 	if (M.getCloneLoss())
-		msg += "\t<span class='alert'>Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.</span>\n"
+		msg += "\n\t<span class='alert'>Subject appears to have [M.getCloneLoss() > 30 ? "Severe" : "Minor"] cellular damage.</span>"
 		if(advanced)
-			msg += "\t<span class='info'>Cellular Damage Level: [M.getCloneLoss()].</span>\n"
-	if (!M.getorgan(/obj/item/organ/brain))
-		to_chat(user, "\t<span class='alert'>Subject lacks a brain.</span>") //Unsure how this won't proc for 50% of the cit playerbase (This is a joke everyone on cit a cute.)
-	if(ishuman(M) && advanced) // Should I make this not advanced?
-		var/mob/living/carbon/human/H = M
-		var/obj/item/organ/liver/L = H.getorganslot("liver")
-		if(L)
-			if(L.swelling > 20)
-				msg += "\t<span class='danger'>Subject is suffering from an enlarged liver.</span>\n" //i.e. shrink their liver or give them a transplant.
-		else
-			msg += "\t<span class='danger'>Subject's liver is missing.</span>\n"
-		var/obj/item/organ/tongue/T = H.getorganslot("tongue")
-		if(T)
-			if(T.damage > 40)
-				msg += "\t<span class='danger'>Subject is suffering from severe burn tissue on their tongue.</span>\n" //i.e. their tongue is shot
-			if(T.name == "fluffy tongue")
-				msg += "\t<span class='danger'>Subject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.</span>\n"
-		else
-			msg += "\t<span class='danger'>Subject's tongue is missing.</span>\n"
-		var/obj/item/organ/lungs/Lung = H.getorganslot("lungs")
-		if(Lung)
-			if(Lung.damage > 150)
-				msg += "\t<span class='danger'>Subject is suffering from acute emphysema leading to trouble breathing.</span>\n" //i.e. Their lungs are shot
-		else
-			msg += "\t<span class='danger'>Subject's lungs have collapsed from trauma!</span>\n"
-		var/obj/item/organ/genital/penis/P = H.getorganslot("penis")
-		if(P)
-			if(P.length>20)
-				msg += "\t<span class='info'>Subject has a sizeable gentleman's organ at [P.length] inches.</span>\n"
-		var/obj/item/organ/genital/breasts/Br = H.getorganslot("breasts")
-		if(Br)
-			if(Br.cached_size>5)
-				msg += "\t<span class='info'>Subject has a sizeable bosom with a [Br.size] cup.</span>\n"
-
-		if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200 || !M.getorgan(/obj/item/organ/brain))
-			msg += "\t<span class='alert'>Subject's brain function is non-existent.</span>\n"
-		else if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
-			msg += "\t<span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>\n"
-		else if (M.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45)
-			msg += "\t<span class='alert'>Brain damage detected.</span>\n"
-
-	if(iscarbon(M))
-		var/mob/living/carbon/C = M
-		if(LAZYLEN(C.get_traumas()))
-			var/list/trauma_text = list()
-			for(var/datum/brain_trauma/B in C.get_traumas())
-				var/trauma_desc = ""
-				switch(B.resilience)
-					if(TRAUMA_RESILIENCE_SURGERY)
-						trauma_desc += "severe "
-					if(TRAUMA_RESILIENCE_LOBOTOMY)
-						trauma_desc += "deep-rooted "
-					if(TRAUMA_RESILIENCE_MAGIC, TRAUMA_RESILIENCE_ABSOLUTE)
-						trauma_desc += "permanent "
-				trauma_desc += B.scan_desc
-				trauma_text += trauma_desc
-			msg += "\t<span class='alert'>Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].</span>\n"
-		if(C.roundstart_quirks.len)
-			msg += "\t<span class='info'>Subject has the following physiological traits: [C.get_trait_string()].</span>\n"
-	if(advanced)
-		msg += "\t<span class='info'>Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.</span>\n"
-	if(M.radiation)
-		msg += "\t<span class='alert'>Subject is irradiated.</span>\n"
-		msg += "\t<span class='info'>Radiation Level: [M.radiation] rad</span>\n"
-
-	if(advanced && M.hallucinating())
-		msg += "\t<span class='info'>Subject is hallucinating.</span>\n"
-
-	//MKUltra
-	if(advanced && M.has_status_effect(/datum/status_effect/chem/enthrall))
-		msg += "\t<span class='info'>Subject has abnormal brain fuctions.</span>\n"
-
-	//Astrogen shenanigans
-	if(advanced && M.reagents.has_reagent("astral"))
-		if(M.mind)
-			msg += "\t<span class='danger'>Warning: subject may be possesed.</span>\n"
-		else
-			msg += "\t<span class='notice'>Subject appears to be astrally projecting.</span>\n"
-
-	//Eyes and ears
-	if(advanced)
-		if(iscarbon(M))
-			var/mob/living/carbon/C = M
-			var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS)
-			msg += "\t<span class='info'><b>==EAR STATUS==</b></span>\n"
-			if(istype(ears))
-				var/healthy = TRUE
-				if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))
-					healthy = FALSE
-					msg += "\t<span class='alert'>Subject is genetically deaf.</span>\n"
-				else if(HAS_TRAIT(C, TRAIT_DEAF))
-					healthy = FALSE
-					msg += "\t<span class='alert'>Subject is deaf.</span>\n"
-				else
-					if(ears.damage)
-						to_chat(user, "\t<span class='alert'>Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.</span>")
-						healthy = FALSE
-					if(ears.deaf)
-						to_chat(user, "\t<span class='alert'>Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.</span>")
-						healthy = FALSE
-				if(healthy)
-					msg += "\t<span class='info'>Healthy.</span>\n"
-			else
-				msg += "\t<span class='alert'>Subject does not have ears.</span>\n"
-			var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES)
-			msg += "\t<span class='info'><b>==EYE STATUS==</b></span>\n"
-			if(istype(eyes))
-				var/healthy = TRUE
-				if(HAS_TRAIT(C, TRAIT_BLIND))
-					msg += "\t<span class='alert'>Subject is blind.</span>\n"
-					healthy = FALSE
-				if(HAS_TRAIT(C, TRAIT_NEARSIGHT))
-					msg += "\t<span class='alert'>Subject is nearsighted.</span>\n"
-					healthy = FALSE
-				if(eyes.damage > 30)
-					msg += "\t<span class='alert'>Subject has severe eye damage.</span>\n"
-					healthy = FALSE
-				else if(eyes.damage > 20)
-					msg += "\t<span class='alert'>Subject has significant eye damage.</span>\n"
-					healthy = FALSE
-				else if(eyes.damage)
-					msg += "\t<span class='alert'>Subject has minor eye damage.</span>\n"
-					healthy = FALSE
-				if(healthy)
-					msg += "\t<span class='info'>Healthy.</span>\n"
-			else
-				msg += "\t<span class='alert'>Subject does not have eyes.</span>\n"
+			msg += "\n\t<span class='info'>Cellular Damage Level: [M.getCloneLoss()].</span>"


-	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
-		var/ldamage = H.return_liver_damage()
-		if(ldamage > 10)
-			msg += "\t<span class='alert'>[ldamage > 45 ? "Severe" : "Minor"] liver damage detected.</span>\n"
+	to_chat(user, msg)
+	msg = ""

 	// Body part damage report
+	var/list/dmgreport = list()
 	if(iscarbon(M) && mode == 1)
 		var/mob/living/carbon/C = M
 		var/list/damaged = C.get_damaged_bodyparts(1,1)
 		if(length(damaged)>0 || oxy_loss>0 || tox_loss>0 || fire_loss>0)
-			msg += "<span class='info'>\tDamage: <span class='info'><font color='red'>Brute</font></span>-<font color='#FF8000'>Burn</font>-<font color='green'>Toxin</font>-<font color='blue'>Suffocation</font>\n\t\tSpecifics: <font color='red'>[brute_loss]</font>-<font color='#FF8000'>[fire_loss]</font>-<font color='green'>[tox_loss]</font>-<font color='blue'>[oxy_loss]</font></span>\n"
-			for(var/obj/item/bodypart/org in damaged)
-				msg += "\t\t<span class='info'>[capitalize(org.name)]: [(org.brute_dam > 0) ? "<font color='red'>[org.brute_dam]</font></span>" : "<font color='red'>0</font>"]-[(org.burn_dam > 0) ? "<font color='#FF8000'>[org.burn_dam]</font>" : "<font color='#FF8000'>0</font>"]\n"
+			dmgreport += "<table style='margin-left:33px'><tr><font face='Verdana'>\
+							<td style='width: 90px;'><font color='#0000CC'>Damage:</font></td>\
+							<td style='width: 55px;'><font color='red'><b>Brute</b></font></td>\
+							<td style='width: 45px;'><font color='orange'><b>Burn</b></font></td>\
+							<td style='width: 45px;'><font color='green'><b>Toxin</b></font></td>\
+							<td style='width: 90px;'><font color='purple'><b>Suffocation</b></font></td></tr>\
+							<tr><td><font color='#0000CC'>Overall:</font></td>\
+							<td><font color='red'>[brute_loss]</font></td>\
+							<td><font color='orange'>[fire_loss]</font></td>\
+							<td><font color='green'>[tox_loss]</font></td>\
+							<td><font color='purple'>[oxy_loss]</font></td></tr>"
+
+			for(var/o in damaged)
+				var/obj/item/bodypart/org = o //head, left arm, right arm, etc.
+				dmgreport += "<tr><td><font color='#0000CC'>[capitalize(org.name)]:</font></td>\
+								<td><font color='red'>[(org.brute_dam > 0) ? "[org.brute_dam]" : "0"]</font></td>\
+								<td><font color='orange'>[(org.burn_dam > 0) ? "[org.burn_dam]" : "0"]</font></td></tr>"
+			dmgreport += "</table>"
+			to_chat(user, dmgreport.Join())
+

 	//Organ damages report
-	if(ishuman(M))
+	var/heart_ded = FALSE
+	if(iscarbon(M))
+		var/mob/living/carbon/C = M
 		var/mob/living/carbon/human/H = M
-		var/minor_damage
-		var/major_damage
-		var/max_damage
-		var/report_organs = FALSE
+		for(var/organ in C.internal_organs)
+			var/temp_message
+			var/damage_message
+			var/obj/item/organ/O = organ

-		//Piece together the lists to be reported
-		for(var/O in H.internal_organs)
-			var/obj/item/organ/organ = O
-			if(organ.organ_flags & ORGAN_FAILING)
-				report_organs = TRUE	//if we report one organ, we report all organs, even if the lists are empty, just for consistency
-				if(max_damage)
-					max_damage += ", "	//prelude the organ if we've already reported an organ
-					max_damage += organ.name	//this just slaps the organ name into the string of text
-				else
-					max_damage = "\t<span class='alert'>Non-Functional Organs: "	//our initial statement
-					max_damage += organ.name
-			else if(organ.damage > organ.high_threshold)
-				report_organs = TRUE
-				if(major_damage)
-					major_damage += ", "
-					major_damage += organ.name
-				else
-					major_damage = "\t<span class='info'>Severely Damaged Organs: "
-					major_damage += organ.name
-			else if(organ.damage > organ.low_threshold)
-				report_organs = TRUE
-				if(minor_damage)
-					minor_damage += ", "
-					minor_damage += organ.name
-				else
-					minor_damage = "\t<span class='info'>Mildly Damaged Organs: "
-					minor_damage += organ.name
+			//EYES
+			if(istype(O, /obj/item/organ/eyes))
+				var/obj/item/organ/eyes/eyes = O
+				if(advanced)
+					if(HAS_TRAIT(C, TRAIT_BLIND))
+						temp_message += " <span class='alert'>Subject is blind.</span>"
+					if(HAS_TRAIT(C, TRAIT_NEARSIGHT))
+						temp_message += " <span class='alert'>Subject is nearsighted.</span>"
+					if(eyes.damage > 30)
+						damage_message += " <span class='alert'>Subject has severe eye damage.</span>"
+					else if(eyes.damage > 20)
+						damage_message += " <span class='alert'>Subject has significant eye damage.</span>"
+					else if(eyes.damage)
+						damage_message += " <span class='alert'>Subject has minor eye damage.</span>"
+
+
+			//EARS
+			else if(istype(O, /obj/item/organ/ears))
+				var/obj/item/organ/ears/ears = O
+				if(advanced)
+					if(HAS_TRAIT_FROM(C, TRAIT_DEAF, GENETIC_MUTATION))
+						temp_message += " <span class='alert'>Subject is genetically deaf.</span>"
+					else if(HAS_TRAIT(C, TRAIT_DEAF))
+						temp_message += " <span class='alert'>Subject is deaf.</span>"
+					else
+						if(ears.damage)
+							damage_message += " <span class='alert'>Subject has [ears.damage > ears.maxHealth ? "permanent ": "temporary "]hearing damage.</span>"
+						if(ears.deaf)
+							damage_message += " <span class='alert'>Subject is [ears.damage > ears.maxHealth ? "permanently ": "temporarily "] deaf.</span>"
+
+
+			//BRAIN
+			else if(istype(O, /obj/item/organ/brain))
+				if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 200)
+					damage_message += " <span class='alert'>Subject's brain non-functional. Neurine injection recomended.</span>"
+				else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 120)
+					damage_message += " <span class='alert'>Severe brain damage detected. Subject likely to have mental traumas.</span>"
+				else if (C.getOrganLoss(ORGAN_SLOT_BRAIN) >= 45)
+					damage_message += " <span class='alert'>Brain damage detected.</span>"
+				if(advanced)
+					temp_message += " <span class='info'>Brain Activity Level: [(200 - M.getOrganLoss(ORGAN_SLOT_BRAIN))/2]%.</span>"
+
+				//TRAUMAS
+				if(LAZYLEN(C.get_traumas()))
+					var/list/trauma_text = list()
+					for(var/datum/brain_trauma/B in C.get_traumas())
+						var/trauma_desc = ""
+						switch(B.resilience)
+							if(TRAUMA_RESILIENCE_SURGERY)
+								trauma_desc += "severe "
+							if(TRAUMA_RESILIENCE_LOBOTOMY)
+								trauma_desc += "deep-rooted "
+							if(TRAUMA_RESILIENCE_MAGIC, TRAUMA_RESILIENCE_ABSOLUTE)
+								trauma_desc += "permanent "
+						trauma_desc += B.scan_desc
+						trauma_text += trauma_desc
+					temp_message += " <span class='alert'>Cerebral traumas detected: subject appears to be suffering from [english_list(trauma_text)].</span>"
+				if(C.roundstart_quirks.len)
+					temp_message += " <span class='info'>Subject has the following physiological traits: [C.get_trait_string()].</span>"
+
+				if(ishuman(C) && advanced)
+					//MON PETIT CHAUFFEUR
+					if(H.hallucinating())
+						temp_message += " <span class='info'>Subject is hallucinating.</span>"
+
+					//MKUltra
+					if(H.has_status_effect(/datum/status_effect/chem/enthrall))
+						temp_message += " <span class='info'>Subject has abnormal brain fuctions.</span>"
+
+					//Astrogen shenanigans
+					if(H.reagents.has_reagent("astral"))
+						if(H.mind)
+							temp_message += " <span class='danger'>Warning: subject may be possesed.</span>"
+						else
+							temp_message += " <span class='notice'>Subject appears to be astrally projecting.</span>"
+
+
+			//LIVER
+			else if(istype(O, /obj/item/organ/liver))
+				var/obj/item/organ/liver/L = O
+				if(H.undergoing_liver_failure() && H.stat != DEAD) //might be depreciated
+					temp_message += "<span class='danger'>Subject is suffering from liver failure: Apply Corazone and begin a liver transplant immediately!</span>"
+				if(L.swelling > 20)
+					temp_message += " <span class='danger'>Subject is suffering from an enlarged liver.</span>" //i.e. shrink their liver or give them a transplant.
+
+			//HEART
+			else if(ishuman(M) && (istype(O, /obj/item/organ/heart)))
+				var/obj/item/organ/heart/He = O
+				if(H.undergoing_cardiac_arrest() && H.stat != DEAD)
+					temp_message += " <span class='danger'>Subject suffering from heart attack: Apply defibrillation or other electric shock <b>immediately!</b></span>"
+				if(He.organ_flags & ORGAN_FAILING)
+					heart_ded = TRUE
+
+			//TONGUE
+			else if(istype(O, /obj/item/organ/tongue))
+				var/obj/item/organ/tongue/T = O
+				if(T.name == "fluffy tongue")
+					temp_message += " <span class='danger'>Subject is suffering from a fluffified tongue. Suggested cure: Yamerol or a tongue transplant.</span>"
+
+			//HECK
+			else if(istype(O, /obj/item/organ/genital/penis))
+				var/obj/item/organ/genital/penis/P = O
+				if(P.length>20)
+					temp_message += " <span class='info'>Subject has a sizeable gentleman's organ at [P.length] inches.</span>"
+
+			else if(istype(O, /obj/item/organ/genital/breasts))
+				var/obj/item/organ/genital/breasts/Br = O
+				if(Br.cached_size>5)
+					temp_message += " <span class='info'>Subject has a sizeable bosom with a [Br.size] cup.</span>"
+
+
+
+			//GENERAL HANDLER
+			if(!damage_message)
+				if(O.organ_flags & ORGAN_FAILING)
+					damage_message += " <span class='alert'><b>End Stage [O.name] failure detected.</b></span>"
+				else if(O.damage > O.high_threshold)
+					damage_message += " <span class='alert'>Chronic [O.name] failure detected.</span>"
+				else if(O.damage > O.low_threshold && advanced)
+					damage_message += " <font color='red'>Acute [O.name] failure detected.</span>"
+
+			if(temp_message || damage_message)
+				msg += "\t<b><span class='info'>[uppertext(O.name)]:</b></span> [damage_message] [temp_message]\n"
+
+
+
+		//END; LOOK FOR MISSING ORGANS?
+		var/breathes = TRUE
+		var/blooded = TRUE
+		if(C.dna && C.dna.species)
+			if(HAS_TRAIT_FROM(C, TRAIT_NOBREATH, SPECIES_TRAIT))
+				breathes = FALSE
+			if(NOBLOOD in C.dna.species.species_traits)
+				blooded = FALSE
+		var/has_liver = (!(NOLIVER in C.dna.species.species_traits))
+		var/has_stomach = (!(NOSTOMACH in C.dna.species.species_traits))
+		if(!M.getorganslot(ORGAN_SLOT_EYES))
+			msg += "\t<span class='alert'><b>Subject does not have eyes.</b></span>\n"
+		if(!M.getorganslot(ORGAN_SLOT_EARS))
+			msg += "\t<span class='alert'><b>Subject does not have ears.</b></span>\n"
+		if(!M.getorganslot(ORGAN_SLOT_BRAIN))
+			msg += "\t<span class='alert'><b>Subject's brain function is non-existent!</b></span>\n"
+		if(has_liver && !M.getorganslot(ORGAN_SLOT_LIVER))
+			msg += "\t<span class='alert'><b>Subject's liver is missing!</b></span>\n"
+		if(blooded && !M.getorganslot(ORGAN_SLOT_HEART))
+			msg += "\t<span class='alert'><b>Subject's heart is missing!</b></span>\n"
+		if(breathes && !M.getorganslot(ORGAN_SLOT_LUNGS))
+			msg += "\t<span class='alert'><b>Subject's lungs have collapsed from trauma!</b></span>\n"
+		if(has_stomach && !M.getorganslot(ORGAN_SLOT_STOMACH))
+			msg += "\t<span class='alert'><b>Subject's stomach is missing!</span>\n"
+
+
+		if(M.radiation)
+			msg += "\t<span class='alert'>Subject is irradiated.</span>\n"
+			msg += "\t<span class='info'>Radiation Level: [M.radiation] rad</span>\n"

-		if(report_organs)	//we either finish the list, or set it to be empty if no organs were reported in that category
-			if(!max_damage)
-				max_damage = "\t<span class='alert'>Non-Functional Organs: </span>\n"
-			else
-				max_damage += "</span>\n"
-			if(!major_damage)
-				major_damage = "\t<span class='info'>Severely Damaged Organs: </span>\n"
-			else
-				major_damage += "</span>\n"
-			if(!minor_damage)
-				minor_damage = "\t<span class='info'>Mildly Damaged Organs: </span>\n"
-			else
-				minor_damage += "</span>\n"
-			msg += "[minor_damage]"
-			msg += "[major_damage]"
-			msg += "[max_damage]"


 	// Species and body temperature
+	var/mob/living/carbon/human/H = M //Start to use human only stuff here
 	if(ishuman(M))
-		var/mob/living/carbon/human/H = M
 		var/datum/species/S = H.dna.species
 		var/mutant = FALSE
 		if (H.dna.check_mutation(HULK))
@@ -393,7 +389,15 @@ SLIME SCANNER
 		msg += "<span class='info'>Time of Death:</span> [M.tod]\n"
 		var/tdelta = round(world.time - M.timeofdeath)
 		if(tdelta < (DEFIB_TIME_LIMIT * 10))
-			msg += "<span class='danger'>Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!</span>\n"
+			if(heart_ded)
+				msg += "<span class='danger'>Subject died [DisplayTimeText(tdelta)] ago, heart requires surgical intervention for defibrillation.</span>"
+			else
+				msg += "<span class='danger'>Subject died [DisplayTimeText(tdelta)] ago, defibrillation may be possible!</span>"
+			if(advanced)
+				if(H.get_ghost() || H.key || H.client)//Since it can last a while.
+					msg += "<span class='danger'> Intervention recommended.</span>\n"
+				else
+					msg += "\n"

 	for(var/thing in M.diseases)
 		var/datum/disease/D = thing
@@ -406,7 +410,6 @@ SLIME SCANNER
 		var/blood_id = C.get_blood_id()
 		if(blood_id)
 			if(ishuman(C))
-				var/mob/living/carbon/human/H = C
 				if(H.bleed_rate)
 					msg += "<span class='danger'>Subject is bleeding!</span>\n"
 			var/blood_percent =  round((C.blood_volume / (BLOOD_VOLUME_NORMAL * C.blood_ratio))*100)
@@ -431,7 +434,7 @@ SLIME SCANNER
 		if(cyberimp_detect)
 			msg += "<span class='notice'>Detected cybernetic modifications:</span>\n"
 			msg += "<span class='notice'>[cyberimp_detect]</span>\n"
-	msg += "*---------*</span>"
+	msg += "<span class='notice'>*---------*</span>"
 	to_chat(user, msg)
 	SEND_SIGNAL(M, COMSIG_NANITE_SCAN, user, FALSE)

@@ -21,7 +21,7 @@
 /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M)
 	if(M.stat == DEAD)	//They're dead!
 		return
-	M.show_message("<span class='warning'>BANG</span>", 2)
+	M.show_message("<span class='warning'>BANG</span>", MSG_AUDIBLE)
 	var/distance = max(0,get_dist(get_turf(src),T))

 //Flash
@@ -107,7 +107,7 @@
 	return ..()

 /obj/item/implant/proc/get_data()
-	return "No information available"
+	return "No information available about this implant."

 /obj/item/implant/dropped(mob/user)
 	. = 1
@@ -13,34 +13,31 @@
 	var/broadcasting = null
 	var/listening = 1

+/obj/item/implantpad/examine(mob/user)
+	. = ..()
+	if(case)
+		. += "<span class='notice'>Alt-click [src] to remove the inserted implant case.</span>"

 /obj/item/implantpad/update_icon()
-	if(case)
-		icon_state = "implantpad-1"
-	else
-		icon_state = "implantpad-0"
+	icon_state = "implantpad-[case ? TRUE : FALSE]"

-
-/obj/item/implantpad/attack_hand(mob/user)
+/obj/item/implantpad/AltClick(mob/user)
 	. = ..()
-	if(.)
-		return
-	if(case && user.is_holding(src))
-		user.put_in_active_hand(case)
+	if(case && user.can_hold_items() && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		user.put_in_hands(case)

 		case.add_fingerprint(user)
 		case = null

 		add_fingerprint(user)
 		update_icon()
+		return TRUE

 /obj/item/implantpad/attackby(obj/item/implantcase/C, mob/user, params)
-	if(istype(C, /obj/item/implantcase))
-		if(!case)
-			if(!user.transferItemToLoc(C, src))
-				return
+	if(istype(C))
+		if(!case && user.transferItemToLoc(C, src))
 			case = C
-		update_icon()
+			update_icon()
 	else
 		return ..()

@@ -205,3 +205,7 @@
 /obj/item/inducer/sci/combat/Initialize()
 	. = ..()
 	update_icon()
+
+/obj/item/inducer/sci/supply
+	opened = FALSE
+	cell_type = /obj/item/stock_parts/cell/inducer_supply
@@ -23,8 +23,8 @@
 	else
 		if(attack_verb_off.len)
 			attack_verb = attack_verb_off
-	if(get_sharpness())
-		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
+	if(sharpness)
+		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)

 /obj/item/melee/transforming/attack_self(mob/living/carbon/user)
 	if(transform_weapon(user))
@@ -65,13 +65,6 @@
 		icon_state = initial(icon_state)
 		w_class = initial(w_class)
 		total_mass = initial(total_mass)
-	if(get_sharpness())
-		var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
-		BT.butchering_enabled = TRUE
-	else
-		var/datum/component/butchering/BT = GetComponent(/datum/component/butchering)
-		if(BT)
-			BT.butchering_enabled = FALSE
 	transform_messages(user, supress_message_text)
 	add_fingerprint(user)
 	return TRUE
@@ -151,12 +151,13 @@
 		add_overlay("[locked ? "" : "un"]locked")

 /obj/item/pet_carrier/MouseDrop(atom/over_atom)
-	. = ..()
 	if(isopenturf(over_atom) && usr.canUseTopic(src, BE_CLOSE, ismonkey(usr)) && usr.Adjacent(over_atom) && open && occupants.len)
 		usr.visible_message("<span class='notice'>[usr] unloads [src].</span>", \
 		"<span class='notice'>You unload [src] onto [over_atom].</span>")
 		for(var/V in occupants)
 			remove_occupant(V, over_atom)
+	else
+		return ..()

 /obj/item/pet_carrier/proc/load_occupant(mob/living/user, mob/living/target)
 	if(pet_carrier_full(src))
@@ -113,8 +113,10 @@
 					return
 			log_game("[key_name(user)] activated a hidden grenade in [src].")
 			grenade.preprime(user, msg = FALSE, volume = 10)
+			SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushpet", /datum/mood_event/plushpet)
 	else
 		to_chat(user, "<span class='notice'>You try to pet [src], but it has no stuffing. Aww...</span>")
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plush_nostuffing", /datum/mood_event/plush_nostuffing)

 /obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
 	if(I.get_sharpness())
@@ -125,6 +127,7 @@
 			user.visible_message("<span class='notice'>[user] tears out the stuffing from [src]!</span>", "<span class='notice'>You rip a bunch of the stuffing from [src]. Murderer.</span>")
 			I.play_tool_sound(src)
 			stuffed = FALSE
+			SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushjack", /datum/mood_event/plushjack)
 		else
 			to_chat(user, "<span class='notice'>You remove the grenade from [src].</span>")
 			user.put_in_hands(grenade)
@@ -147,6 +150,7 @@
 		return
 	if(istype(I, /obj/item/toy/plush))
 		love(I, user)
+		SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"plushplay", /datum/mood_event/plushplay)
 		return
 	return ..()

@@ -158,7 +162,7 @@

 	//we are not catholic
 	if(young == TRUE || Kisser.young == TRUE)
-		user.show_message("<span class='notice'>[src] plays tag with [Kisser].</span>", 1,
+		user.show_message("<span class='notice'>[src] plays tag with [Kisser].</span>", MSG_VISUAL,
 			"<span class='notice'>They're happy.</span>", 0)
 		Kisser.cheer_up()
 		cheer_up()
@@ -166,10 +170,10 @@
 	//never again
 	else if(Kisser in scorned)
 		//message, visible, alternate message, neither visible nor audible
-		user.show_message("<span class='notice'>[src] rejects the advances of [Kisser]!</span>", 1,
+		user.show_message("<span class='notice'>[src] rejects the advances of [Kisser]!</span>", MSG_VISUAL,
 			"<span class='notice'>That didn't feel like it worked.</span>", 0)
 	else if(src in Kisser.scorned)
-		user.show_message("<span class='notice'>[Kisser] realises who [src] is and turns away.</span>", 1,
+		user.show_message("<span class='notice'>[Kisser] realises who [src] is and turns away.</span>", MSG_VISUAL,
 			"<span class='notice'>That didn't feel like it worked.</span>", 0)

 	//first comes love
@@ -190,7 +194,7 @@
 			new_lover(Kisser)
 			Kisser.new_lover(src)
 		else
-			user.show_message("<span class='notice'>[src] rejects the advances of [Kisser], maybe next time?</span>", 1,
+			user.show_message("<span class='notice'>[src] rejects the advances of [Kisser], maybe next time?</span>", MSG_VISUAL,
 								"<span class='notice'>That didn't feel like it worked, this time.</span>", 0)

 	//then comes marriage
@@ -1014,7 +1018,7 @@
 	icon_state = "maya"
 	item_state = "maya"
 	attack_verb = list("nuked", "arrested", "harmbatonned")
-	
+
 /obj/item/toy/plush/catgirl/marisa
 	desc = "An adorable stuffed toy that resembles a crew member, or maybe a witch. Having it makes you feel you can win."
 	icon_state = "marisa"
@@ -39,6 +39,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
 /obj/item/stack/sheet/glass/fifty
 	amount = 50

+/obj/item/stack/sheet/glass/five
+	amount = 5
+
 /obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE)
 	recipes = GLOB.glass_recipes
 	return ..()
@@ -55,6 +55,9 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \
 /obj/item/stack/sheet/mineral/sandstone/thirty
 	amount = 30

+/obj/item/stack/sheet/mineral/sandstone/twelve
+	amount = 12
+
 /*
 * Sandbags
 */
@@ -620,6 +620,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
 	new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
 	new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
+	new /datum/stack_recipe("large trash cart", /obj/structure/closet/crate/bin,50),\
 	new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))

 /obj/item/stack/sheet/plastic
@@ -82,6 +82,55 @@
 	item_state = "tile-fairygrass"
 	turf_type = /turf/open/floor/grass/fairy
 	resistance_flags = FLAMMABLE
+	color = "#33CCFF"
+
+/obj/item/stack/tile/fairygrass/white
+	name = "white fairygrass tile"
+	singular_name = "white fairygrass floor tile"
+	desc = "A patch of odd, glowing white grass."
+	turf_type = /turf/open/floor/grass/fairy/white
+	color = "#FFFFFF"
+
+/obj/item/stack/tile/fairygrass/red
+	name = "red fairygrass tile"
+	singular_name = "red fairygrass floor tile"
+	desc = "A patch of odd, glowing red grass."
+	turf_type = /turf/open/floor/grass/fairy/red
+	color = "#FF3333"
+
+/obj/item/stack/tile/fairygrass/yellow
+	name = "yellow fairygrass tile"
+	singular_name = "yellow fairygrass floor tile"
+	desc = "A patch of odd, glowing yellow grass."
+	turf_type = /turf/open/floor/grass/fairy/yellow
+	color = "#FFFF66"
+
+/obj/item/stack/tile/fairygrass/green
+	name = "green fairygrass tile"
+	singular_name = "green fairygrass floor tile"
+	desc = "A patch of odd, glowing green grass."
+	turf_type = /turf/open/floor/grass/fairy/green
+	color = "#99FF99"
+
+/obj/item/stack/tile/fairygrass/blue
+	name = "blue fairygrass tile"
+	singular_name = "blue fairygrass floor tile"
+	desc = "A patch of odd, glowing blue grass."
+	turf_type = /turf/open/floor/grass/fairy/blue
+
+/obj/item/stack/tile/fairygrass/purple
+	name = "purple fairygrass tile"
+	singular_name = "purple fairygrass floor tile"
+	desc = "A patch of odd, glowing purple grass."
+	turf_type = /turf/open/floor/grass/fairy/purple
+	color = "#D966FF"
+
+/obj/item/stack/tile/fairygrass/pink
+	name = "pink fairygrass tile"
+	singular_name = "pink fairygrass floor tile"
+	desc = "A patch of odd, glowing pink grass."
+	turf_type = /turf/open/floor/grass/fairy/pink
+	color = "#FFB3DA"

 //Wood
 /obj/item/stack/tile/wood
@@ -253,7 +253,7 @@

 /obj/item/storage/backpack/satchel/bone
 	name = "bone satchel"
-	desc = "A bone satchel fashend with watcher wings and large bones from goliath. Can be worn on the belt."
+	desc = "A grotesque satchel made of sinews and bones."
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "goliath_saddle"
 	slot_flags = ITEM_SLOT_BACK
@@ -575,7 +575,9 @@
 		/obj/item/clothing/gloves,
 		/obj/item/melee/flyswatter,
 		/obj/item/paint/paint_remover,
-		/obj/item/assembly/mousetrap
+		/obj/item/assembly/mousetrap,
+		/obj/item/screwdriver,
+		/obj/item/stack/cable_coil
 		))

 /obj/item/storage/belt/bandolier
@@ -105,25 +105,37 @@
 // Ordinary survival box
 /obj/item/storage/box/survival/PopulateContents()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)
+
 /obj/item/storage/box/survival/radio/PopulateContents()
 	..() // we want the survival stuff too.
 	new /obj/item/radio/off(src)

 /obj/item/storage/box/survival_mining/PopulateContents()
 	new /obj/item/clothing/mask/gas/explorer(src)
-	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)
+
 // Engineer survival box
 /obj/item/storage/box/engineer/PopulateContents()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen/engi(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)
+
 /obj/item/storage/box/engineer/radio/PopulateContents()
 	..() // we want the regular items too.
 	new /obj/item/radio/off(src)
@@ -131,14 +143,22 @@
 // Syndie survival box
 /obj/item/storage/box/syndie/PopulateContents()
 	new /obj/item/clothing/mask/gas/syndicate(src)
-	new /obj/item/tank/internals/emergency_oxygen/engi(src)
+
+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen/engi(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)

 // Security survival box
 /obj/item/storage/box/security/PopulateContents()
 	new /obj/item/clothing/mask/gas/sechailer(src)
-	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)
+
 /obj/item/storage/box/security/radio/PopulateContents()
 	..() // we want the regular stuff too
 	new /obj/item/radio/off(src)
@@ -679,6 +699,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	playsound(loc, "rustle", 50, 1, -5)
 	user.visible_message("<span class='notice'>[user] hugs \the [src].</span>","<span class='notice'>You hug \the [src].</span>")
+	SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT,"hugbox", /datum/mood_event/hugbox)

 /////clown box & honkbot assembly
 /obj/item/storage/box/clown
@@ -707,11 +728,16 @@
 	new /obj/item/stack/medical/ointment(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+// Clown survival box
 /obj/item/storage/box/hug/survival/PopulateContents()
 	new /obj/item/clothing/mask/breath(src)
-	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)

+	if(!isplasmaman(loc))
+		new /obj/item/tank/internals/emergency_oxygen(src)
+	else
+		new /obj/item/tank/internals/plasmaman/belt(src)
+
 /obj/item/storage/box/rubbershot
 	name = "box of rubber shots"
 	desc = "A box full of rubber shots, designed for riot shotguns."
@@ -858,12 +884,12 @@
 	else if(W.get_sharpness())
 		if(!contents.len)
 			if(item_state == "paperbag_None")
-				user.show_message("<span class='notice'>You cut eyeholes into [src].</span>", 1)
+				user.show_message("<span class='notice'>You cut eyeholes into [src].</span>", MSG_VISUAL)
 				new /obj/item/clothing/head/papersack(user.loc)
 				qdel(src)
 				return 0
 			else if(item_state == "paperbag_SmileyFace")
-				user.show_message("<span class='notice'>You cut eyeholes into [src] and modify the design.</span>", 1)
+				user.show_message("<span class='notice'>You cut eyeholes into [src] and modify the design.</span>", MSG_VISUAL)
 				new /obj/item/clothing/head/papersack/smiley(user.loc)
 				qdel(src)
 				return 0
@@ -875,7 +901,7 @@
 #undef HEART
 #undef SMILEY

-/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
+/obj/item/storage/box/ingredients //This box is for the randomly chosen version the chef spawns with, it shouldn't actually exist.
 	name = "ingredients box"
 	illustration = "fruit"
 	var/theme_name
@@ -18,6 +18,12 @@
 	throw_speed = 3
 	throw_range = 7
 	var/empty = FALSE
+	var/list/possible_icons = list("firstaid","firstaid2","firstaid3","firstaid4")
+
+/obj/item/storage/firstaid/Initialize(mapload)
+	. = ..()
+	if(LAZYLEN(possible_icons))
+		icon_state = pick(possible_icons)

 /obj/item/storage/firstaid/regular
 	icon_state = "firstaid"
@@ -56,17 +62,14 @@
 /obj/item/storage/firstaid/fire
 	name = "burn treatment kit"
 	desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
-	icon_state = "ointment"
+	icon_state = "burn"
 	item_state = "firstaid-ointment"
+	possible_icons = list("burn","burn2","burn3","burn4")

 /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!</span>")
 	return FIRELOSS

-/obj/item/storage/firstaid/fire/Initialize(mapload)
-	. = ..()
-	icon_state = pick("ointment","firefirstaid")
-
 /obj/item/storage/firstaid/fire/PopulateContents()
 	if(empty)
 		return
@@ -80,17 +83,14 @@
 /obj/item/storage/firstaid/toxin
 	name = "toxin treatment kit"
 	desc = "Used to treat toxic blood content and radiation poisoning."
-	icon_state = "antitoxin"
+	icon_state = "toxin"
 	item_state = "firstaid-toxin"
+	possible_icons = list("toxin","toxin2","toxin3","toxin4")

 /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return TOXLOSS

-/obj/item/storage/firstaid/toxin/Initialize(mapload)
-	. = ..()
-	icon_state = pick("antitoxin","antitoxfirstaid","antitoxfirstaid2","antitoxfirstaid3")
-
 /obj/item/storage/firstaid/toxin/PopulateContents()
 	if(empty)
 		return
@@ -103,8 +103,9 @@
 /obj/item/storage/firstaid/radbgone
 	name = "radiation treatment kit"
 	desc = "Used to treat minor toxic blood content and major radiation poisoning."
-	icon_state = "antitoxin"
+	icon_state = "rad"
 	item_state = "firstaid-toxin"
+	possible_icons = list("rad","rad2","rad3")

 /obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -128,8 +129,9 @@
 /obj/item/storage/firstaid/o2
 	name = "oxygen deprivation treatment kit"
 	desc = "A box full of oxygen goodies."
-	icon_state = "o2"
+	icon_state = "oxy"
 	item_state = "firstaid-o2"
+	possible_icons = list("oxy", "oxy2", "oxy3", "oxy4")

 /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -149,6 +151,7 @@
 	desc = "A first aid kit for when you get toolboxed."
 	icon_state = "brute"
 	item_state = "firstaid-brute"
+	possible_icons = list("brute", "brute2", "brute3", "brute4")

 /obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -166,7 +169,8 @@
 /obj/item/storage/firstaid/tactical
 	name = "combat medical kit"
 	desc = "I hope you've got insurance."
-	icon_state = "bezerk"
+	icon_state = "tactical"
+	possible_icons = null

 /obj/item/storage/firstaid/tactical/ComponentInitialize()
 	. = ..()
@@ -389,3 +393,141 @@
 	/obj/item/organ_storage
 	))

+//hijacking the minature first aids for hypospray boxes. <3
+/obj/item/storage/hypospraykit
+	name = "hypospray kit"
+	desc = "It's a kit containing a hypospray and specific treatment chemical-filled vials."
+	icon_state = "firstaid-mini"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	throw_speed = 3
+	throw_range = 7
+	var/empty = FALSE
+	item_state = "firstaid"
+
+/obj/item/storage/hypospraykit/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 12
+	STR.can_hold = typecacheof(list(
+	/obj/item/hypospray/mkii,
+	/obj/item/reagent_containers/glass/bottle/vial))
+
+/obj/item/storage/hypospraykit/regular
+	icon_state = "firstaid-mini"
+	desc = "A hypospray kit with general use vials."
+
+/obj/item/storage/hypospraykit/regular/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/tricord(src)
+
+/obj/item/storage/hypospraykit/fire
+	name = "burn treatment hypospray kit"
+	desc = "A specialized hypospray kit for burn treatments. Apply with sass."
+	icon_state = "burn-mini"
+	item_state = "firstaid-ointment"
+
+/obj/item/storage/hypospraykit/fire/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/burn(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane(src)
+
+/obj/item/storage/hypospraykit/toxin
+	name = "toxin treatment hypospray kit"
+	icon_state = "toxin-mini"
+	item_state = "firstaid-toxin"
+
+/obj/item/storage/hypospraykit/toxin/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/toxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin(src)
+
+/obj/item/storage/hypospraykit/o2
+	name = "oxygen deprivation hypospray kit"
+	icon_state = "oxy-mini"
+	item_state = "firstaid-o2"
+
+/obj/item/storage/hypospraykit/o2/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/oxygen(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin(src)
+
+/obj/item/storage/hypospraykit/enlarge
+	name = "organomegaly trauma hypospray kit"
+	icon_state = "enlarge-mini"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/hypospraykit/enlarge/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/enlarge(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/breastreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/penisreduction(src)
+
+/obj/item/storage/hypospraykit/brute
+	name = "brute trauma hypospray kit"
+	icon_state = "brute-mini"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/hypospraykit/brute/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/brute(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine(src)
+
+/obj/item/storage/hypospraykit/tactical
+	name = "combat hypospray kit"
+	desc = "A hypospray kit best suited for combat situations."
+	icon_state = "tactical-mini"
+
+/obj/item/storage/hypospraykit/tactical/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/defibrillator/compact/combat/loaded(src)
+	new /obj/item/hypospray/mkii/CMO/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/combat(src)
+
+/obj/item/storage/hypospraykit/cmo
+	name = "deluxe hypospray kit"
+	desc = "A kit containing a Deluxe hypospray and Vials."
+	icon_state = "tactical-mini"
+
+/obj/item/storage/hypospraykit/cmo/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.max_items = 6
+	STR.can_hold = typecacheof(list(
+	/obj/item/hypospray/mkii,
+	/obj/item/reagent_containers/glass/bottle/vial))
+
+/obj/item/storage/hypospraykit/cmo/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/CMO(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/salglu(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/preloaded/synthflesh(src)
+
+/obj/item/storage/box/vials
+	name = "box of hypovials"
+
+/obj/item/storage/box/vials/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/glass/bottle/vial/small( src )
@@ -37,7 +37,15 @@
 		/obj/item/screwdriver,
 		/obj/item/valentine,
 		/obj/item/stamp,
-		/obj/item/key))
+		/obj/item/key,
+		/obj/item/cartridge,
+		/obj/item/camera_film,
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/reagent_containers/food/snacks/grown/poppy,
+		/obj/item/instrument/harmonica,
+		/obj/item/mining_voucher,
+		/obj/item/suit_voucher,
+		/obj/item/reagent_containers/pill))

 /obj/item/storage/wallet/Exited(atom/movable/AM)
 	. = ..()
@@ -201,7 +201,7 @@
 	if(!current_location || current_area.noteleport || is_away_level(current_location.z) || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
 		to_chat(user, "<span class='notice'>\The [src] is malfunctioning.</span>")
 		return
-	user.show_message("<span class='notice'>Locked In.</span>", 2)
+	user.show_message("<span class='notice'>Locked In.</span>", MSG_AUDIBLE)
 	var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1, null, atmos_link_override)
 	if(!(LAZYLEN(created) == 2))
 		return
@@ -122,12 +122,21 @@
 	user.put_in_active_hand(pryjaws)

 /obj/item/wirecutters/power/attack(mob/living/carbon/C, mob/user)
-	if(istype(C) && C.handcuffed)
-		user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
-		qdel(C.handcuffed)
-		return
-	else
-		..()
+	if(istype(C))
+		if(C.handcuffed)
+			user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
+			qdel(C.handcuffed)
+			return
+		else if(C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
+			var/man = C == user ? "your" : "[C]'\s"
+			user.visible_message("<span class='notice'>[user] attempts to remove the durathread strand from around [man] neck.</span>", \
+								"<span class='notice'>You attempt to remove the durathread strand from around [man] neck.</span>")
+			if(do_after(user, 15, null, C))
+				user.visible_message("<span class='notice'>[user] succesfuly removes the durathread strand.</span>",
+									"<span class='notice'>You succesfuly remove the durathread strand.</span>")
+				C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+			return
+	..()

 /obj/item/wirecutters/advanced
 	name = "advanced wirecutters"
@@ -182,7 +182,7 @@
 		return
 	src.add_fingerprint(user)
 	if (src.bullets < 1)
-		user.show_message("<span class='warning'>*click*</span>", 2)
+		user.show_message("<span class='warning'>*click*</span>", MSG_AUDIBLE)
 		playsound(src, "gun_dry_fire", 30, 1)
 		return
 	playsound(user, 'sound/weapons/gunshot.ogg', 100, 1)
@@ -401,6 +401,7 @@
 	righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
 	var/active = FALSE
 	icon = 'icons/obj/items_and_weapons.dmi'
+	hitsound = 'sound/weapons/smash.ogg'
 	attack_verb = list("robusted")

 /obj/item/toy/windupToolbox/attack_self(mob/user)
@@ -408,13 +409,33 @@
 		icon_state = "his_grace_awakened"
 		to_chat(user, "<span class='warning'>You wind up [src], it begins to rumble.</span>")
 		active = TRUE
+		playsound(src, 'sound/effects/pope_entry.ogg', 100)
+		Rumble()
 		addtimer(CALLBACK(src, .proc/stopRumble), 600)
 	else
 		to_chat(user, "[src] is already active.")

+/obj/item/toy/windupToolbox/proc/Rumble()
+	var/static/list/transforms
+	if(!transforms)
+		var/matrix/M1 = matrix()
+		var/matrix/M2 = matrix()
+		var/matrix/M3 = matrix()
+		var/matrix/M4 = matrix()
+		M1.Translate(-1, 0)
+		M2.Translate(0, 1)
+		M3.Translate(1, 0)
+		M4.Translate(0, -1)
+		transforms = list(M1, M2, M3, M4)
+	animate(src, transform=transforms[1], time=0.2, loop=-1)
+	animate(transform=transforms[2], time=0.1)
+	animate(transform=transforms[3], time=0.2)
+	animate(transform=transforms[4], time=0.3)
+
 /obj/item/toy/windupToolbox/proc/stopRumble()
 	icon_state = initial(icon_state)
 	active = FALSE
+	animate(src, transform=matrix())

 /*
 * Subtype of Double-Bladed Energy Swords
@@ -498,7 +498,7 @@
 	var/mutable_appearance/armrest

 /obj/structure/chair/sofa/Initialize()
-	armrest = mutable_appearance(icon, "[icon_state]_armrest")
+	armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER)
 	return ..()

 /obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
@@ -35,6 +35,7 @@
 	new	/obj/item/storage/lockbox/medal/engineering(src)
 	new /obj/item/construction/rcd/loaded/upgraded(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/ce(src)
+	new /obj/item/clothing/head/beret/ce/white(src)

 /obj/structure/closet/secure_closet/engineering_electrical
 	name = "electrical supplies locker"
@@ -82,6 +82,7 @@
 	new /obj/item/storage/photo_album/CMO(src)
 	new	/obj/item/storage/lockbox/medal/medical(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/cmo(src)
+	new /obj/item/clothing/head/beret/cmo/blue(src)

 /obj/structure/closet/secure_closet/animal
 	name = "animal control"
@@ -9,12 +9,19 @@
 	if(registered_name)
 		. += "<span class='notice'>The display reads, \"Owned by [registered_name]\".</span>"

-/obj/structure/closet/secure_closet/personal/check_access(obj/item/card/id/I)
+/obj/structure/closet/secure_closet/personal/check_access(obj/item/I)
 	. = ..()
 	if(!I || !istype(I))
 		return
-	if(registered_name == I.registered_name)
+	if(istype(I,/obj/item/modular_computer/tablet))
+		var/obj/item/modular_computer/tablet/ourTablet = I
+		var/obj/item/computer_hardware/card_slot/card_slot = ourTablet.all_components[MC_CARD]
+		if(card_slot)
+			return registered_name == card_slot.stored_card.registered_name || registered_name == card_slot.stored_card2.registered_name
+	var/obj/item/card/id/ID = I.GetID()
+	if(ID && registered_name == ID.registered_name)
 		return TRUE
+	return FALSE

 /obj/structure/closet/secure_closet/personal/PopulateContents()
 	..()
@@ -42,6 +49,7 @@
 	new /obj/item/storage/backpack/satchel/leather/withwallet( src )
 	new /obj/item/instrument/piano_synth(src)
 	new /obj/item/radio/headset( src )
+	new /obj/item/clothing/head/colour(src)

 /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
 	var/obj/item/card/id/I = W.GetID()
@@ -31,3 +31,4 @@
 	new /obj/item/circuitboard/machine/techfab/department/science(src)
 	new /obj/item/storage/photo_album/RD(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/rd(src)
+
@@ -34,6 +34,8 @@
 	new /obj/item/gun/energy/e_gun(src)
 	new /obj/item/door_remote/captain(src)
 	new /obj/item/storage/photo_album/Captain(src)
+	new /obj/item/clothing/head/caphat/beret/white(src)
+
 /obj/structure/closet/secure_closet/hop
 	name = "\proper head of personnel's locker"
 	req_access = list(ACCESS_HOP)
@@ -62,6 +64,8 @@
 	new /obj/item/circuitboard/machine/techfab/department/service(src)
 	new /obj/item/storage/photo_album/HoP(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/hop(src)
+	new /obj/item/clothing/head/hopcap/beret/white(src)
+
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"
 	req_access = list(ACCESS_HOS)
@@ -120,6 +124,7 @@
 	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)
+	new /obj/item/clothing/head/beret/sec/corporatewarden(src)
 /obj/structure/closet/secure_closet/security
 	name = "security officer's locker"
 	req_access = list(ACCESS_SECURITY)
@@ -4,6 +4,8 @@
 	icon_state = "largebins"
 	open_sound = 'sound/effects/bin_open.ogg'
 	close_sound = 'sound/effects/bin_close.ogg'
+	material_drop = /obj/item/stack/sheet/plastic
+	material_drop_amount = 40
 	anchored = TRUE
 	horizontal = FALSE
 	delivery_icon = null
@@ -151,6 +151,9 @@
 		log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
+		if(has_owner)
+			var/datum/species/golem/G = H.dna.species
+			G.owner = owner
 		H.set_cloned_appearance()
 		if(!name)
 			if(has_owner)
@@ -321,8 +324,9 @@

 /datum/outfit/hotelstaff
 	name = "Hotel Staff"
-	uniform = /obj/item/clothing/under/assistantformal
+	uniform = /obj/item/clothing/under/telegram
 	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/hotel
 	r_pocket = /obj/item/radio/off
 	back = /obj/item/storage/backpack
 	implants = list(/obj/item/implant/mindshield)
@@ -1,5 +1,7 @@
-//Loom, turns raw cotton and durathread into their respective fabrics.
+#define FABRIC_PER_SHEET 4

+
+///This is a loom. It's usually made out of wood and used to weave fabric like durathread or cotton into their respective cloth types.
 /obj/structure/loom
 	name = "loom"
 	desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
@@ -8,14 +10,35 @@
 	density = TRUE
 	anchored = TRUE

-/obj/structure/loom/attackby(obj/item/stack/sheet/W, mob/user)
-	if(W.is_fabric && W.amount > 1)
-		user.show_message("<span class='notice'>You start weaving the [W.name] through the loom..</span>", 1)
-		if(W.use_tool(src, user, W.pull_effort))
-			new W.loom_result(drop_location())
-			user.show_message("<span class='notice'>You weave the [W.name] into a workable fabric.</span>", 1)
-			W.amount = (W.amount - 2)
-			if(W.amount < 1)
-				qdel(W)
-	else
-		user.show_message("<span class='notice'>You need a valid fabric and at least 2 of said fabric before using this.</span>", 1)
+/obj/structure/loom/attackby(obj/item/I, mob/user)
+	if(weave(I, user))
+		return
+	return ..()
+
+/obj/structure/loom/wrench_act(mob/living/user, obj/item/I)
+	..()
+	default_unfasten_wrench(user, I, 5)
+	return TRUE
+
+///Handles the weaving.
+/obj/structure/loom/proc/weave(obj/item/stack/sheet/S, mob/user)
+	if(!istype(S) || !S.is_fabric)
+		return FALSE
+	if(!anchored)
+		user.show_message("<span class='notice'>The loom needs to be wrenched down.</span>", MSG_VISUAL)
+		return FALSE
+	if(S.amount < FABRIC_PER_SHEET)
+		user.show_message("<span class='notice'>You need at least [FABRIC_PER_SHEET] units of fabric before using this.</span>", 1)
+		return FALSE
+	user.show_message("<span class='notice'>You start weaving \the [S.name] through the loom..</span>", MSG_VISUAL)
+	if(S.use_tool(src, user, S.pull_effort))
+		if(S.amount >= FABRIC_PER_SHEET)
+			new S.loom_result(drop_location())
+			S.use(FABRIC_PER_SHEET)
+			user.show_message("<span class='notice'>You weave \the [S.name] into a workable fabric.</span>", MSG_VISUAL)
+	return TRUE
+
+/obj/structure/loom/unanchored
+	anchored = FALSE
+
+#undef FABRIC_PER_SHEET
@@ -226,9 +226,13 @@
 			if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 				return
 			if(new_eye_color)
-				H.eye_color = sanitize_hexcolor(new_eye_color)
+				var/n_color = sanitize_hexcolor(new_eye_color)
+				var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES)
+				if(eyes)
+					eyes.eye_color = n_color
+				H.eye_color = n_color
 				H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK)
-				H.update_body()
+				H.dna.species.handle_body()
 	if(choice)
 		curse(user)

@@ -192,7 +192,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
 					icon_state = "morgue4" // Cloneable
 					if(mob_occupant.stat == DEAD && beeper)
 						if(world.time > next_beep)
-							playsound(src, 'sound/weapons/smg_empty_alarm.ogg', 50, 0) //Clone them you blind fucks
+							playsound(src, 'sound/machines/beeping_alarm.ogg', 50, 0) //Clone them you blind fucks
 							next_beep = world.time + beep_cooldown
 					break

@@ -15,6 +15,15 @@
 	var/flipped_build_type
 	var/base_icon

+/obj/structure/c_transit_tube/proc/can_wrench_in_loc(mob/user)
+	var/turf/source_turf = get_turf(loc)
+	var/existing_tubes = 0
+	for(var/obj/structure/transit_tube/tube in source_turf)
+		existing_tubes++
+		if(existing_tubes >= 2)
+			to_chat(user, "<span class='warning'>You cannot wrench any more transit tubes!</span>")
+			return FALSE
+	return TRUE

 /obj/structure/c_transit_tube/ComponentInitialize()
 	. = ..()
@@ -32,9 +41,11 @@
 		icon_state = "[base_icon][flipped]"

 /obj/structure/c_transit_tube/wrench_act(mob/living/user, obj/item/I)
+	if(!can_wrench_in_loc(user))
+		return
 	to_chat(user, "<span class='notice'>You start attaching the [name]...</span>")
 	add_fingerprint(user)
-	if(I.use_tool(src, user, time_to_unwrench, volume=50))
+	if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user)))
 		to_chat(user, "<span class='notice'>You attach the [name].</span>")
 		var/obj/structure/transit_tube/R = new build_type(loc, dir)
 		transfer_fingerprints_to(R)
@@ -104,6 +104,47 @@
 	light_range = 2
 	light_power = 0.80
 	light_color = "#33CCFF"
+	color = "#33CCFF"
+
+/turf/open/floor/grass/fairy/white
+	name = "white fairygrass patch"
+	light_color = "#FFFFFF"
+	color = "#FFFFFF"
+	floor_tile = /obj/item/stack/tile/fairygrass/white
+
+/turf/open/floor/grass/fairy/red
+	name = "red fairygrass patch"
+	light_color = "#FF3333"
+	color = "#FF3333"
+	floor_tile = /obj/item/stack/tile/fairygrass/red
+
+/turf/open/floor/grass/fairy/yellow
+	name = "yellow fairygrass patch"
+	light_color = "#FFFF66"
+	color = "#FFFF66"
+	floor_tile = /obj/item/stack/tile/fairygrass/yellow
+
+/turf/open/floor/grass/fairy/green
+	name = "green fairygrass patch"
+	light_color = "#99FF99"
+	color = "#99FF99"
+	floor_tile = /obj/item/stack/tile/fairygrass/green
+
+/turf/open/floor/grass/fairy/blue
+	name = "blue fairygrass patch"
+	floor_tile = /obj/item/stack/tile/fairygrass/blue
+
+/turf/open/floor/grass/fairy/purple
+	name = "purple fairygrass patch"
+	light_color = "#D966FF"
+	color = "#D966FF"
+	floor_tile = /obj/item/stack/tile/fairygrass/purple
+
+/turf/open/floor/grass/fairy/pink
+	name = "pink fairygrass patch"
+	light_color = "#FFB3DA"
+	color = "#FFB3DA"
+	floor_tile = /obj/item/stack/tile/fairygrass/pink

 /turf/open/floor/grass/snow
 	gender = PLURAL
@@ -27,6 +27,8 @@
 /turf/open/space/Initialize()
 	icon_state = SPACE_ICON_STATE
 	air = space_gas
+	vis_contents.Cut() //removes inherited overlays
+	visibilityChanged()

 	if(flags_1 & INITIALIZED_1)
 		stack_trace("Warning: [src]([type]) initialized multiple times!")
@@ -720,20 +720,44 @@

 	if(!check_rights(R_SPAWN))
 		return
+	var/turf/T = get_turf(usr)

 	var/chosen = pick_closest_path(object)
 	if(!chosen)
 		return
 	if(ispath(chosen, /turf))
-		var/turf/T = get_turf(usr.loc)
 		T.ChangeTurf(chosen)
 	else
-		var/atom/A = new chosen(usr.loc)
+		var/atom/A = new chosen(T)
 		A.flags_1 |= ADMIN_SPAWNED_1

 	log_admin("[key_name(usr)] spawned [chosen] at [AREACOORD(usr)]")
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "Spawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

+/datum/admins/proc/podspawn_atom(object as text)
+	set category = "Debug"
+	set desc = "(atom path) Spawn an atom via supply drop"
+	set name = "Podspawn"
+
+	if(!check_rights(R_SPAWN))
+		return
+
+	var/chosen = pick_closest_path(object)
+	if(!chosen)
+		return
+	var/turf/T = get_turf(usr)
+
+	if(ispath(chosen, /turf))
+		T.ChangeTurf(chosen)
+	else
+		var/obj/structure/closet/supplypod/centcompod/pod = new()
+		var/atom/A = new chosen(pod)
+		A.flags_1 |= ADMIN_SPAWNED_1
+		new /obj/effect/abstract/DPtarget(T, pod)
+
+	log_admin("[key_name(usr)] pod-spawned [chosen] at [AREACOORD(usr)]")
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "Podspawn Atom") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
 /datum/admins/proc/spawn_cargo(object as text)
 	set category = "Debug"
 	set desc = "(atom path) Spawn a cargo crate"
@@ -875,7 +899,7 @@
 /datum/admins/proc/dynamic_mode_options(mob/user)
 	var/dat = {"
 		<center><B><h2>Dynamic Mode Options</h2></B></center><hr>
-		<br/> 
+		<br/>
 		<h3>Common options</h3>
 		<i>All these options can be changed midround.</i> <br/>
 		<br/>
@@ -108,7 +108,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
 	/client/proc/roll_dices					//CIT CHANGE - Adds dice verb
 	))
 GLOBAL_PROTECT(admin_verbs_fun)
-GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character))
+GLOBAL_LIST_INIT(admin_verbs_spawn, list(/datum/admins/proc/spawn_atom, /datum/admins/proc/podspawn_atom, /datum/admins/proc/spawn_cargo, /datum/admins/proc/spawn_objasmob, /client/proc/respawn_character))
 GLOBAL_PROTECT(admin_verbs_spawn)
 GLOBAL_LIST_INIT(admin_verbs_server, world.AVerbsServer())
 /world/proc/AVerbsServer()
@@ -2355,7 +2355,7 @@

 		var/atom/target //Where the object will be spawned
 		var/where = href_list["object_where"]
-		if (!( where in list("onfloor","inhand","inmarked") ))
+		if (!( where in list("onfloor","frompod","inhand","inmarked") ))
 			where = "onfloor"


@@ -2366,7 +2366,7 @@
 					where = "onfloor"
 				target = usr

-			if("onfloor")
+			if("onfloor", "frompod")
 				switch(href_list["offset_type"])
 					if ("absolute")
 						target = locate(0 + X,0 + Y,0 + Z)
@@ -2382,7 +2382,10 @@
 				else
 					target = marked_datum

+		var/obj/structure/closet/supplypod/centcompod/pod
 		if(target)
+			if(where == "frompod")
+				pod = new()
 			for (var/path in paths)
 				for (var/i = 0; i < number; i++)
 					if(path in typesof(/turf))
@@ -2391,7 +2394,11 @@
 						if(N && obj_name)
 							N.name = obj_name
 					else
-						var/atom/O = new path(target)
+						var/atom/O
+						if(where == "frompod")
+							O = new path(pod)
+						else
+							O = new path(target)
 						if(!QDELETED(O))
 							O.flags_1 |= ADMIN_SPAWNED_1
 							if(obj_dir)
@@ -2411,6 +2418,8 @@
 										R.module.add_module(I, TRUE, TRUE)
 										R.activate_module(I)

+		if(pod)
+			new /obj/effect/abstract/DPtarget(target, pod)

 		if (number == 1)
 			log_admin("[key_name(usr)] created a [english_list(paths)]")
@@ -1249,7 +1249,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 	if(!check_rights(R_ADMIN) || !check_rights(R_FUN))
 		return

-	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD)
+	var/list/punishment_list = list(ADMIN_PUNISHMENT_PIE, ADMIN_PUNISHMENT_FIREBALL, ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_SUPPLYPOD_QUICK, ADMIN_PUNISHMENT_SUPPLYPOD, ADMIN_PUNISHMENT_MAZING, ADMIN_PUNISHMENT_ROD)

 	var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list

@@ -1277,6 +1277,22 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			var/turf/startT = spaceDebrisStartLoc(startside, T.z)
 			var/turf/endT = spaceDebrisFinishLoc(startside, T.z)
 			new /obj/effect/immovablerod(startT, endT,target)
+		if(ADMIN_PUNISHMENT_SUPPLYPOD_QUICK)
+			var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text
+			var/obj/structure/closet/supplypod/centcompod/pod = new()
+			pod.damage = 40
+			pod.explosionSize = list(0,0,0,2)
+			pod.effectStun = TRUE
+			if (isnull(target_path)) //The user pressed "Cancel"
+				return
+			if (target_path != "empty")//if you didn't type empty, we want to load the pod with a delivery
+				var/delivery = text2path(target_path)
+				if(!ispath(delivery))
+					delivery = pick_closest_path(target_path)
+					if(!delivery)
+						alert("ERROR: Incorrect / improper path given.")
+				new delivery(pod)
+			new /obj/effect/abstract/DPtarget(get_turf(target), pod)
 		if(ADMIN_PUNISHMENT_SUPPLYPOD)
 			var/datum/centcom_podlauncher/plaunch  = new(usr)
 			if(!holder)
@@ -1289,6 +1305,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			plaunch.temp_pod.explosionSize = list(0,0,0,2)
 			plaunch.temp_pod.effectStun = TRUE
 			plaunch.ui_interact(usr)
+			return //We return here because punish_log() is handled by the centcom_podlauncher datum

 		if(ADMIN_PUNISHMENT_MAZING)
 			if(!puzzle_imprison(target))
@@ -1298,11 +1315,13 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			var/obj/item/reagent_containers/food/snacks/pie/cream/nostun/creamy = new(get_turf(target))
 			creamy.splat(target)

-	var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
-	message_admins(msg)
-	admin_ticket_log(target, msg)
-	log_admin("[key_name(usr)] punished [key_name(target)] with [punishment].")
+	punish_log(target, punishment)

+/client/proc/punish_log(var/whom, var/punishment)
+	var/msg = "[key_name_admin(usr)] punished [key_name_admin(whom)] with [punishment]."
+	message_admins(msg)
+	admin_ticket_log(whom, msg)
+	log_admin("[key_name(usr)] punished [key_name(whom)] with [punishment].")

 /client/proc/trigger_centcom_recall()
 	if(!check_rights(R_ADMIN))
--- a/Show More
+++ b/Show More