Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods

code/__DEFINES/antagonists.dm

@@ -35,3 +35,8 @@
 
 //Overthrow time to update heads obj
 #define OBJECTIVE_UPDATING_TIME 300
+
+//Gangshit
+#define NOT_DOMINATING			-1
+#define MAX_LEADERS_GANG		3
+#define INITIAL_DOM_ATTEMPTS	3

code/__DEFINES/atmospherics.dm

@@ -1,8 +1,5 @@
 //LISTMOS
 //indices of values in gas lists.
-#define MOLES			1
-#define ARCHIVE			2
-#define GAS_META		3
 #define META_GAS_SPECIFIC_HEAT	1
 #define META_GAS_NAME			2
 #define META_GAS_MOLES_VISIBLE	3
@@ -242,20 +239,25 @@
 
 //HELPERS
 #define THERMAL_ENERGY(gas) (gas.temperature * gas.heat_capacity())
-
-#define ADD_GAS(gas_id, out_list)\
-	var/list/tmp_gaslist = GLOB.gaslist_cache[gas_id]; out_list[gas_id] = tmp_gaslist.Copy();
-
-#define ASSERT_GAS(gas_id, gas_mixture) if (!gas_mixture.gases[gas_id]) { ADD_GAS(gas_id, gas_mixture.gases) };
-
+#define QUANTIZE(variable)		(round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
+															once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
 
 //prefer this to gas_mixture/total_moles in performance critical areas
 #define TOTAL_MOLES(cached_gases, out_var)\
 	out_var = 0;\
 	for(var/total_moles_id in cached_gases){\
-		out_var += cached_gases[total_moles_id][MOLES];\
+		out_var += cached_gases[total_moles_id];\
 	}
 
+//Unomos - So for whatever reason, garbage collection actually drastically decreases the cost of atmos later in the round. Turning this into a define yields massively improved performance.
+#define GAS_GARBAGE_COLLECT(GASGASGAS)\
+	var/list/CACHE_GAS = GASGASGAS;\
+	for(var/id in CACHE_GAS){\
+		if(QUANTIZE(CACHE_GAS[id]) <= 0)\
+			CACHE_GAS -= id;\
+	}
+
+#define ARCHIVE_TEMPERATURE(gas) gas.temperature_archived = gas.temperature
 
 GLOBAL_LIST_INIT(pipe_paint_colors, list(
 		"amethyst" = rgb(130,43,255), //supplymain

code/__DEFINES/citadel_defines.dm

@@ -12,7 +12,7 @@
 #define ui_boxcraft "EAST-4:22,SOUTH+1:6"
 #define ui_boxarea "EAST-4:6,SOUTH+1:6"
 #define ui_boxlang "EAST-5:22,SOUTH+1:6"
-#define ui_boxvore	"EAST-4:22,SOUTH+1:6"
+#define ui_boxvore	"EAST-5:22,SOUTH+1:6"
 
 //Filters
 #define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, border=0, color="#04080F")
@@ -33,8 +33,8 @@
 #define BALLS_VOLUME_MULT	1
 
 #define BALLS_SIZE_MIN		1
-#define BALLS_SIZE_DEF	3
-#define BALLS_SIZE_MAX		7
+#define BALLS_SIZE_DEF		2
+#define BALLS_SIZE_MAX		3
 
 #define BALLS_SACK_SIZE_MIN 1
 #define BALLS_SACK_SIZE_DEF	8

code/__DEFINES/colors.dm

@@ -3,26 +3,35 @@
 #define COLOR_INPUT_DISABLED "#F0F0F0"
 #define COLOR_INPUT_ENABLED "#D3B5B5"
 
-//#define COLOR_WHITE            "#EEEEEE"
-//#define COLOR_SILVER           "#C0C0C0"
-//#define COLOR_GRAY             "#808080"
+#define COLOR_DARKMODE_INFO_BUTTONS_BG "#40628A"
+#define COLOR_DARKMODE_ISSUE_BUTTON_BG "#ce4242"
+#define COLOR_DARKMODE_BACKGROUND "#202020"
+#define COLOR_DARKMODE_DARKBACKGROUND "#171717"
+#define COLOR_DARKMODE_TEXT "#f0f0f0"
+
+#define COLOR_WHITEMODE_INFO_BUTTONS_BG "#90b3dd"
+#define COLOR_WHITEMODE_ISSUE_BUTTON_BG "#ef7f7f"
+#define COLOR_WHITEMODE_BACKGROUND "#ffffff"
+#define COLOR_WHITEMODE_DARKBACKGROUND "#eeeeee"
+#define COLOR_WHITEMODE_TEXT "#000000"
+
 #define COLOR_FLOORTILE_GRAY   "#8D8B8B"
 #define COLOR_ALMOST_BLACK	   "#333333"
-//#define COLOR_BLACK            "#000000"
+#define COLOR_BLACK            "#000000"
 #define COLOR_RED              "#FF0000"
-//#define COLOR_RED_LIGHT        "#FF3333"
-//#define COLOR_MAROON           "#800000"
+#define COLOR_RED_LIGHT        "#FF3333"
+#define COLOR_MAROON           "#800000"
 #define COLOR_YELLOW           "#FFFF00"
-//#define COLOR_OLIVE            "#808000"
-//#define COLOR_LIME             "#32CD32"
+#define COLOR_OLIVE            "#808000"
+#define COLOR_LIME             "#32CD32"
 #define COLOR_GREEN            "#008000"
 #define COLOR_CYAN             "#00FFFF"
-//#define COLOR_TEAL             "#008080"
+#define COLOR_TEAL             "#008080"
 #define COLOR_BLUE             "#0000FF"
-//#define COLOR_BLUE_LIGHT       "#33CCFF"
-//#define COLOR_NAVY             "#000080"
+#define COLOR_BLUE_LIGHT       "#33CCFF"
+#define COLOR_NAVY             "#000080"
 #define COLOR_PINK             "#FFC0CB"
-//#define COLOR_MAGENTA          "#FF00FF"
+#define COLOR_MAGENTA          "#FF00FF"
 #define COLOR_PURPLE           "#800080"
 #define COLOR_ORANGE           "#FF9900"
 #define COLOR_BEIGE            "#CEB689"

code/__DEFINES/components.dm

@@ -131,6 +131,17 @@
 #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)
+#define COMSIG_MOB_UPDATE_SIGHT "mob_update_sight"				//from base of /mob/update_sight(): ()
+#define COMSIG_MOB_SAY "mob_say" // from /mob/living/say(): (proc args list)
+	#define COMPONENT_UPPERCASE_SPEECH 1
+	// used to access COMSIG_MOB_SAY argslist
+	#define SPEECH_MESSAGE 1
+	// #define SPEECH_BUBBLE_TYPE 2
+	#define SPEECH_SPANS 3
+	/* #define SPEECH_SANITIZE 4
+	#define SPEECH_LANGUAGE 5
+	#define SPEECH_IGNORE_SPAM 6
+	#define SPEECH_FORCED 7 */
 
 // /mob/living signals
 #define COMSIG_LIVING_RESIST "living_resist"					//from base of mob/living/resist() (/mob/living)
@@ -143,8 +154,9 @@
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))
 
 // /obj signals
-#define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
-#define COMSIG_OBJ_SETANCHORED "obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
+#define COMSIG_OBJ_DECONSTRUCT 	"obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
+#define COMSIG_OBJ_BREAK		"obj_break"						//from base of /obj/obj_break(): (damage_flag)
+#define COMSIG_OBJ_SETANCHORED 	"obj_setanchored"				//called in /obj/structure/setAnchored(): (value)
 
 // /obj/item signals
 #define COMSIG_ITEM_ATTACK "item_attack"						//from base of obj/item/attack(): (/mob/living/target, /mob/living/user)

code/__DEFINES/construction.dm

@@ -102,7 +102,8 @@
 #define CAT_SANDWICH	"Sandwiches"
 #define CAT_SOUP	"Soups"
 #define CAT_SPAGHETTI	"Spaghettis"
-#define CAT_SUSHI	"Fish"
+#define CAT_FISH	"Fish"
+#define CAT_ICE	"Frozen"
 
 #define RCD_FLOORWALL 1
 #define RCD_AIRLOCK 2

code/__DEFINES/flags.dm

@@ -7,7 +7,8 @@
 //for convenience
 #define ENABLE_BITFIELD(variable, flag) (variable |= (flag))
 #define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag))
-#define CHECK_BITFIELD(variable, flag) (variable & flag)
+#define CHECK_BITFIELD(variable, flag) (variable & (flag))
+#define TOGGLE_BITFIELD(variable, flag) (variable ^= (flag))
 
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
 
@@ -56,9 +57,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define FLYING (1<<1)
 #define VENTCRAWLING (1<<2)
 
-// Flags for reagents
-#define REAGENT_NOREACT (1<<0)
-
 //Fire and Acid stuff, for resistance_flags
 #define LAVA_PROOF		(1<<0)
 #define FIRE_PROOF		(1<<1) //100% immune to fire damage (but not necessarily to lava or heat)

code/__DEFINES/food.dm

@@ -16,3 +16,4 @@
 #define DRINK_GOOD	2
 #define DRINK_VERYGOOD	3
 #define DRINK_FANTASTIC	4
+#define FOOD_AMAZING 5

code/__DEFINES/inventory.dm

@@ -28,6 +28,7 @@
 #define ITEM_SLOT_POCKET		(1<<11) // this is to allow items with a w_class of WEIGHT_CLASS_NORMAL or WEIGHT_CLASS_BULKY to fit in pockets.
 #define ITEM_SLOT_DENYPOCKET	(1<<12) // this is to deny items with a w_class of WEIGHT_CLASS_SMALL or WEIGHT_CLASS_TINY to fit in pockets.
 #define ITEM_SLOT_NECK			(1<<13)
+#define ITEM_SLOT_SUITSTORE		(1<<14)
 
 //SLOTS
 #define SLOT_BACK			1
@@ -52,6 +53,7 @@
 #define SLOT_LEGCUFFED		19
 #define SLOT_GENERC_DEXTROUS_STORAGE	20
 
+
 #define SLOTS_AMT			20 // Keep this up to date!
 
 //I hate that this has to exist
@@ -84,6 +86,8 @@
 			. = ITEM_SLOT_ICLOTHING
 		if(SLOT_L_STORE, SLOT_R_STORE)
 			. = ITEM_SLOT_POCKET
+		if(SLOT_S_STORE)
+			. = ITEM_SLOT_SUITSTORE
 
 
 //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses.

code/__DEFINES/logging.dm

@@ -16,6 +16,7 @@
 #define INVESTIGATE_EXONET			"exonet"
 #define INVESTIGATE_NANITES			"nanites"
 #define INVESTIGATE_CIRCUIT			"circuit"
+#define INVESTIGATE_RCD				"rcd"
 
 // Logging types for log_message()
 #define LOG_ATTACK		(1 << 0)

code/__DEFINES/misc.dm

@@ -114,8 +114,9 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 
 #define TRANSITIONEDGE			7 //Distance from edge to move to another z-level
 
-#define BE_CLOSE 1		//in the case of a silicon, to select if they need to be next to the atom
-#define NO_DEXTERY 1	//if other mobs (monkeys, aliens, etc) can use this
+#define BE_CLOSE TRUE		//in the case of a silicon, to select if they need to be next to the atom
+#define NO_DEXTERY TRUE	//if other mobs (monkeys, aliens, etc) can use this
+#define NO_TK TRUE
 //used by canUseTopic()
 
 //singularity defines
@@ -225,6 +226,9 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 //Gets the turf this atom inhabits
 #define get_turf(A) (get_step(A, 0))
 
+//Same as above except gets the area instead
+#define get_area(A) (isarea(A) ? A : get_step(A, 0)?.loc)
+
 //Ghost orbit types:
 #define GHOST_ORBIT_CIRCLE		"circle"
 #define GHOST_ORBIT_TRIANGLE	"triangle"
@@ -269,9 +273,14 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 
 GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 
-//Color Defines
-#define OOC_COLOR  "#002eb8"
-#define AOOC_COLOR "#b8002e"
+//pda icon reskins
+#define PDA_SKIN_CLASSIC "Classic"
+#define PDA_SKIN_ALT "Holographic"
+#define PDA_SKIN_RUGGED "Rugged"
+#define PDA_SKIN_MODERN "Modern"
+
+GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_SKIN_ALT = 'icons/obj/pda_alt.dmi',
+								PDA_SKIN_RUGGED = 'icons/obj/pda_rugged.dmi', PDA_SKIN_MODERN = 'icons/obj/pda_modern.dmi'))
 
 /////////////////////////////////////
 // atom.appearence_flags shortcuts //
@@ -376,6 +385,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 #define CLOCK_SILICONS 22
 #define CLOCK_PROSELYTIZATION 23
 #define SHUTTLE_HIJACK 24
+#define GANG_VICTORY 25
 
 #define FIELD_TURF 1
 #define FIELD_EDGE 2
@@ -483,4 +493,7 @@ GLOBAL_LIST_INIT(pda_styles, list(MONO, VT, ORBITRON, SHARE))
 #define AREASELECT_CORNERA "corner A"
 #define AREASELECT_CORNERB "corner B"
 
-#define PREF_SAVELOAD_COOLDOWN 5
+#define PREF_SAVELOAD_COOLDOWN 5
+
+#define VOMIT_TOXIC 1
+#define VOMIT_PURPLE 2

code/__DEFINES/mobs.dm

@@ -54,6 +54,10 @@
 #define BODYPART_ORGANIC   1
 #define BODYPART_ROBOTIC   2
 
+#define BODYPART_NOT_DISABLED 0
+#define BODYPART_DISABLED_DAMAGE 1
+#define BODYPART_DISABLED_PARALYSIS 2
+
 #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi'
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
 

code/__DEFINES/obj_flags.dm

@@ -20,12 +20,13 @@
 #define FORCE_STRING_OVERRIDE	(1<<2) // used for tooltips
 #define NEEDS_PERMIT			(1<<3) //Used by security bots to determine if this item is safe for public use.
 #define SLOWS_WHILE_IN_HAND		(1<<4)
-#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 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 NODROP					(1<<8)		// This flag makes it so that an item literally cannot be removed at all, or at least that's how it should be. Only deleted.
-#define ABSTRACT				(1<<9) 	// for all things that are technically items but used for various different stuff
-#define IMMUTABLE_SLOW          (1<<10) //When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define ABSTRACT				(1<<8) 	// for all things that are technically items but used for various different stuff
+#define IMMUTABLE_SLOW          (1<<9) //When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define SURGICAL_TOOL			(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
+#define NO_UNIFORM_REQUIRED		(1<<11) // Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
 
 // Flags for the clothing_flags var on /obj/item/clothing
 
@@ -35,3 +36,5 @@
 #define MASKINTERNALS				    (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.

code/__DEFINES/reactions.dm

@@ -23,6 +23,11 @@
 #define STIMULUM_ABSOLUTE_DROP				0.00000335
 #define REACTION_OPPRESSION_THRESHOLD		5
 #define NOBLIUM_FORMATION_ENERGY			2e9 	//1 Mole of Noblium takes the planck energy to condense.
+//Research point amounts
+#define NOBLIUM_RESEARCH_AMOUNT				1000
+#define BZ_RESEARCH_AMOUNT					150
+#define MIASMA_RESEARCH_AMOUNT				160
+#define STIMULUM_RESEARCH_AMOUNT			50
 //Plasma fusion properties
 #define FUSION_ENERGY_THRESHOLD				3e9 	//Amount of energy it takes to start a fusion reaction
 #define FUSION_TEMPERATURE_THRESHOLD		1000 	//Temperature required to start a fusion reaction

code/__DEFINES/reagents.dm

@@ -2,7 +2,7 @@
 #define LIQUID			2
 #define GAS				3
 
-// container_type defines
+// reagents_flags defines
 #define INJECTABLE		(1<<0)	// Makes it possible to add reagents through droppers and syringes.
 #define DRAWABLE		(1<<1)	// Makes it possible to remove reagents through syringes.
 
@@ -11,6 +11,7 @@
 
 #define TRANSPARENT		(1<<4)	// Used on containers which you want to be able to see the reagents off.
 #define AMOUNT_VISIBLE	(1<<5)	// For non-transparent containers that still have the general amount of reagents in them visible.
+#define NO_REACT        (1<<6)  // Applied to a reagent holder, the contents will not react with each other.
 
 // Is an open container for all intents and purposes.
 #define OPENCONTAINER 	(REFILLABLE | DRAINABLE | TRANSPARENT)

code/__DEFINES/role_preferences.dm

@@ -33,7 +33,8 @@
 #define ROLE_DRONE                  "drone"
 #define ROLE_DEATHSQUAD             "deathsquad"
 #define ROLE_LAVALAND               "lavaland"
-#define ROLE_INTERNAL_AFFAIRS	"internal affairs agent"
+#define ROLE_INTERNAL_AFFAIRS		"internal affairs agent"
+#define ROLE_GANG					"gangster"
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough
@@ -58,7 +59,8 @@ GLOBAL_LIST_INIT(special_roles, list(
 	ROLE_SERVANT_OF_RATVAR = /datum/game_mode/clockwork_cult,
 	ROLE_OVERTHROW = /datum/game_mode/overthrow,
 	ROLE_INTERNAL_AFFAIRS = /datum/game_mode/traitor/internal_affairs,
-	ROLE_SENTIENCE
+	ROLE_SENTIENCE,
+	ROLE_GANG = /datum/game_mode/gang
 ))
 
 //Job defines for what happens when you fail to qualify for any job during job selection

code/__DEFINES/subsystems.dm

@@ -81,7 +81,7 @@
 #define INIT_ORDER_STICKY_BAN		-10
 #define INIT_ORDER_LIGHTING			-20
 #define INIT_ORDER_SHUTTLE			-21
-#define INIT_ORDER_SQUEAK			-40
+#define INIT_ORDER_MINOR_MAPPING	-40
 #define INIT_ORDER_PATH				-50
 #define INIT_ORDER_PERSISTENCE		-100
 
@@ -102,7 +102,6 @@
 #define FIRE_PRIORITY_SPACEDRIFT	30
 #define FIRE_PRIORITY_FIELDS		30
 #define FIRE_PRIOTITY_SMOOTHING		35
-#define FIRE_PRIORITY_ORBIT			35
 #define FIRE_PRIORITY_NETWORKS		40
 #define FIRE_PRIORITY_OBJ			40
 #define FIRE_PRIORITY_ACID			40

code/__DEFINES/traits.dm

@@ -1,3 +1,61 @@
+// trait accessor defines
+#define ADD_TRAIT(target, trait, source) \
+	do { \
+		var/list/_L; \
+		if (!target.status_traits) { \
+			target.status_traits = list(); \
+			_L = target.status_traits; \
+			_L[trait] = list(source); \
+		} else { \
+			_L = target.status_traits; \
+			if (_L[trait]) { \
+				_L[trait] |= list(source); \
+			} else { \
+				_L[trait] = list(source); \
+			} \
+		} \
+	} while (0)
+#define REMOVE_TRAIT(target, trait, sources) \
+	do { \
+		var/list/_L = target.status_traits; \
+		var/list/_S; \
+		if (sources && !islist(sources)) { \
+			_S = list(sources); \
+		} else { \
+			_S = sources\
+		}; \
+		if (_L && _L[trait]) { \
+			for (var/_T in _L[trait]) { \
+				if ((!_S && (_T != ROUNDSTART_TRAIT)) || (_T in _S)) { \
+					_L[trait] -= _T \
+				} \
+			};\
+			if (!length(_L[trait])) { \
+				_L -= trait \
+			}; \
+			if (!length(_L)) { \
+				target.status_traits = null \
+			}; \
+		} \
+	} while (0)
+#define REMOVE_TRAITS_NOT_IN(target, sources) \
+	do { \
+		var/list/_L = target.status_traits; \
+		var/list/_S = sources; \
+		if (_L) { \
+			for (var/_T in _L) { \
+				_L[_T] &= _S;\
+				if (!length(_L[_T])) { \
+					_L -= _T } \
+				};\
+				if (!length(_L)) { \
+					target.status_traits = null\
+				};\
+		}\
+	} while (0)
+#define HAS_TRAIT(target, trait) (target.status_traits ? (target.status_traits[trait] ? TRUE : FALSE) : FALSE)
+#define HAS_TRAIT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (source in target.status_traits[trait]) : FALSE) : FALSE)
+
 //mob traits
 #define TRAIT_BLIND 			"blind"
 #define TRAIT_MUTE				"mute"
@@ -50,7 +108,20 @@
 #define TRAIT_NOHARDCRIT		"nohardcrit"
 #define TRAIT_NOSOFTCRIT		"nosoftcrit"
 #define TRAIT_MINDSHIELD		"mindshield"
+#define TRAIT_PARALYSIS_L_ARM	"para-l-arm" //These are used for brain-based paralysis, where replacing the limb won't fix it
+#define TRAIT_PARALYSIS_R_ARM	"para-r-arm"
+#define TRAIT_PARALYSIS_L_LEG	"para-l-leg"
+#define TRAIT_PARALYSIS_R_LEG	"para-r-leg"
+#define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech"
+#define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
+#define	TRAIT_STRONG_GRABBER	"strong_grabber"
+#define	TRAIT_CALCIUM_HEALER	"calcium_healer"
 
+ //non-mob traits
+#define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
+
+// item traits
+#define TRAIT_NODROP            "nodrop"
 
 #define TRAIT_ALCOHOL_TOLERANCE	"alcohol_tolerance"
 #define TRAIT_AGEUSIA			"ageusia"
@@ -72,6 +143,11 @@
 #define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
 #define TRAIT_MASO              "masochism"
+#define TRAIT_PARA              "paraplegic"
+#define TRAIT_EMPATH			"empath"
+#define TRAIT_FRIENDLY			"friendly"
+#define TRAIT_ASSBLASTUSA       "assblastusa"
+#define TRAIT_CULT_EYES 		"cult_eyes"
 
 // common trait sources
 #define TRAIT_GENERIC "generic"
@@ -82,6 +158,13 @@
 #define TRAUMA_TRAIT "trauma"
 #define SPECIES_TRAIT "species"
 #define ORGAN_TRAIT "organ"
+#define JOB_TRAIT "job"
+#define CYBORG_ITEM_TRAIT "cyborg-item"
+#define ADMIN_TRAIT "admin" // (B)admins only.
+#define CHANGELING_TRAIT "changeling"
+#define CULT_TRAIT "cult"
+#define CURSED_ITEM_TRAIT "cursed-item" // The item is magically cursed
+#define ABSTRACT_ITEM_TRAIT "abstract-item"
 #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention
 
 // unique trait sources, still defines
@@ -94,4 +177,24 @@
 #define STASIS_MUTE "stasis"
 #define GENETICS_SPELL "genetics_spell"
 #define EYES_COVERED "eyes_covered"
-#define CULT_EYES "cult_eyes"
+#define CULT_TRAIT "cult"
+#define CLOWN_NUKE_TRAIT "clown-nuke"
+#define STICKY_MOUSTACHE_TRAIT "sticky-moustache"
+#define CHAINSAW_FRENZY_TRAIT "chainsaw-frenzy"
+#define CHRONO_GUN_TRAIT "chrono-gun"
+#define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap"
+#define GLUED_ITEM_TRAIT "glued-item"
+#define CURSED_MASK_TRAIT "cursed-mask"
+#define HIS_GRACE_TRAIT "his-grace"
+#define HAND_REPLACEMENT_TRAIT "magic-hand"
+#define HOT_POTATO_TRAIT "hot-potato"
+#define SABRE_SUICIDE_TRAIT "sabre-suicide"
+#define ABDUCTOR_VEST_TRAIT "abductor-vest"
+#define CAPTURE_THE_FLAG_TRAIT "capture-the-flag"
+#define EYE_OF_GOD_TRAIT "eye-of-god"
+#define SHAMEBRERO_TRAIT "shamebrero"
+#define CHRONOSUIT_TRAIT "chronosuit"
+#define FLIGHTSUIT_TRAIT "flightsuit"
+#define LOCKED_HELMET_TRAIT "locked-helmet"
+#define NINJA_SUIT_TRAIT "ninja-suit"
+#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"

code/__HELPERS/_cit_helpers.dm

@@ -58,8 +58,11 @@ GLOBAL_LIST_EMPTY(ipc_antennas_list)
 	//Genitals and Arousal Lists
 GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm
 GLOBAL_LIST_EMPTY(cock_shapes_icons) //Associated list for names->icon_states for cockshapes.
+GLOBAL_LIST_EMPTY(balls_shapes_list)
+GLOBAL_LIST_EMPTY(balls_shapes_icons)
 GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
+GLOBAL_LIST_EMPTY(breasts_shapes_icons)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
 GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
 GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft"))
@@ -189,36 +192,36 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 /mob/living/carbon/proc/has_penis()
 	if(getorganslot("penis"))//slot shared with ovipositor
 		if(istype(getorganslot("penis"), /obj/item/organ/genital/penis))
-			return 1
-	return 0
+			return TRUE
+	return FALSE
 
 /mob/living/carbon/proc/has_balls()
 	if(getorganslot("balls"))
 		if(istype(getorganslot("balls"), /obj/item/organ/genital/testicles))
-			return 1
-	return 0
+			return TRUE
+	return FALSE
 
 /mob/living/carbon/proc/has_vagina()
 	if(getorganslot("vagina"))
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /mob/living/carbon/proc/has_breasts()
 	if(getorganslot("breasts"))
-		return 1
-	return 0
+		return TRUE
+	return FALSE
 
 /mob/living/carbon/proc/has_ovipositor()
 	if(getorganslot("penis"))//shared slot
 		if(istype(getorganslot("penis"), /obj/item/organ/genital/ovipositor))
-			return 1
-	return 0
+			return TRUE
+	return FALSE
 
 /mob/living/carbon/human/proc/has_eggsack()
 	if(getorganslot("balls"))
 		if(istype(getorganslot("balls"), /obj/item/organ/genital/eggsack))
-			return 1
-	return 0
+			return TRUE
+	return FALSE
 
 /mob/living/carbon/human/proc/is_bodypart_exposed(bodypart)
 
@@ -227,16 +230,16 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		L = get_equipped_items()
 	for(var/obj/item/I in L)
 		if(I.body_parts_covered & GROIN)
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 /mob/living/carbon/proc/is_chest_exposed(var/list/L)
 	if(!L)
 		L = get_equipped_items()
 	for(var/obj/item/I in L)
 		if(I.body_parts_covered & CHEST)
-			return 0
-	return 1
+			return FALSE
+	return TRUE
 
 ////////////////////////
 //DANGER | DEBUG PROCS//
@@ -257,40 +260,3 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 			H.give_vagina()
 			H.give_womb()
 			H.give_breasts()
-
-/client/proc/test_mammal_overlays()
-	set name = "Mass Give Mammalitus"
-	set category = "Dangerous"
-	set desc = "Turns every human into a mammal with tails, ears, etc. WARNING: NOT FOR LIVE SERVER USAGE!!"
-
-	log_admin("[src] turned everyone into mammals.")
-	message_admins("[src] turned everyone into mammals.")
-	for(var/mob/living/carbon/human/H in GLOB.mob_list)
-		if(!H.dna)
-			continue
-		var/datum/dna/hdna = H.dna
-		H.set_species(/datum/species/mammal)
-		var/subspec = pick("Fox","Wolf","Fennec")
-		switch(subspec)
-			if("Wolf")
-				hdna.features["mam_tail"] = "Wolf"
-				hdna.features["mam_ears"] = "Wolf"
-				hdna.features["mam_snouts"] = "Wolf"
-				hdna.features["mam_body_markings"] = "Wolf"
-				hdna.features["mcolor"] = "555"
-				hdna.features["mcolor2"] = "999"
-				hdna.features["mcolor3"] = "999"
-			if("Fox")
-				hdna.features["mam_tail"] = "Fox"
-				hdna.features["mam_ears"] = "Fox"
-				hdna.features["mam_snouts"] = "Fox, Long"
-				hdna.features["mam_body_markings"] = "Fox"
-				hdna.features["mcolor"] = "f60"
-				hdna.features["mcolor2"] = "fff"
-				hdna.features["mcolor3"] = "fff"
-			if("Fennec")
-				hdna.features["mam_tail"] = "Fennec"
-				hdna.features["mam_ears"] = "Fennec"
-				hdna.features["mam_snouts"] = "Fox, Short"
-				hdna.features["mam_body_markings"] = "Fox"
-		H.regenerate_icons()

code/__HELPERS/areas.dm

@@ -86,6 +86,8 @@
 		newA.contents += thing
 		thing.change_area(old_area, newA)
 
+	newA.reg_in_areas_in_z()
+
 	var/list/firedoors = oldA.firedoors
 	for(var/door in firedoors)
 		var/obj/machinery/door/firedoor/FD = door

code/__HELPERS/game.dm

@@ -8,12 +8,6 @@
 #define Z_TURFS(ZLEVEL) block(locate(1,1,ZLEVEL), locate(world.maxx, world.maxy, ZLEVEL))
 #define CULT_POLL_WAIT 2400
 
-/proc/get_area(atom/A)
-	if(isarea(A))
-		return A
-	var/turf/T = get_turf(A)
-	return T ? T.loc : null
-
 /proc/get_area_name(atom/X, format_text = FALSE)
 	var/area/A = isarea(X) ? X : get_area(X)
 	if(!A)

code/__HELPERS/global_lists.dm

@@ -8,11 +8,11 @@
 	//facial hair
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, GLOB.facial_hair_styles_list, GLOB.facial_hair_styles_male_list, GLOB.facial_hair_styles_female_list)
 	//underwear
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/bottom, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
 	//undershirt
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/top, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
 	//socks
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
 	//bodypart accessories (blizzard intensifies)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, GLOB.tails_list_lizard)
@@ -46,7 +46,6 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/xeno_dorsal, GLOB.xeno_dorsal_list)
 	//genitals
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
-
 	for(var/K in GLOB.cock_shapes_list)
 		var/datum/sprite_accessory/penis/value = GLOB.cock_shapes_list[K]
 		GLOB.cock_shapes_icons[K] = value.icon_state
@@ -54,6 +53,14 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	GLOB.breasts_size_list = list("a","b","c","d","e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
+	for(var/K in GLOB.breasts_shapes_list)
+		var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K]
+		GLOB.breasts_shapes_icons[K] = value.icon_state
+
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
+	for(var/K in GLOB.balls_shapes_list)
+		var/datum/sprite_accessory/testicles/value = GLOB.balls_shapes_list[K]
+		GLOB.balls_shapes_icons[K] = value.icon_state
 //END OF CIT CHANGES
 
 	//Species

code/__HELPERS/matrices.dm

@@ -2,7 +2,7 @@
 	. = new_angle - old_angle
 	Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT
 
-/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3)
+/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE)
 	if(!segments)
 		return
 	var/segment = 360/segments
@@ -18,7 +18,11 @@
 
 	speed /= segments
 
-	animate(src, transform = matrices[1], time = speed, loops)
+	if(parallel)
+		animate(src, transform = matrices[1], time = speed, loops , flags = ANIMATION_PARALLEL)
+	else
+		animate(src, transform = matrices[1], time = speed, loops)
+
 	for(var/i in 2 to segments) //2 because 1 is covered above
 		animate(transform = matrices[i], time = speed)
 		//doesn't have an object argument because this is "Stacking" with the animate call above

code/__HELPERS/mobs.dm

@@ -20,35 +20,34 @@
 		else
 			return "000"
 
-/proc/random_underwear(gender)//Cit change - makes random underwear always return nude
+#define UNDIE_COLORABLE(U) (U?.has_color)
+
+/proc/random_underwear(gender)
 	if(!GLOB.underwear_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
-	return "Nude"
-	/*switch(gender)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/bottom, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
+	switch(gender)
 		if(MALE)
 			return pick(GLOB.underwear_m)
 		if(FEMALE)
 			return pick(GLOB.underwear_f)
 		else
-			return pick(GLOB.underwear_list)*/
+			return pick(GLOB.underwear_list)
 
-/proc/random_undershirt(gender)//Cit change - makes random undershirts always return nude
+/proc/random_undershirt(gender)
 	if(!GLOB.undershirt_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
-	return "Nude"
-	/*switch(gender)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/top, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
+	switch(gender)
 		if(MALE)
 			return pick(GLOB.undershirt_m)
 		if(FEMALE)
 			return pick(GLOB.undershirt_f)
 		else
-			return pick(GLOB.undershirt_list)*/
+			return pick(GLOB.undershirt_list)
 
-/proc/random_socks()//Cit change - makes random socks always return nude
+/proc/random_socks()
 	if(!GLOB.socks_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
-	return "Nude"
-	//return pick(GLOB.socks_list)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
+	return pick(GLOB.socks_list)
 
 /proc/random_features()
 	if(!GLOB.tails_list_human.len)
@@ -77,6 +76,8 @@
 	//CIT CHANGES - genitals and such
 	if(!GLOB.cock_shapes_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
+	if(!GLOB.balls_shapes_list.len)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
 	if(!GLOB.vagina_shapes_list.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	if(!GLOB.breasts_shapes_list.len)
@@ -168,6 +169,7 @@
 		"balls_amount"		= 2,
 		"balls_sack_size"	= BALLS_SACK_SIZE_DEF,
 		"balls_size"		= BALLS_SIZE_DEF,
+		"balls_shape"		= "Single",
 		"balls_cum_rate"	= CUM_RATE,
 		"balls_cum_mult"	= CUM_RATE_MULT,
 		"balls_efficiency"	= CUM_EFFICIENCY,
@@ -185,7 +187,7 @@
 		"has_breasts" 		= FALSE,
 		"breasts_color" 	= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"breasts_size" 		= pick(GLOB.breasts_size_list),
-		"breasts_shape"		= pick(GLOB.breasts_shapes_list),
+		"breasts_shape"		= "Pair",
 		"breasts_fluid" 	= "milk",
 		"has_vag"			= FALSE,
 		"vag_shape"			= pick(GLOB.vagina_shapes_list),

code/__HELPERS/names.dm

@@ -151,6 +151,10 @@ GLOBAL_VAR(command_name)
 GLOBAL_VAR(syndicate_code_phrase) //Code phrase for traitors.
 GLOBAL_VAR(syndicate_code_response) //Code response for traitors.
 
+//Cached regex search - for checking if codewords are used.
+GLOBAL_DATUM(syndicate_code_phrase_regex, /regex)
+GLOBAL_DATUM(syndicate_code_response_regex, /regex)
+
 	/*
 	Should be expanded.
 	How this works:

code/__HELPERS/reagents.dm

@@ -0,0 +1,74 @@
+/proc/chem_recipes_do_conflict(datum/chemical_reaction/r1, datum/chemical_reaction/r2)
+	//do the non-list tests first, because they are cheaper
+	if(r1.required_container != r2.required_container)
+		return FALSE
+	if(r1.is_cold_recipe == r2.is_cold_recipe)
+		if(r1.required_temp != r2.required_temp)
+			//one reaction requires a more extreme temperature than the other, so there is no conflict
+			return FALSE
+	else
+		var/datum/chemical_reaction/cold_one = r1.is_cold_recipe ? r1 : r2
+		var/datum/chemical_reaction/warm_one = r1.is_cold_recipe ? r2 : r1
+		if(cold_one.required_temp < warm_one.required_temp)
+			//the range of temperatures does not overlap, so there is no conflict
+			return FALSE
+
+	//find the reactions with the shorter and longer required_reagents list
+	var/datum/chemical_reaction/long_req
+	var/datum/chemical_reaction/short_req
+	if(r1.required_reagents.len > r2.required_reagents.len)
+		long_req = r1
+		short_req = r2
+	else if(r1.required_reagents.len < r2.required_reagents.len)
+		long_req = r2
+		short_req = r1
+	else
+		//if they are the same length, sort instead by the length of the catalyst list
+		//this is important if the required_reagents lists are the same
+		if(r1.required_catalysts.len > r2.required_catalysts.len)
+			long_req = r1
+			short_req = r2
+		else
+			long_req = r2
+			short_req = r1
+
+
+	//check if the shorter reaction list is a subset of the longer one
+	var/list/overlap = r1.required_reagents & r2.required_reagents
+	if(overlap.len != short_req.required_reagents.len)
+		//there is at least one reagent in the short list that is not in the long list, so there is no conflict
+		return FALSE
+
+	//check to see if the shorter reaction's catalyst list is also a subset of the longer reaction's catalyst list
+	//if the longer reaction's catalyst list is a subset of the shorter ones, that is fine
+	//if the reaction lists are the same, the short reaction will have the shorter required_catalysts list, so it will register as a conflict
+	var/list/short_minus_long_catalysts = short_req.required_catalysts - long_req.required_catalysts
+	if(short_minus_long_catalysts.len)
+		//there is at least one unique catalyst for the short reaction, so there is no conflict
+		return FALSE
+
+	//if we got this far, the longer reaction will be impossible to create if the shorter one is earlier in GLOB.chemical_reactions_list, and will require the reagents to be added in a particular order otherwise
+	return TRUE
+
+/proc/get_chemical_reaction(id)
+	if(!GLOB.chemical_reactions_list)
+		return
+	for(var/reagent in GLOB.chemical_reactions_list)
+		for(var/datum/chemical_reaction/R in GLOB.chemical_reactions_list[reagent])
+			if(R.id == id)
+				return R
+
+/proc/remove_chemical_reaction(datum/chemical_reaction/R)
+	if(!GLOB.chemical_reactions_list || !R)
+		return
+	for(var/rid in R.required_reagents)
+		GLOB.chemical_reactions_list[rid] -= R
+
+//see build_chemical_reactions_list in holder.dm for explanations
+/proc/add_chemical_reaction(datum/chemical_reaction/R)
+	if(!GLOB.chemical_reactions_list || !R.id || !R.required_reagents || !R.required_reagents.len)
+		return
+	var/primary_reagent = R.required_reagents[1]
+	if(!GLOB.chemical_reactions_list[primary_reagent])
+		GLOB.chemical_reactions_list[primary_reagent] = list()
+	GLOB.chemical_reactions_list[primary_reagent] += R

code/__HELPERS/roundend.dm

@@ -281,6 +281,17 @@
 		var/statspage = CONFIG_GET(string/roundstatsurl)
 		var/info = statspage ? "<a href='?action=openLink&link=[url_encode(statspage)][GLOB.round_id]'>[GLOB.round_id]</a>" : GLOB.round_id
 		parts += "[GLOB.TAB]Round ID: <b>[info]</b>"
+
+	var/list/voting_results = SSvote.stored_gamemode_votes
+
+	if(length(voting_results))
+		parts += "[GLOB.TAB]Voting: "
+		var/total_score = 0
+		for(var/choice in voting_results)
+			var/score = voting_results[choice]
+			total_score += score
+			parts += "[GLOB.TAB][GLOB.TAB][choice]: [score]"
+
 	parts += "[GLOB.TAB]Shift Duration: <B>[DisplayTimeText(world.time - SSticker.round_start_time)]</B>"
 	parts += "[GLOB.TAB]Station Integrity: <B>[mode.station_was_nuked ? "<span class='redtext'>Destroyed</span>" : "[popcount["station_integrity"]]%"]</B>"
 	var/total_players = GLOB.joined_player_list.len

code/__HELPERS/text.dm

@@ -767,3 +767,27 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
 			return "twelfth"
 		else
 			return "[number]\th"
+
+/proc/unintelligize(message)
+	var/prefix=copytext(message,1,2)
+	if(prefix == ";")
+		message = copytext(message,2)
+	else if(prefix in list(":","#"))
+		prefix += copytext(message,2,3)
+		message = copytext(message,3)
+	else
+		prefix=""
+
+	var/list/words = splittext(message," ")
+	var/list/rearranged = list()
+	for(var/i=1;i<=words.len;i++)
+		var/cword = pick(words)
+		words.Remove(cword)
+		var/suffix = copytext(cword,length(cword)-1,length(cword))
+		while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
+			cword  = copytext(cword,1              ,length(cword)-1)
+			suffix = copytext(cword,length(cword)-1,length(cword)  )
+		if(length(cword))
+			rearranged += cword
+	message = "[prefix][jointext(rearranged," ")]"
+	. = message

code/__HELPERS/time.dm

@@ -70,3 +70,6 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 	if(hour)
 		hourT = " and [hour] hour[(hour != 1)? "s":""]"
 	return "[day] day[(day != 1)? "s":""][hourT][minuteT][secondT]"
+
+/proc/daysSince(realtimev)
+	return round((world.realtime - realtimev) / (24 HOURS))

code/__HELPERS/unsorted.dm

@@ -1239,19 +1239,21 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
 	pixel_x = initialpixelx
 	pixel_y = initialpixely
 
-/atom/proc/do_jiggle(targetangle = 45)
+/atom/proc/do_jiggle(targetangle = 45, timer = 20)
 	var/matrix/OM = matrix(transform)
 	var/matrix/M = matrix(transform)
+	var/halftime = timer * 0.5
 	M.Turn(pick(-targetangle, targetangle))
-	animate(src, transform = M, time = 10, easing = ELASTIC_EASING)
-	animate(src, transform = OM, time = 10, easing = ELASTIC_EASING)
+	animate(src, transform = M, time = halftime, easing = ELASTIC_EASING)
+	animate(src, transform = OM, time = halftime, easing = ELASTIC_EASING)
 
-/atom/proc/do_squish(squishx = 1.2, squishy = 0.6)
+/atom/proc/do_squish(squishx = 1.2, squishy = 0.6, timer = 20)
 	var/matrix/OM = matrix(transform)
 	var/matrix/M = matrix(transform)
+	var/halftime = timer * 0.5
 	M.Scale(squishx, squishy)
-	animate(src, transform = M, time = 10, easing = BOUNCE_EASING)
-	animate(src, transform = OM, time = 10, easing = BOUNCE_EASING)
+	animate(src, transform = M, time = halftime, easing = BOUNCE_EASING)
+	animate(src, transform = OM, time = halftime, easing = BOUNCE_EASING)
 
 /proc/weightclass2text(var/w_class)
 	switch(w_class)
@@ -1483,7 +1485,9 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 		/obj/item/reagent_containers/food/snacks/grown,
 		/obj/item/reagent_containers/food/snacks/grown/mushroom,
 		/obj/item/reagent_containers/food/snacks/grown/nettle, // base type
-		/obj/item/reagent_containers/food/snacks/deepfryholder
+		/obj/item/reagent_containers/food/snacks/deepfryholder,
+		/obj/item/reagent_containers/food/snacks/grown/shell,
+		/obj/item/reagent_containers/food/snacks/store/bread
 		)
 	blocked |= typesof(/obj/item/reagent_containers/food/snacks/customizable)
 

code/_globalvars/bitfields.dm

@@ -47,7 +47,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"NO_MAT_REDEMPTION" = NO_MAT_REDEMPTION,
 		"DROPDEL" = DROPDEL,
 		"NOBLUDGEON" = NOBLUDGEON,
-		"NODROP" = NODROP,
 		"ABSTRACT" = ABSTRACT,
 		),
 	"admin_flags" = list(
@@ -115,9 +114,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"GOLIATH_RESISTANCE" = GOLIATH_RESISTANCE,
 		"GOLIATH_WEAKNESS" = GOLIATH_WEAKNESS
 		),
-	"reagents_holder_flags" = list(
-		"REAGENT_NOREACT" = REAGENT_NOREACT
-		),
 	"flags_1" = list(
 		"NOJAUNT_1" = NOJAUNT_1,
 		"UNUSED_RESERVATION_TURF_1" = UNUSED_RESERVATION_TURF_1,
@@ -143,6 +139,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"MASKINTERNALS" = MASKINTERNALS,
 		"NOSLIP" = NOSLIP,
 		"THICKMATERIAL" = THICKMATERIAL,
+		"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
+		"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
 		),
 	"tesla_flags" = list(
 		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
@@ -158,13 +156,14 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"SMOOTH_BORDER" = SMOOTH_BORDER,
 		"SMOOTH_QUEUED" = SMOOTH_QUEUED,
 		),
-	"container_type" = list(
+	"reagents_holder_flags" = list(
 		"INJECTABLE" = INJECTABLE,
 		"DRAWABLE" = DRAWABLE,
 		"REFILLABLE" = REFILLABLE,
 		"DRAINABLE" = DRAINABLE,
 		"TRANSPARENT" = TRANSPARENT,
 		"AMOUNT_VISIBLE" = AMOUNT_VISIBLE,
+		"NO_REACT" = NO_REACT,
 		),
 	"car_traits" = list(
 		"CAN_KIDNAP" = CAN_KIDNAP,
@@ -173,4 +172,9 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"RAD_PROTECT_CONTENTS" = RAD_PROTECT_CONTENTS,
 		"RAD_NO_CONTAMINATE" = RAD_NO_CONTAMINATE,
 	),
-	))
+	"disease_flags" = list(
+		"CURABLE" = CURABLE,
+		"CAN_CARRY"	= CAN_CARRY,
+		"CAN_RESIST" = CAN_RESIST
+	),
+	))

code/_globalvars/lists/flavor_misc.dm

@@ -7,15 +7,15 @@ GLOBAL_LIST_EMPTY(facial_hair_styles_list)	//stores /datum/sprite_accessory/faci
 GLOBAL_LIST_EMPTY(facial_hair_styles_male_list)	//stores only hair names
 GLOBAL_LIST_EMPTY(facial_hair_styles_female_list)	//stores only hair names
 	//Underwear
-GLOBAL_LIST_EMPTY(underwear_list)		//stores /datum/sprite_accessory/underwear indexed by name
+GLOBAL_LIST_EMPTY(underwear_list)		//stores /datum/sprite_accessory/underwear/bottom indexed by name
 GLOBAL_LIST_EMPTY(underwear_m)	//stores only underwear name
 GLOBAL_LIST_EMPTY(underwear_f)	//stores only underwear name
 	//Undershirts
-GLOBAL_LIST_EMPTY(undershirt_list) 	//stores /datum/sprite_accessory/undershirt indexed by name
+GLOBAL_LIST_EMPTY(undershirt_list) 	//stores /datum/sprite_accessory/underwear/top indexed by name
 GLOBAL_LIST_EMPTY(undershirt_m)	 //stores only undershirt name
 GLOBAL_LIST_EMPTY(undershirt_f)	 //stores only undershirt name
 	//Socks
-GLOBAL_LIST_EMPTY(socks_list)		//stores /datum/sprite_accessory/socks indexed by name
+GLOBAL_LIST_EMPTY(socks_list)		//stores /datum/sprite_accessory/underwear/socks indexed by name
 	//Lizard Bits (all datum lists indexed by name)
 GLOBAL_LIST_EMPTY(body_markings_list)
 GLOBAL_LIST_EMPTY(tails_list_lizard)
@@ -40,6 +40,54 @@ GLOBAL_LIST_EMPTY(caps_list)
 GLOBAL_LIST_INIT(ghost_forms_with_directions_list, list("ghost")) //stores the ghost forms that support directional sprites
 GLOBAL_LIST_INIT(ghost_forms_with_accessories_list, list("ghost")) //stores the ghost forms that support hair and other such things
 
+GLOBAL_LIST_INIT(ai_core_display_screens, list(
+	":thinking:",
+	"Alien",
+	"Angel",
+	"Banned",
+	"Bliss",
+	"Blue",
+	"Clown",
+	"Database",
+	"Dorf",
+	"Firewall",
+	"Fuzzy",
+	"Gentoo",
+	"Glitchman",
+	"Gondola",
+	"Goon",
+	"Hades",
+	"Heartline",
+	"Helios",
+	"House",
+	"Inverted",
+	"Matrix",
+	"Monochrome",
+	"Murica",
+	"Nanotrasen",
+	"Not Malf",
+	"President",
+	"Random",
+	"Rainbow",
+	"Red",
+	"Red October",
+	"Static",
+	"Syndicat Meow",
+	"TechDemon",
+	"Text",
+	"Too Deep",
+	"Triumvirate",
+	"Triumvirate-M",
+	"Weird"))
+
+/proc/resolve_ai_icon(input)
+	if(!input || !(input in GLOB.ai_core_display_screens))
+		return "ai"
+	else
+		if(input == "Random")
+			input = pick(GLOB.ai_core_display_screens - "Random")
+		return "ai-[lowertext(input)]"
+
 GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, SEC_DEPT_SCIENCE, SEC_DEPT_SUPPLY))
 
 	//Backpacks
@@ -52,6 +100,11 @@ GLOBAL_LIST_INIT(security_depts_prefs, list(SEC_DEPT_RANDOM, SEC_DEPT_NONE, SEC_
 #define DDUFFELBAG "Department Duffel Bag"
 GLOBAL_LIST_INIT(backbaglist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GSATCHEL, GDUFFELBAG, LSATCHEL))
 
+//Suit/Skirt
+#define PREF_SUIT "Jumpsuit"
+#define PREF_SKIRT "Jumpskirt"
+GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT))
+
 //Uplink spawn loc
 #define UPLINK_PDA		"PDA"
 #define UPLINK_RADIO	"Radio"
@@ -117,7 +170,7 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
 	"CMO Office", "Chemistry", "Research", "RD Office",
 	"Robotics", "HoP Office", "Library", "Chapel", "Theatre",
 	"Bar", "Kitchen", "Hydroponics", "Janitor Closet","Genetics",
-	"Circuitry", "Toxins", "Dormitories", "Virology", 
+	"Circuitry", "Toxins", "Dormitories", "Virology",
 	"Xenobiology", "Law Office","Detective's Office"))
 
 GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "")

code/_globalvars/lists/maintenance_loot.dm

@@ -43,7 +43,8 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/assembly/timer = 3,
 	/obj/item/flashlight = 4,
 	/obj/item/flashlight/pen = 1,
-	/obj/item/flashlight/glowstick/random = 4,
+	/obj/effect/spawner/lootdrop/glowstick = 4,
+	/obj/effect/spawner/lootdrop/mre = 3,
 	/obj/item/multitool = 2,
 	/obj/item/radio/off = 2,
 	/obj/item/t_scanner = 5,
@@ -68,12 +69,11 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/crowbar = 1,
 	/obj/item/crowbar/red = 1,
 	/obj/item/extinguisher = 11,
-	//obj/item/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc.
 	/obj/item/hand_labeler = 1,
 	/obj/item/paper/crumpled = 1,
 	/obj/item/pen = 1,
 	/obj/item/reagent_containers/spray/pestspray = 1,
-	/obj/item/reagent_containers/glass/rag = 3,
+	/obj/item/reagent_containers/rag = 3,
 	/obj/item/stock_parts/cell = 3,
 	/obj/item/storage/belt/utility = 2,
 	/obj/item/storage/box = 2,
@@ -101,13 +101,18 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/assembly/signaler = 2,
 	/obj/item/assembly/mousetrap = 2,
 	/obj/item/reagent_containers/syringe = 2,
-	/obj/item/clothing/gloves/color/random = 8,
+	/obj/effect/spawner/lootdrop/gloves = 8,
 	/obj/item/clothing/shoes/laceup = 1,
 	/obj/item/storage/secure/briefcase = 3,
 	/obj/item/storage/toolbox/artistic = 2,
 	/obj/item/toy/eightball = 1,
 	/obj/item/reagent_containers/pill/floorpill = 1,
+	/obj/item/reagent_containers/food/snacks/cannedpeaches/maint = 1,
 	/obj/item/storage/daki = 3, //VERY IMPORTANT CIT CHANGE - adds bodypillows to maint
 	/obj/item/storage/pill_bottle/penis_enlargement = 2,
+	/obj/item/clothing/shoes/wheelys = 1,
+	/obj/item/clothing/shoes/kindleKicks = 1,
+	/obj/item/autosurgeon/penis = 1,
+	/obj/item/autosurgeon/testicles = 1,
 	"" = 3
 	))

code/_globalvars/misc.dm

@@ -18,3 +18,12 @@ GLOBAL_LIST_EMPTY(powernets)
 GLOBAL_VAR_INIT(bsa_unlock, FALSE)	//BSA unlocked by head ID swipes
 
 GLOBAL_LIST_EMPTY(player_details)	// ckey -> /datum/player_details
+
+// All religion stuff
+GLOBAL_VAR(religion)
+GLOBAL_VAR(deity)
+GLOBAL_VAR(bible_name)
+GLOBAL_VAR(bible_icon_state)
+GLOBAL_VAR(bible_item_state)
+GLOBAL_VAR(holy_weapon_type)
+GLOBAL_VAR(holy_armor_type)

code/_onclick/ai.dm

@@ -23,6 +23,9 @@
 		return
 	next_click = world.time + 1
 
+	if(!can_interact_with(A))
+		return
+
 	if(multicam_on)
 		var/turf/T = get_turf(A)
 		if(T)
@@ -60,7 +63,6 @@
 			controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
 		return
 
-		return
 	if(modifiers["shift"])
 		ShiftClickOn(A)
 		return

code/_onclick/click.dm

@@ -366,11 +366,15 @@
 	SEND_SIGNAL(src, COMSIG_CLICK_ALT, user)
 	var/turf/T = get_turf(src)
 	if(T && user.TurfAdjacent(T))
-		if(user.listed_turf == T)
-			user.listed_turf = null
-		else
-			user.listed_turf = T
-			user.client.statpanel = T.name
+		user.listed_turf = T
+		user.client.statpanel = T.name
+
+// Use this instead of /mob/proc/AltClickOn(atom/A) where you only want turf content listing without additional atom alt-click interaction
+/atom/proc/AltClickNoInteract(mob/user, atom/A)
+	var/turf/T = get_turf(A)
+	if(T && user.TurfAdjacent(T))
+		user.listed_turf = T
+		user.client.statpanel = T.name
 
 /mob/proc/TurfAdjacent(turf/T)
 	return T.Adjacent(src)

code/_onclick/hud/_defines.dm

@@ -79,6 +79,7 @@
 #define ui_drop_throw "EAST-1:28,SOUTH+1:7"
 #define ui_pull_resist "EAST-2:26,SOUTH+1:7"
 #define ui_movi "EAST-2:26,SOUTH:5"
+#define ui_sprintbufferloc "EAST-2:26,SOUTH:18"
 #define ui_acti "EAST-3:24,SOUTH:5"
 #define ui_zonesel "EAST-1:28,SOUTH:5"
 #define ui_acti_alt "EAST-1:28,SOUTH:5"	//alternative intent switcher for when the interface is hidden (F12)

code/_onclick/hud/action_button.dm

@@ -20,10 +20,23 @@
 	else
 		return TRUE
 
-/obj/screen/movable/action_button/MouseDrop()
-	if (!can_use(usr))
+/obj/screen/movable/action_button/MouseDrop(over_object)
+	if(!can_use(usr))
 		return
-	return ..()
+	if((istype(over_object, /obj/screen/movable/action_button) && !istype(over_object, /obj/screen/movable/action_button/hide_toggle)))
+		if(locked)
+			to_chat(usr, "<span class='warning'>Action button \"[name]\" is locked, unlock it first.</span>")
+			return
+		var/obj/screen/movable/action_button/B = over_object
+		var/list/actions = usr.actions
+		actions.Swap(actions.Find(src.linked_action), actions.Find(B.linked_action))
+		moved = FALSE
+		ordered = TRUE
+		B.moved = FALSE
+		B.ordered = TRUE
+		usr.update_action_buttons()
+	else
+		return ..()
 
 /obj/screen/movable/action_button/Click(location,control,params)
 	if (!can_use(usr))

code/_onclick/hud/human.dm

@@ -134,6 +134,13 @@
 	static_inventory += using
 	//END OF CITADEL CHANGES
 
+	//same as above but buffer.
+	using = new /obj/screen/sprint_buffer
+	using.screen_loc = ui_sprintbufferloc
+	sprint_buffer = using
+	static_inventory += using
+
+
 	using = new /obj/screen/drop()
 	using.icon = ui_style
 	using.screen_loc = ui_drop_throw

code/_onclick/hud/radial.dm

@@ -1,4 +1,7 @@
 #define NEXT_PAGE_ID "__next__"
+#define DEFAULT_CHECK_DELAY 20
+
+GLOBAL_LIST_EMPTY(radial_menus)
 
 /obj/screen/radial
 	icon = 'icons/mob/radial.dmi'
@@ -10,14 +13,19 @@
 	icon_state = "radial_slice"
 	var/choice
 	var/next_page = FALSE
+	var/tooltips = FALSE
 
 /obj/screen/radial/slice/MouseEntered(location, control, params)
 	. = ..()
 	icon_state = "radial_slice_focus"
+	if(tooltips)
+		openToolTip(usr, src, params, title = name)
 
 /obj/screen/radial/slice/MouseExited(location, control, params)
 	. = ..()
 	icon_state = "radial_slice"
+	if(tooltips)
+		closeToolTip(usr)
 
 /obj/screen/radial/slice/Click(location, control, params)
 	if(usr.client == parent.current_user)
@@ -30,6 +38,14 @@
 	name = "Close Menu"
 	icon_state = "radial_center"
 
+/obj/screen/radial/center/MouseEntered(location, control, params)
+	. = ..()
+	icon_state = "radial_center_focus"
+
+/obj/screen/radial/center/MouseExited(location, control, params)
+	. = ..()
+	icon_state = "radial_center"
+
 /obj/screen/radial/center/Click(location, control, params)
 	if(usr.client == parent.current_user)
 		parent.finished = TRUE
@@ -48,6 +64,9 @@
 	var/atom/anchor
 	var/image/menu_holder
 	var/finished = FALSE
+	var/datum/callback/custom_check_callback
+	var/next_check = 0
+	var/check_delay = DEFAULT_CHECK_DELAY
 
 	var/radius = 32
 	var/starting_angle = 0
@@ -57,7 +76,7 @@
 	var/max_elements
 	var/pages = 1
 	var/current_page = 1
-	
+
 	var/hudfix_method = TRUE //TRUE to change anchor to user, FALSE to shift by py_shift
 	var/py_shift = 0
 	var/entry_animation = TRUE
@@ -75,7 +94,7 @@
 			restrict_to_dir(NORTH) //I was going to parse screen loc here but that's more effort than it's worth.
 
 //Sets defaults
-//These assume 45 deg min_angle 
+//These assume 45 deg min_angle
 /datum/radial_menu/proc/restrict_to_dir(dir)
 	switch(dir)
 		if(NORTH)
@@ -91,18 +110,19 @@
 			starting_angle = 180
 			ending_angle = 45
 
-/datum/radial_menu/proc/setup_menu()
+/datum/radial_menu/proc/setup_menu(use_tooltips)
 	if(ending_angle > starting_angle)
 		zone = ending_angle - starting_angle
 	else
 		zone = 360 - starting_angle + ending_angle
-	
+
 	max_elements = round(zone / min_angle)
 	var/paged = max_elements < choices.len
 	if(elements.len < max_elements)
 		var/elements_to_add = max_elements - elements.len
 		for(var/i in 1 to elements_to_add) //Create all elements
-			var/obj/screen/radial/new_element = new /obj/screen/radial/slice
+			var/obj/screen/radial/slice/new_element = new /obj/screen/radial/slice
+			new_element.tooltips = use_tooltips
 			new_element.parent = src
 			elements += new_element
 
@@ -163,7 +183,7 @@
 	else
 		E.pixel_y = py
 		E.pixel_x = px
-	
+
 	//Visuals
 	E.alpha = 255
 	E.mouse_opacity = MOUSE_OPACITY_ICON
@@ -183,7 +203,7 @@
 		E.next_page = FALSE
 		if(choices_icons[choice_id])
 			E.add_overlay(choices_icons[choice_id])
-	
+
 /datum/radial_menu/New()
 	close_button = new
 	close_button.parent = src
@@ -200,7 +220,7 @@
 /datum/radial_menu/proc/get_next_id()
 	return "c_[choices.len]"
 
-/datum/radial_menu/proc/set_choices(list/new_choices)
+/datum/radial_menu/proc/set_choices(list/new_choices, use_tooltips)
 	if(choices.len)
 		Reset()
 	for(var/E in new_choices)
@@ -211,7 +231,7 @@
 			var/I = extract_image(new_choices[E])
 			if(I)
 				choices_icons[id] = I
-	setup_menu()
+	setup_menu(use_tooltips)
 
 
 /datum/radial_menu/proc/extract_image(E)
@@ -220,7 +240,7 @@
 		MA.layer = ABOVE_HUD_LAYER
 		MA.appearance_flags |= RESET_TRANSFORM
 	return MA
-		
+
 
 /datum/radial_menu/proc/next_page()
 	if(pages > 1)
@@ -243,28 +263,49 @@
 	if(current_user)
 		current_user.images -= menu_holder
 
-/datum/radial_menu/proc/wait()
+/datum/radial_menu/proc/wait(atom/user, atom/anchor, require_near = FALSE)
 	while (current_user && !finished && !selected_choice)
+		if(require_near && !in_range(anchor, user))
+			return
+		if(custom_check_callback && next_check < world.time)
+			if(!custom_check_callback.Invoke())
+				return
+			else
+				next_check = world.time + check_delay
 		stoplag(1)
 
 /datum/radial_menu/Destroy()
 	Reset()
 	hide()
+	QDEL_NULL(custom_check_callback)
 	. = ..()
+
 /*
-	Presents radial menu to user anchored to anchor (or user if the anchor is currently in users screen) 
+	Presents radial menu to user anchored to anchor (or user if the anchor is currently in users screen)
 	Choices should be a list where list keys are movables or text used for element names and return value
 	and list values are movables/icons/images used for element icons
 */
-/proc/show_radial_menu(mob/user,atom/anchor,list/choices)
+/proc/show_radial_menu(mob/user, atom/anchor, list/choices, uniqueid, radius, datum/callback/custom_check, require_near = FALSE, tooltips = FALSE)
+	if(!user || !anchor || !length(choices))
+		return
+	if(!uniqueid)
+		uniqueid = "defmenu_[REF(user)]_[REF(anchor)]"
+
+	if(GLOB.radial_menus[uniqueid])
+		return
+
 	var/datum/radial_menu/menu = new
-	if(!user)
-		user = usr
+	GLOB.radial_menus[uniqueid] = menu
+	if(radius)
+		menu.radius = radius
+	if(istype(custom_check))
+		menu.custom_check_callback = custom_check
 	menu.anchor = anchor
 	menu.check_screen_border(user) //Do what's needed to make it look good near borders or on hud
-	menu.set_choices(choices)
+	menu.set_choices(choices, tooltips)
 	menu.show_to(user)
-	menu.wait()
+	menu.wait(user, anchor, require_near)
 	var/answer = menu.selected_choice
 	qdel(menu)
+	GLOB.radial_menus -= uniqueid
 	return answer

code/_onclick/hud/radial_persistent.dm

@@ -0,0 +1,76 @@
+/*
+	A derivative of radial menu which persists onscreen until closed and invokes a callback each time an element is clicked
+*/
+
+/obj/screen/radial/persistent/center
+	name = "Close Menu"
+	icon_state = "radial_center"
+
+/obj/screen/radial/persistent/center/Click(location, control, params)
+	if(usr.client == parent.current_user)
+		parent.element_chosen(null,usr)
+
+/obj/screen/radial/persistent/center/MouseEntered(location, control, params)
+	. = ..()
+	icon_state = "radial_center_focus"
+
+/obj/screen/radial/persistent/center/MouseExited(location, control, params)
+	. = ..()
+	icon_state = "radial_center"
+
+
+
+/datum/radial_menu/persistent
+	var/uniqueid
+	var/datum/callback/select_proc_callback
+
+/datum/radial_menu/persistent/New()
+	close_button = new /obj/screen/radial/persistent/center
+	close_button.parent = src
+
+
+/datum/radial_menu/persistent/element_chosen(choice_id,mob/user)
+	select_proc_callback.Invoke(choices_values[choice_id])
+
+
+/datum/radial_menu/persistent/proc/change_choices(list/newchoices, tooltips)
+	if(!newchoices.len)
+		return
+	Reset()
+	set_choices(newchoices,tooltips)
+
+/datum/radial_menu/persistent/Destroy()
+	QDEL_NULL(select_proc_callback)
+	GLOB.radial_menus -= uniqueid
+	Reset()
+	hide()
+	. = ..()
+
+/*
+	Creates a persistent radial menu and shows it to the user, anchored to anchor (or user if the anchor is currently in users screen).
+	Choices should be a list where list keys are movables or text used for element names and return value
+	and list values are movables/icons/images used for element icons
+	Select_proc is the proc to be called each time an element on the menu is clicked, and should accept the chosen element as its final argument
+	Clicking the center button will return a choice of null
+*/
+/proc/show_radial_menu_persistent(mob/user, atom/anchor, list/choices, datum/callback/select_proc, uniqueid, radius, tooltips = FALSE)
+	if(!user || !anchor || !length(choices) || !select_proc)
+		return
+	if(!uniqueid)
+		uniqueid = "defmenu_[REF(user)]_[REF(anchor)]"
+
+	if(GLOB.radial_menus[uniqueid])
+		return
+
+	var/datum/radial_menu/persistent/menu = new
+	menu.uniqueid = uniqueid
+	GLOB.radial_menus[uniqueid] = menu
+	if(radius)
+		menu.radius = radius
+	menu.select_proc_callback = select_proc
+	menu.anchor = anchor
+	menu.check_screen_border(user) //Do what's needed to make it look good near borders or on hud
+	menu.set_choices(choices, tooltips)
+	menu.show_to(user)
+	return menu
+

code/_onclick/item_attack.dm

@@ -64,7 +64,7 @@
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
 		return // CIT CHANGE - ditto
 
-	if(force && user.has_trait(TRAIT_PACIFISM))
+	if(force && damtype != STAMINA && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
 		return
 

code/_onclick/observer.dm

@@ -31,7 +31,7 @@
 		ShiftClickOn(A)
 		return
 	if(modifiers["alt"])
-		AltClickOn(A)
+		AltClickNoInteract(src, A)
 		return
 	if(modifiers["ctrl"])
 		CtrlClickOn(A)

code/controllers/subsystem/augury.dm

@@ -50,7 +50,7 @@ SUBSYSTEM_DEF(augury)
 			watchers -= w
 			continue
 		var/mob/dead/observer/O = w
-		if(biggest_doom && (!O.orbiting || O.orbiting.orbiting != biggest_doom))
+		if(biggest_doom && (!O.orbiting || O.orbiting.parent != biggest_doom))
 			O.ManualFollow(biggest_doom)
 
 /datum/action/innate/augury

code/controllers/subsystem/job.dm

@@ -437,7 +437,7 @@ SUBSYSTEM_DEF(job)
 		if(job.custom_spawn_text)
 			to_chat(M, "<b>[job.custom_spawn_text]</b>")
 		if(CONFIG_GET(number/minimal_access_threshold))
-			to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
+			to_chat(M, "<span class='notice'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></span>")
 
 	if(job && H)
 		if(job.dresscodecompliant)// CIT CHANGE - dress code compliance

code/controllers/subsystem/mapping.dm

@@ -256,10 +256,13 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 /datum/controller/subsystem/mapping/proc/generate_station_area_list()
 	var/list/station_areas_blacklist = typecacheof(list(/area/space, /area/mine, /area/ruin, /area/asteroid/nearstation))
 	for(var/area/A in world)
-		var/turf/picked = safepick(get_area_turfs(A.type))
-		if(picked && is_station_level(picked.z))
-			if(!(A.type in GLOB.the_station_areas) && !is_type_in_typecache(A, station_areas_blacklist))
-				GLOB.the_station_areas.Add(A.type)
+		if (is_type_in_typecache(A, station_areas_blacklist))
+			continue
+		if (!A.contents.len || !A.unique)
+			continue
+		var/turf/picked = A.contents[1]
+		if (is_station_level(picked.z))
+			GLOB.the_station_areas += A.type
 
 	if(!GLOB.the_station_areas.len)
 		log_world("ERROR: Station areas list failed to generate!")
@@ -495,4 +498,9 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	clearing |= used_turfs		//used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already.
 	unused_turfs.Cut()
 	used_turfs.Cut()
-	reserve_turfs(clearing)
+	reserve_turfs(clearing)
+
+/datum/controller/subsystem/mapping/proc/reg_in_areas_in_z(list/areas)
+	for(var/B in areas)
+		var/area/A = B
+		A.reg_in_areas_in_z()

code/controllers/subsystem/minor_mapping.dm

@@ -1,22 +1,14 @@
-// The Squeak
-// because this is about placement of mice mobs, and nothing to do with
-// mice - the computer peripheral
-
-SUBSYSTEM_DEF(squeak)
-	name = "Squeak"
-	init_order = INIT_ORDER_SQUEAK
+SUBSYSTEM_DEF(minor_mapping)
+	name = "Minor Mapping"
+	init_order = INIT_ORDER_MINOR_MAPPING
 	flags = SS_NO_FIRE
 
-	var/list/exposed_wires = list()
-
-/datum/controller/subsystem/squeak/Initialize(timeofday)
+/datum/controller/subsystem/minor_mapping/Initialize(timeofday)
 	trigger_migration(CONFIG_GET(number/mice_roundstart))
 	return ..()
 
-/datum/controller/subsystem/squeak/proc/trigger_migration(num_mice=10)
-	if(!num_mice)
-		return
-	find_exposed_wires()
+/datum/controller/subsystem/minor_mapping/proc/trigger_migration(num_mice=10)
+	var/list/exposed_wires = find_exposed_wires()
 
 	var/mob/living/simple_animal/mouse/M
 	var/turf/proposed_turf
@@ -31,7 +23,8 @@ SUBSYSTEM_DEF(squeak)
 			num_mice -= 1
 			M = null
 
-/datum/controller/subsystem/squeak/proc/find_exposed_wires()
+/proc/find_exposed_wires()
+	var/list/exposed_wires = list()
 	exposed_wires.Cut()
 	var/list/all_turfs
 	for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
@@ -41,3 +34,5 @@ SUBSYSTEM_DEF(squeak)
 			continue
 		if(locate(/obj/structure/cable) in T)
 			exposed_wires += T
+
+	return shuffle(exposed_wires)

code/controllers/subsystem/orbit.dm

@@ -1,44 +0,0 @@
-SUBSYSTEM_DEF(orbit)
-	name = "Orbits"
-	priority = FIRE_PRIORITY_ORBIT
-	wait = 2
-	flags = SS_NO_INIT|SS_TICKER
-
-	var/list/currentrun = list()
-	var/list/processing = list()
-
-/datum/controller/subsystem/orbit/stat_entry()
-	..("P:[processing.len]")
-
-
-/datum/controller/subsystem/orbit/fire(resumed = 0)
-	if (!resumed)
-		src.currentrun = processing.Copy()
-
-	//cache for sanic speed (lists are references anyways)
-	var/list/currentrun = src.currentrun
-
-	while (currentrun.len)
-		var/datum/orbit/O = currentrun[currentrun.len]
-		currentrun.len--
-		if (!O)
-			processing -= O
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (!O.orbiter)
-			qdel(O)
-			if (MC_TICK_CHECK)
-				return
-			continue
-		if (O.lastprocess >= world.time) //we already checked recently
-			if (MC_TICK_CHECK)
-				return
-			continue
-		var/targetloc = get_turf(O.orbiting)
-		if (targetloc != O.lastloc || O.orbiter.loc != targetloc)
-			O.Check(targetloc)
-		if (MC_TICK_CHECK)
-			return
-
-

code/controllers/subsystem/persistence.dm

@@ -28,6 +28,7 @@ SUBSYSTEM_DEF(persistence)
 	LoadPhotoPersistence()
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
+	LoadRandomizedRecipes()
 	return ..()
 
 /datum/controller/subsystem/persistence/proc/LoadSatchels()
@@ -206,6 +207,7 @@ SUBSYSTEM_DEF(persistence)
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
 	if(CONFIG_GET(flag/use_antag_rep))
 		CollectAntagReputation()
+	SaveRandomizedRecipes()
 
 /datum/controller/subsystem/persistence/proc/GetPhotoAlbums()
 	var/album_path = file("data/photo_albums.json")
@@ -371,3 +373,43 @@ SUBSYSTEM_DEF(persistence)
 	fdel(FILE_ANTAG_REP)
 	text2file(json_encode(antag_rep), FILE_ANTAG_REP)
 
+/datum/controller/subsystem/persistence/proc/LoadRandomizedRecipes()
+	var/json_file = file("data/RandomizedChemRecipes.json")
+	var/json
+	if(fexists(json_file))
+		json = json_decode(file2text(json_file))
+
+	for(var/randomized_type in subtypesof(/datum/chemical_reaction/randomized))
+		var/datum/chemical_reaction/randomized/R = new randomized_type
+		var/loaded = FALSE
+		if(R.persistent && json)
+			var/list/recipe_data = json[R.id]
+			if(recipe_data && R.LoadOldRecipe(recipe_data) && (daysSince(R.created) <= R.persistence_period))
+				loaded = TRUE
+		if(!loaded) //We do not have information for whatever reason, just generate new one
+			R.GenerateRecipe()
+
+		if(!R.HasConflicts()) //Might want to try again if conflicts happened in the future.
+			add_chemical_reaction(R)
+
+/datum/controller/subsystem/persistence/proc/SaveRandomizedRecipes()
+	var/json_file = file("data/RandomizedChemRecipes.json")
+	var/list/file_data = list()
+
+	//asert globchems done
+	for(var/randomized_type in subtypesof(/datum/chemical_reaction/randomized))
+		var/datum/chemical_reaction/randomized/R = randomized_type
+		R = get_chemical_reaction(initial(R.id)) //ew, would be nice to add some simple tracking
+		if(R && R.persistent && R.id)
+			var/recipe_data = list()
+			recipe_data["timestamp"] = R.created
+			recipe_data["required_reagents"] = R.required_reagents
+			recipe_data["required_catalysts"] = R.required_catalysts
+			recipe_data["required_temp"] = R.required_temp
+			recipe_data["is_cold_recipe"] = R.is_cold_recipe
+			recipe_data["results"] = R.results
+			recipe_data["required_container"] = "[R.required_container]"
+			file_data["[R.id]"] = recipe_data
+
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))

code/controllers/subsystem/religion.dm

@@ -1,11 +0,0 @@
-SUBSYSTEM_DEF(religion)
-	name = "Religion"
-	flags = SS_NO_FIRE|SS_NO_INIT
-
-	var/religion
-	var/deity
-	var/bible_name
-	var/bible_icon_state
-	var/bible_item_state
-	var/holy_weapon_type
-	var/holy_armor_type

code/controllers/subsystem/throwing.dm

@@ -116,7 +116,7 @@ SUBSYSTEM_DEF(throwing)
 			return
 
 		dist_travelled++
-		
+
 		if (dist_travelled > MAX_THROWING_DIST)
 			finalize()
 			return
@@ -154,7 +154,7 @@ SUBSYSTEM_DEF(throwing)
 /datum/thrownthing/proc/hitcheck()
 	for (var/thing in get_turf(thrownthing))
 		var/atom/movable/AM = thing
-		if (AM == thrownthing)
+		if (AM == thrownthing || (AM == thrower && !ismob(thrownthing)))
 			continue
 		if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
 			finalize(hit=TRUE, target=AM)

code/controllers/subsystem/ticker.dm

@@ -126,9 +126,20 @@ SUBSYSTEM_DEF(ticker)
 
 
 	if(!GLOB.syndicate_code_phrase)
-		GLOB.syndicate_code_phrase	= generate_code_phrase()
+		GLOB.syndicate_code_phrase	= generate_code_phrase(return_list=TRUE)
+
+		var/codewords = jointext(GLOB.syndicate_code_phrase, "|")
+		var/regex/codeword_match = new("([codewords])", "ig")
+
+		GLOB.syndicate_code_phrase_regex = codeword_match
+
 	if(!GLOB.syndicate_code_response)
-		GLOB.syndicate_code_response = generate_code_phrase()
+		GLOB.syndicate_code_response = generate_code_phrase(return_list=TRUE)
+
+		var/codewords = jointext(GLOB.syndicate_code_response, "|")
+		var/regex/codeword_match = new("([codewords])", "ig")
+
+		GLOB.syndicate_code_response_regex = codeword_match
 
 	start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
 	if(CONFIG_GET(flag/randomize_shift_time))
@@ -218,7 +229,7 @@ SUBSYSTEM_DEF(ticker)
 			if(GLOB.secret_force_mode != "secret")
 				var/datum/game_mode/smode = config.pick_mode(GLOB.secret_force_mode)
 				if(!smode.can_start())
-					message_admins("\blue Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.")
+					message_admins("<span class='notice'>Unable to force secret [GLOB.secret_force_mode]. [smode.required_players] players and [smode.required_enemies] eligible antagonists needed.</span>")
 				else
 					mode = smode
 
@@ -291,14 +302,14 @@ SUBSYSTEM_DEF(ticker)
 	round_start_time = world.time
 	SSdbcore.SetRoundStart()
 
-	to_chat(world, "<FONT color='blue'><B>Welcome to [station_name()], enjoy your stay!</B></FONT>")
+	to_chat(world, "<span class='notice'><B>Welcome to [station_name()], enjoy your stay!</B></span>")
 	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))
 
 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)
 
 	if(SSevents.holidays)
-		to_chat(world, "<font color='blue'>and...</font>")
+		to_chat(world, "<span class='notice'>and...</span>")
 		for(var/holidayname in SSevents.holidays)
 			var/datum/holiday/holiday = SSevents.holidays[holidayname]
 			to_chat(world, "<h4>[holiday.greet()]</h4>")
@@ -414,7 +425,7 @@ SUBSYSTEM_DEF(ticker)
 			m = pick(memetips)
 
 	if(m)
-		to_chat(world, "<font color='purple'><b>Tip of the round: </b>[html_encode(m)]</font>")
+		to_chat(world, "<span class='purple'><b>Tip of the round: </b>[html_encode(m)]</span>")
 
 /datum/controller/subsystem/ticker/proc/check_queue()
 	var/hpc = CONFIG_GET(number/hard_popcap)
@@ -561,6 +572,15 @@ SUBSYSTEM_DEF(ticker)
 			news_message = "The burst of energy released near [station_name()] has been confirmed as merely a test of a new weapon. However, due to an unexpected mechanical error, their communications system has been knocked offline."
 		if(SHUTTLE_HIJACK)
 			news_message = "During routine evacuation procedures, the emergency shuttle of [station_name()] had its navigation protocols corrupted and went off course, but was recovered shortly after."
+		if(GANG_VICTORY)
+			news_message = "Company officials reaffirmed that sudden deployments of special forces are not in any way connected to rumors of [station_name()] being covered in graffiti."
+
+	if(SSblackbox.first_death)
+		var/list/ded = SSblackbox.first_death
+		if(ded.len)
+			news_message += " NT Sanctioned Psykers picked up faint traces of someone near the station, allegedly having had died. Their name was: [ded["name"]], [ded["role"]], at [ded["area"]].[ded["last_words"] ? " Their last words were: \"[ded["last_words"]]\"" : ""]"
+		else
+			news_message += " NT Sanctioned Psykers proudly confirm reports that nobody died this shift!"
 
 	if(news_message)
 		send2otherserver(news_source, news_message,"News_Report")

code/controllers/subsystem/timer.dm

@@ -71,7 +71,6 @@ SUBSYSTEM_DEF(timer)
 		for(var/I in second_queue)
 			log_world(get_timer_debug_string(I))
 
-	var/cut_start_index = 1
 	var/next_clienttime_timer_index = 0
 	var/len = length(clienttime_timers)
 
@@ -94,14 +93,14 @@ SUBSYSTEM_DEF(timer)
 
 		if(ctime_timer.flags & TIMER_LOOP)
 			ctime_timer.spent = 0
-			clienttime_timers.Insert(ctime_timer, 1)
-			cut_start_index++
+			ctime_timer.timeToRun = REALTIMEOFDAY + ctime_timer.wait
+			BINARY_INSERT(ctime_timer, clienttime_timers, datum/timedevent, timeToRun)
 		else
 			qdel(ctime_timer)
 
 
 	if (next_clienttime_timer_index)
-		clienttime_timers.Cut(cut_start_index,next_clienttime_timer_index+1)
+		clienttime_timers.Cut(1, next_clienttime_timer_index+1)
 
 	if (MC_TICK_CHECK)
 		return

code/controllers/subsystem/traumas.dm

@@ -72,7 +72,7 @@ SUBSYSTEM_DEF(traumas)
 					"security"  = typecacheof(list(/obj/item/clothing/under/rank/security, /obj/item/clothing/under/rank/warden,
 											 	 /obj/item/clothing/under/rank/head_of_security, /obj/item/clothing/under/rank/det,
 												 /obj/item/melee/baton, /obj/item/gun/energy/taser, /obj/item/restraints/handcuffs,
-												 /obj/machinery/door/airlock/security)),
+												 /obj/machinery/door/airlock/security, /obj/effect/hallucination/simple/securitron)),
 
 					"clowns" = typecacheof(list(/obj/item/clothing/under/rank/clown, /obj/item/clothing/shoes/clown_shoes,
 												 /obj/item/clothing/mask/gas/clown_hat, /obj/item/instrument/bikehorn,
@@ -160,22 +160,22 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
 						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
 						/obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
-						
+
 					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
-						
+
 					"syndicate" = typecacheof(list(/obj/item/stack/tile/mineral/plastitanium, /obj/machinery/computer/shuttle/syndicate, /obj/machinery/computer/shuttle/syndicate/recall, /obj/machinery/computer/shuttle/syndicate/drop_pod, /obj/machinery/computer/camera_advanced/shuttle_docker/syndicate, /obj/machinery/recharge_station,
 						/obj/machinery/porta_turret/syndicate, /obj/structure/closet/syndicate, /obj/machinery/suit_storage_unit/syndicate, /obj/item/clothing/under/syndicate, /obj/item/folder/syndicate, /obj/item/documents/syndicate, /obj/item/clothing/glasses/phantomthief/syndicate, /obj/item/antag_spawner/nuke_ops, /obj/item/storage/box/syndicate,
 						/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver/syndie,
 						/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
-						/obj/item/melee/transforming/energy/sword/saber, /obj/item/twohanded/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm, 
+						/obj/item/melee/transforming/energy/sword/saber, /obj/item/twohanded/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
 						/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/mecha/combat/gygax/dark, /obj/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
 						/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,
-						/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited, 
-						/obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate, 
-						/obj/machinery/computer/pod/old/syndicate, /obj/machinery/vending/medical/syndicate_access, /obj/item/mmi/syndie, /obj/item/target/syndicate, /obj/machinery/vending/cigarette/syndicate, /obj/item/robot_module/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/power/singularity_beacon/syndicate, /obj/item/clothing/head/syndicatefake, 
-						/obj/item/radio/headset/syndicate, /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate, /obj/item/pda/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/gun/ballistic/automatic/flechette, /obj/item/ammo_box/magazine/flechette, /obj/item/clothing/suit/toggle/lawyer/black/syndie, /obj/item/melee/transforming/energy/sword/cx/traitor, 
-						/obj/structure/sign/poster/contraband/syndicate_pistol, /obj/structure/sign/poster/contraband/syndicate_recruitment, /obj/item/bedsheet/syndie, /obj/item/borg/upgrade/syndicate, /obj/item/tank/jetpack/oxygen/harness, /obj/item/firing_pin/implant/pindicate, /obj/item/reagent_containers/glass/bottle/traitor, /obj/item/storage/belt/military, 
+						/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited,
+						/obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate,
+						/obj/machinery/computer/pod/old/syndicate, /obj/machinery/vending/medical/syndicate_access, /obj/item/mmi/syndie, /obj/item/target/syndicate, /obj/machinery/vending/cigarette/syndicate, /obj/item/robot_module/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/power/singularity_beacon/syndicate, /obj/item/clothing/head/syndicatefake,
+						/obj/item/radio/headset/syndicate, /obj/item/gun/ballistic/automatic/pistol/antitank/syndicate, /obj/item/pda/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/gun/ballistic/automatic/flechette, /obj/item/ammo_box/magazine/flechette, /obj/item/clothing/suit/toggle/lawyer/black/syndie, /obj/item/melee/transforming/energy/sword/cx/traitor,
+						/obj/structure/sign/poster/contraband/syndicate_pistol, /obj/structure/sign/poster/contraband/syndicate_recruitment, /obj/item/bedsheet/syndie, /obj/item/borg/upgrade/syndicate, /obj/item/tank/jetpack/oxygen/harness, /obj/item/firing_pin/implant/pindicate, /obj/item/reagent_containers/glass/bottle/traitor, /obj/item/storage/belt/military,
 						/obj/item/twohanded/shockpaddles/syndicate, /obj/item/clothing/mask/cigarette/syndicate, /obj/item/toy/plush/nukeplushie)),
 
 					"eye" = typecacheof(list(/obj/item/organ/eyes, /obj/item/reagent_containers/syringe))
@@ -199,7 +199,7 @@ SUBSYSTEM_DEF(traumas)
 						  "anime" = typecacheof(list(/datum/species/human/felinid)),
 						  "cats" = typecacheof(list(/datum/species/human/felinid)),
 						  "syndicate" = typecacheof(list(/datum/species/corporate, /datum/species/zombie/infectious))
-						 )				 
+						 )
 
 	return ..()
 

code/controllers/subsystem/vote.dm

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

code/datums/action.dm

@@ -195,11 +195,16 @@
 /datum/action/item_action/toggle_firemode
 	name = "Toggle Firemode"
 
-/datum/action/item_action/rcl
+/datum/action/item_action/rcl_col
 	name = "Change Cable Color"
 	icon_icon = 'icons/mob/actions/actions_items.dmi'
 	button_icon_state = "rcl_rainbow"
 
+/datum/action/item_action/rcl_gui
+	name = "Toggle Fast Wiring Gui"
+	icon_icon = 'icons/mob/actions/actions_items.dmi'
+	button_icon_state = "rcl_gui"
+
 /datum/action/item_action/startchainsaw
 	name = "Pull The Starting Cord"
 

code/datums/brain_damage/brain_trauma.dm

@@ -9,7 +9,8 @@
 	var/obj/item/organ/brain/brain //the poor bastard's brain
 	var/gain_text = "<span class='notice'>You feel traumatized.</span>"
 	var/lose_text = "<span class='notice'>You no longer feel traumatized.</span>"
-	var/can_gain = TRUE //can this be gained through random traumas?
+	var/can_gain = TRUE
+	var/random_gain = TRUE //can this be gained through random traumas?
 	var/resilience = TRAUMA_RESILIENCE_BASIC //how hard is this to cure?
 
 /datum/brain_trauma/Destroy()
@@ -23,7 +24,7 @@
 //Called on life ticks
 /datum/brain_trauma/proc/on_life()
 	return
-	
+
 //Called on death
 /datum/brain_trauma/proc/on_death()
 	return
@@ -31,16 +32,18 @@
 //Called when given to a mob
 /datum/brain_trauma/proc/on_gain()
 	to_chat(owner, gain_text)
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
 
 //Called when removed from a mob
 /datum/brain_trauma/proc/on_lose(silent)
 	if(!silent)
 		to_chat(owner, lose_text)
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
 
 //Called when hearing a spoken message
 /datum/brain_trauma/proc/on_hear(message, speaker, message_language, raw_message, radio_freq)
 	return message
 
 //Called when speaking
-/datum/brain_trauma/proc/on_say(message)
-	return message
+/datum/brain_trauma/proc/handle_speech(datum/source, list/speech_args)
+	UnregisterSignal(owner, COMSIG_MOB_SAY)

code/datums/brain_damage/mild.dm

@@ -42,7 +42,7 @@
 	lose_text = "<span class='notice'>You feel smart again.</span>"
 
 /datum/brain_trauma/mild/dumbness/on_gain()
-	owner.add_trait(TRAIT_DUMB, TRAUMA_TRAIT)
+	ADD_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT)
 	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "dumb", /datum/mood_event/oblivious)
 	..()
 
@@ -55,7 +55,7 @@
 	..()
 
 /datum/brain_trauma/mild/dumbness/on_lose()
-	owner.remove_trait(TRAIT_DUMB, TRAUMA_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_DUMB, TRAUMA_TRAIT)
 	owner.derpspeech = 0
 	SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "dumb")
 	..()
@@ -68,18 +68,12 @@
 	lose_text = ""
 
 /datum/brain_trauma/mild/speech_impediment/on_gain()
-	owner.dna.add_mutation(UNINTELLIGIBLE)
-	..()
-
-//no fiddling with genetics to get out of this one
-/datum/brain_trauma/mild/speech_impediment/on_life()
-	if(!(GLOB.mutations_list[UNINTELLIGIBLE] in owner.dna.mutations))
-		on_gain()
-	..()
+	ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
+	. = ..()
 
 /datum/brain_trauma/mild/speech_impediment/on_lose()
-	owner.dna.remove_mutation(UNINTELLIGIBLE)
-	..()
+	REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, TRAUMA_TRAIT)
+	. = ..()
 
 /datum/brain_trauma/mild/concussion
 	name = "Concussion"

code/datums/brain_damage/phobia.dm

@@ -78,14 +78,13 @@
 			break
 	return message
 
-/datum/brain_trauma/mild/phobia/on_say(message)
+/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
 	for(var/word in trigger_words)
 		var/reg = regex("(\\b|\\A)[REGEX_QUOTE(word)]'?s*(\\b|\\Z)", "i")
-		
-		if(findtext(message, reg))
+
+		if(findtext(speech_args[SPEECH_MESSAGE], reg))
 			to_chat(owner, "<span class='warning'>You can't bring yourself to say the word \"[word]\"!</span>")
-			return ""
-	return message
+			speech_args[SPEECH_MESSAGE] = ""
 
 /datum/brain_trauma/mild/phobia/proc/freak_out(atom/reason, trigger_word)
 	next_scare = world.time + 120
@@ -119,3 +118,7 @@
 			owner.confused += 10
 			owner.Jitter(10)
 			owner.stuttering += 10
+
+/datum/brain_trauma/mild/phobia/security
+	phobia_type = "security"
+	random_gain = FALSE

code/datums/brain_damage/severe.dm

@@ -13,11 +13,11 @@
 	lose_text = "<span class='notice'>You suddenly remember how to speak.</span>"
 
 /datum/brain_trauma/severe/mute/on_gain()
-	owner.add_trait(TRAIT_MUTE, TRAUMA_TRAIT)
+	ADD_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT)
 	..()
 
 /datum/brain_trauma/severe/mute/on_lose()
-	owner.remove_trait(TRAIT_MUTE, TRAUMA_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_MUTE, TRAUMA_TRAIT)
 	..()
 
 /datum/brain_trauma/severe/aphasia
@@ -60,18 +60,68 @@
 
 /datum/brain_trauma/severe/paralysis
 	name = "Paralysis"
-	desc = "Patient's brain can no longer control its motor functions."
+	desc = "Patient's brain can no longer control part of its motor functions."
 	scan_desc = "cerebral paralysis"
-	gain_text = "<span class='warning'>You can't feel your body anymore!</span>"
-	lose_text = "<span class='notice'>You can feel your limbs again!</span>"
+	gain_text = ""
+	lose_text = ""
+	var/paralysis_type
+	var/list/paralysis_traits = list()
+	 //for descriptions
 
-/datum/brain_trauma/severe/paralysis/on_life()
-	owner.Knockdown(200, ignore_canknockdown = TRUE)
+/datum/brain_trauma/severe/paralysis/New(specific_type)
+	if(specific_type)
+		paralysis_type = specific_type
+	if(!paralysis_type)
+		paralysis_type = pick("full","left","right","arms","legs","r_arm","l_arm","r_leg","l_leg")
+	var/subject
+	switch(paralysis_type)
+		if("full")
+			subject = "your body"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_L_LEG, TRAIT_PARALYSIS_R_LEG)
+		if("left")
+			subject = "the left side of your body"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_L_LEG)
+		if("right")
+			subject = "the right side of your body"
+			paralysis_traits = list(TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_R_LEG)
+		if("arms")
+			subject = "your arms"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM)
+		if("legs")
+			subject = "your legs"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_LEG, TRAIT_PARALYSIS_R_LEG)
+		if("r_arm")
+			subject = "your right arm"
+			paralysis_traits = list(TRAIT_PARALYSIS_R_ARM)
+		if("l_arm")
+			subject = "your left arm"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_ARM)
+		if("r_leg")
+			subject = "your right leg"
+			paralysis_traits = list(TRAIT_PARALYSIS_R_LEG)
+		if("l_leg")
+			subject = "your left leg"
+			paralysis_traits = list(TRAIT_PARALYSIS_L_LEG)
+
+	gain_text = "<span class='warning'>You can't feel [subject] anymore!</span>"
+	lose_text = "<span class='notice'>You can feel [subject] again!</span>"
+
+/datum/brain_trauma/severe/paralysis/on_gain()
 	..()
+	for(var/X in paralysis_traits)
+		ADD_TRAIT(owner, X, "trauma_paralysis")
+	owner.update_disabled_bodyparts()
 
 /datum/brain_trauma/severe/paralysis/on_lose()
-	owner.SetKnockdown(0)
 	..()
+	for(var/X in paralysis_traits)
+		REMOVE_TRAIT(owner, X, "trauma_paralysis")
+	owner.update_disabled_bodyparts()
+
+/datum/brain_trauma/severe/paralysis/paraplegic
+	//can_gain = FALSE maybe breaks.
+	paralysis_type = "legs"
+	resilience = TRAUMA_RESILIENCE_ABSOLUTE
 
 /datum/brain_trauma/severe/narcolepsy
 	name = "Narcolepsy"
@@ -121,7 +171,7 @@
 		stress -= 4
 
 /datum/brain_trauma/severe/monophobia/proc/check_alone()
-	if(owner.has_trait(TRAIT_BLIND))
+	if(HAS_TRAIT(owner, TRAIT_BLIND))
 		return TRUE
 	for(var/mob/M in oview(owner, 7))
 		if(!isliving(M)) //ghosts ain't people
@@ -183,11 +233,11 @@
 	lose_text = "<span class='notice'>You feel in control of your hands again.</span>"
 
 /datum/brain_trauma/severe/discoordination/on_gain()
-	owner.add_trait(TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
+	ADD_TRAIT(owner, TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
 	..()
 
 /datum/brain_trauma/severe/discoordination/on_lose()
-	owner.remove_trait(TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
+	REMOVE_TRAIT(owner, TRAIT_MONKEYLIKE, TRAUMA_TRAIT)
 	..()
 
 /datum/brain_trauma/severe/pacifism
@@ -198,9 +248,9 @@
 	lose_text = "<span class='notice'>You no longer feel compelled to not harm.</span>"
 
 /datum/brain_trauma/severe/pacifism/on_gain()
-	owner.add_trait(TRAIT_PACIFISM, TRAUMA_TRAIT)
+	ADD_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT)
 	..()
 
 /datum/brain_trauma/severe/pacifism/on_lose()
-	owner.remove_trait(TRAIT_PACIFISM, TRAUMA_TRAIT)
-	..()
+	REMOVE_TRAIT(owner, TRAIT_PACIFISM, TRAUMA_TRAIT)
+	..()

code/datums/brain_damage/special.dm

@@ -134,3 +134,71 @@
 
 /datum/brain_trauma/special/psychotic_brawling/bath_salts
 	name = "Chemical Violent Psychosis"
+	random_gain = FALSE
+
+/datum/brain_trauma/special/beepsky
+	name = "Criminal"
+	desc = "Patient seems to be a criminal."
+	scan_desc = "criminal mind"
+	gain_text = "<span class='warning'>Justice is coming for you.</span>"
+	lose_text = "<span class='notice'>You were absolved for your crimes.</span>"
+	random_gain = FALSE
+	var/obj/effect/hallucination/simple/securitron/beepsky
+
+/datum/brain_trauma/special/beepsky/on_gain()
+	create_securitron()
+	..()
+
+/datum/brain_trauma/special/beepsky/proc/create_securitron()
+	var/turf/where = locate(owner.x + pick(-12, 12), owner.y + pick(-12, 12), owner.z)
+	beepsky = new(where, owner)
+	beepsky.victim = owner
+
+/datum/brain_trauma/special/beepsky/on_lose()
+	QDEL_NULL(beepsky)
+	..()
+
+/datum/brain_trauma/special/beepsky/on_life()
+	if(QDELETED(beepsky) || !beepsky.loc || beepsky.z != owner.z)
+		QDEL_NULL(beepsky)
+		if(prob(30))
+			create_securitron()
+		else
+			return
+	if(get_dist(owner, beepsky) >= 10 && prob(20))
+		QDEL_NULL(beepsky)
+		create_securitron()
+	if(owner.stat != CONSCIOUS)
+		if(prob(20))
+			owner.playsound_local(beepsky, 'sound/voice/beepsky/iamthelaw.ogg', 50)
+		return
+	if(get_dist(owner, beepsky) <= 1)
+		owner.playsound_local(owner, 'sound/weapons/egloves.ogg', 50)
+		owner.visible_message("<span class='warning'>[owner]'s body jerks as if it was shocked.</span>", "<span class='userdanger'>You feel the fist of the LAW.</span>")
+		owner.take_bodypart_damage(0,0,rand(40, 70))
+		QDEL_NULL(beepsky)
+	if(prob(20) && get_dist(owner, beepsky) <= 8)
+		owner.playsound_local(beepsky, 'sound/voice/beepsky/criminal.ogg', 40)
+	..()
+
+/obj/effect/hallucination/simple/securitron
+	name = "Securitron"
+	desc = "The LAW is coming."
+	image_icon = 'icons/mob/aibots.dmi'
+	image_state = "secbot-c"
+	var/victim
+
+/obj/effect/hallucination/simple/securitron/New()
+	name = pick ( "officer Beepsky", "officer Johnson", "officer Pingsky")
+	START_PROCESSING(SSfastprocess,src)
+	..()
+
+/obj/effect/hallucination/simple/securitron/process()
+	if(prob(60))
+		forceMove(get_step_towards(src, victim))
+		if(prob(5))
+			to_chat(victim, "<span class='name'>[name]</span> exclaims, \"<span class='robotic'>Level 10 infraction alert!\"</span>")
+
+/obj/effect/hallucination/simple/securitron/Destroy()
+	STOP_PROCESSING(SSfastprocess,src)
+	return ..()

code/datums/brain_damage/split_personality.dm

@@ -192,17 +192,16 @@
 	return //no random switching
 
 /datum/brain_trauma/severe/split_personality/brainwashing/on_hear(message, speaker, message_language, raw_message, radio_freq)
-	if(owner.has_trait(TRAIT_DEAF) || owner == speaker)
+	if(HAS_TRAIT(owner, TRAIT_DEAF) || owner == speaker)
 		return message
 	if(findtext(message, codeword))
 		message = replacetext(message, codeword, "<span class='warning'>[codeword]</span>")
 		addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)
 	return message
 
-/datum/brain_trauma/severe/split_personality/brainwashing/on_say(message)
-	if(findtext(message, codeword))
-		return "" //oh hey did you want to tell people about the secret word to bring you back?
-	return message
+/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
+	if(findtext(speech_args[SPEECH_MESSAGE], codeword))
+		speech_args[SPEECH_MESSAGE] = "" //oh hey did you want to tell people about the secret word to bring you back?
 
 /mob/living/split_personality/traitor
 	name = "split personality"

code/datums/components/bouncy.dm

@@ -0,0 +1,40 @@
+/datum/component/bouncy
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+	var/bouncy_mod = 1
+	var/list/bounce_signals = list(COMSIG_MOVABLE_IMPACT, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK)
+
+/datum/component/bouncy/Initialize(_bouncy_mod, list/_bounce_signals)
+	if(!ismovableatom(parent))
+		return COMPONENT_INCOMPATIBLE
+	if(_bouncy_mod)
+		bouncy_mod = _bouncy_mod
+	if(_bounce_signals)
+		bounce_signals = _bounce_signals
+
+/datum/component/bouncy/InheritComponent(datum/component/bouncy/B, original, _bouncy_mod, list/_bounce_signals)
+	if(_bouncy_mod)
+		bouncy_mod = max(bouncy_mod, _bouncy_mod)
+	if(_bounce_signals)
+		var/list/diff_bounces = difflist(bounce_signals, _bounce_signals, TRUE)
+		for(var/bounce in diff_bounces)
+			bounce_signals += bounce
+			RegisterSignal(parent, bounce, .proc/bounce_up)
+
+/datum/component/bouncy/RegisterWithParent()
+	RegisterSignal(parent, bounce_signals, .proc/bounce_up)
+
+/datum/component/bouncy/UnregisterFromParent()
+	UnregisterSignal(parent, bounce_signals)
+
+/datum/component/bouncy/proc/bounce_up(datum/source)
+	var/atom/movable/A = parent
+	switch(rand(1, 3))
+		if(1)
+			A.do_jiggle(45 + rand(-10, 10) * bouncy_mod, 14)
+		if(2)
+			var/min_b = 0.6/bouncy_mod
+			var/max_b = 1.2 * bouncy_mod
+			A.do_squish(rand(min_b, max_b), rand(min_b, max_b), 14)
+		if(3)
+			var/pixelshift = 8 * bouncy_mod
+			A.Shake(pixelshift, pixelshift, duration = 15)

code/datums/components/caltrop.dm

@@ -24,7 +24,7 @@
 
 	if(ishuman(AM))
 		var/mob/living/carbon/human/H = AM
-		if(H.has_trait(TRAIT_PIERCEIMMUNE))
+		if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
 			return
 
 		if((flags & CALTROP_IGNORE_WALKERS) && H.m_intent == MOVE_INTENT_WALK)
@@ -46,7 +46,7 @@
 			return
 
 		var/damage = rand(min_damage, max_damage)
-		if(H.has_trait(TRAIT_LIGHT_STEP))
+		if(HAS_TRAIT(H, TRAIT_LIGHT_STEP))
 			damage *= 0.75
 		H.apply_damage(damage, BRUTE, picked_def_zone)
 

code/datums/components/earhealing.dm

@@ -23,7 +23,7 @@
 	if (!wearer)
 		STOP_PROCESSING(SSobj, src)
 		return
-	if(!wearer.has_trait(TRAIT_DEAF))
+	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.ear_damage < UNHEALING_EAR_DAMAGE ? 0 : 1)) // Do not clear deafness while above the unhealing ear damage threshold

code/datums/components/mood.dm

@@ -15,7 +15,7 @@
 /datum/component/mood/Initialize()
 	if(!isliving(parent))
 		return COMPONENT_INCOMPATIBLE
-	
+
 	START_PROCESSING(SSmood, src)
 
 	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
@@ -150,17 +150,17 @@
 		else
 			owner.crit_threshold -= (holdmyinsanityeffect - insanity_effect)
 
-	if(owner.has_trait(TRAIT_DEPRESSION))
+	if(HAS_TRAIT(owner, TRAIT_DEPRESSION))
 		if(prob(0.05))
 			add_event(null, "depression", /datum/mood_event/depression)
 			clear_event(null, "jolly")
-	if(owner.has_trait(TRAIT_JOLLY))
+	if(HAS_TRAIT(owner, TRAIT_JOLLY))
 		if(prob(0.05))
 			add_event(null, "jolly", /datum/mood_event/jolly)
 			clear_event(null, "depression")
 
 	holdmyinsanityeffect = insanity_effect
-	
+
 	HandleNutrition(owner)
 
 /datum/component/mood/proc/DecreaseSanity(amount, minimum = SANITY_INSANE)

code/datums/components/nanites.dm

@@ -2,10 +2,10 @@
 	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
 
 	var/mob/living/host_mob
-	var/nanite_volume = 100		//amount of nanites in the system, used as fuel for nanite programs
-	var/max_nanites = 500		//maximum amount of nanites in the system
+	var/nanite_volume = 50		//amount of nanites in the system, used as fuel for nanite programs
+	var/max_nanites = 250		//maximum amount of nanites in the system
 	var/regen_rate = 0.5		//nanites generated per second
-	var/safety_threshold = 50	//how low nanites will get before they stop processing/triggering
+	var/safety_threshold = 25	//how low nanites will get before they stop processing/triggering
 	var/cloud_id = 0 			//0 if not connected to the cloud, 1-100 to set a determined cloud backup to draw from
 	var/next_sync = 0
 	var/list/datum/nanite_program/programs = list()
@@ -46,9 +46,9 @@
 	RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, .proc/add_program)
 	RegisterSignal(parent, COMSIG_NANITE_SCAN, .proc/nanite_scan)
 	RegisterSignal(parent, COMSIG_NANITE_SYNC, .proc/sync)
+	RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)
 
 	if(isliving(parent))
-		RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)
 		RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/on_death)
 		RegisterSignal(parent, COMSIG_MOB_ALLOWED, .proc/check_access)
 		RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_shock)
@@ -169,23 +169,19 @@
 	holder.icon_state = "nanites[nanite_percent]"
 
 /datum/component/nanites/proc/on_emp(datum/source, severity)
-	nanite_volume *= (rand(0.60, 0.90))		//Lose 10-40% of nanites
-	adjust_nanites(null, -(rand(5, 50)))		//Lose 5-50 flat nanite volume
-	if(prob(40/severity))
-		cloud_id = 0
+	adjust_nanites(null, -(nanite_volume * 0.3 + 50))		//Lose 30% variable and 50 flat nanite volume.
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_emp(severity)
 
 /datum/component/nanites/proc/on_shock(datum/source, shock_damage)
-	nanite_volume *= (rand(0.45, 0.80))		//Lose 20-55% of nanites
-	adjust_nanites(null, -(rand(5, 50)))			//Lose 5-50 flat nanite volume
+	adjust_nanites(null, -(nanite_volume * (shock_damage * 0.005) + shock_damage)) //0.5% of shock damage (@ 50 damage it'd drain 25%) + shock damage flat volume
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_shock(shock_damage)
 
 /datum/component/nanites/proc/on_minor_shock(datum/source)
-	adjust_nanites(null, -(rand(5, 15)))			//Lose 5-15 flat nanite volume
+	adjust_nanites(null, -25)
 	for(var/X in programs)
 		var/datum/nanite_program/NP = X
 		NP.on_minor_shock()
@@ -311,4 +307,4 @@
 			mob_program["trigger_code"] = P.trigger_code
 		id++
 		mob_programs += list(mob_program)
-	data["mob_programs"] = mob_programs
+	data["mob_programs"] = mob_programs

code/datums/components/orbiter.dm

@@ -0,0 +1,156 @@
+/datum/component/orbiter
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+	var/list/orbiters
+	var/datum/callback/orbiter_spy
+	var/datum/callback/orbited_spy
+
+//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
+//clockwise: whether you orbit clockwise or anti clockwise
+//rotation_speed: how fast to rotate (how many ds should it take for a rotation to complete)
+//rotation_segments: the resolution of the orbit circle, less = a more block circle, this can be used to produce hexagons (6 segments) triangles (3 segments), and so on, 36 is the best default.
+//pre_rotation: Chooses to rotate src 90 degress towards the orbit dir (clockwise/anticlockwise), useful for things to go "head first" like ghosts
+/datum/component/orbiter/Initialize(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+	if(!istype(orbiter) || !isatom(parent) || isarea(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	orbiters = list()
+	orbiter_spy = CALLBACK(src, .proc/orbiter_move_react)
+	orbited_spy = CALLBACK(src, .proc/move_react)
+
+	var/atom/master = parent
+	master.orbiters = src
+
+	begin_orbit(orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+
+/datum/component/orbiter/RegisterWithParent()
+	var/atom/target = parent
+	while(ismovableatom(target))
+		RegisterSignal(target, COMSIG_MOVABLE_MOVED, orbited_spy)
+		target = target.loc
+
+/datum/component/orbiter/UnregisterFromParent()
+	var/atom/target = parent
+	while(ismovableatom(target))
+		UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+		target = target.loc
+
+/datum/component/orbiter/Destroy()
+	var/atom/master = parent
+	master.orbiters = null
+	for(var/i in orbiters)
+		end_orbit(i)
+	orbiters = null
+	QDEL_NULL(orbiter_spy)
+	QDEL_NULL(orbited_spy)
+	return ..()
+
+/datum/component/orbiter/InheritComponent(datum/component/orbiter/newcomp, original, list/arguments)
+	if(arguments)
+		begin_orbit(arglist(arguments))
+		return
+	// The following only happens on component transfers
+	orbiters += newcomp.orbiters
+
+/datum/component/orbiter/PostTransfer()
+	if(!isatom(parent) || isarea(parent) || !get_turf(parent))
+		return COMPONENT_INCOMPATIBLE
+	move_react()
+
+/datum/component/orbiter/proc/begin_orbit(atom/movable/orbiter, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+	if(orbiter.orbiting)
+		if(orbiter.orbiting == src)
+			orbiter.orbiting.end_orbit(orbiter, TRUE)
+		else
+			orbiter.orbiting.end_orbit(orbiter)
+	orbiters[orbiter] = TRUE
+	orbiter.orbiting = src
+	RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, orbiter_spy)
+	var/matrix/initial_transform = matrix(orbiter.transform)
+
+	// Head first!
+	if(pre_rotation)
+		var/matrix/M = matrix(orbiter.transform)
+		var/pre_rot = 90
+		if(!clockwise)
+			pre_rot = -90
+		M.Turn(pre_rot)
+		orbiter.transform = M
+
+	var/matrix/shift = matrix(orbiter.transform)
+	shift.Translate(0, radius)
+	orbiter.transform = shift
+
+	orbiter.SpinAnimation(rotation_speed, -1, clockwise, rotation_segments, parallel = FALSE)
+
+	//we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit
+	orbiter.transform = initial_transform
+	orbiter.forceMove(get_turf(parent))
+	to_chat(orbiter, "<span class='notice'>Now orbiting [parent].</span>")
+
+/datum/component/orbiter/proc/end_orbit(atom/movable/orbiter, refreshing=FALSE)
+	if(!orbiters[orbiter])
+		return
+	UnregisterSignal(orbiter, COMSIG_MOVABLE_MOVED)
+	orbiter.SpinAnimation(0, 0)
+	orbiters -= orbiter
+	orbiter.stop_orbit(src)
+	orbiter.orbiting = null
+	if(!refreshing && !length(orbiters) && !QDELING(src))
+		qdel(src)
+
+// This proc can receive signals by either the thing being directly orbited or anything holding it
+/datum/component/orbiter/proc/move_react(atom/orbited, atom/oldloc, direction)
+	set waitfor = FALSE // Transfer calls this directly and it doesnt care if the ghosts arent done moving
+
+	var/atom/movable/master = parent
+	if(master.loc == oldloc)
+		return
+
+	var/turf/newturf = get_turf(master)
+	if(!newturf)
+		qdel(src)
+
+	// Handling the signals of stuff holding us (or not anymore)
+	// These are prety rarely activated, how often are you following something in a bag?
+	if(oldloc && !isturf(oldloc)) // We used to be registered to it, probably
+		var/atom/target = oldloc
+		while(ismovableatom(target))
+			UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
+			target = target.loc
+	if(orbited?.loc && orbited.loc != newturf) // We want to know when anything holding us moves too
+		var/atom/target = orbited.loc
+		while(ismovableatom(target))
+			RegisterSignal(target, COMSIG_MOVABLE_MOVED, orbited_spy, TRUE)
+			target = target.loc
+
+	var/atom/curloc = master.loc
+	for(var/i in orbiters)
+		var/atom/movable/thing = i
+		if(QDELETED(thing) || thing.loc == newturf)
+			continue
+		thing.forceMove(newturf)
+		if(CHECK_TICK && master.loc != curloc)
+			// We moved again during the checktick, cancel current operation
+			break
+
+
+/datum/component/orbiter/proc/orbiter_move_react(atom/movable/orbiter, atom/oldloc, direction)
+	if(orbiter.loc == get_turf(parent))
+		return
+	end_orbit(orbiter)
+
+/////////////////////
+
+/atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE)
+	if(!istype(A) || !get_turf(A) || A == src)
+		return
+
+	return A.AddComponent(/datum/component/orbiter, src, radius, clockwise, rotation_speed, rotation_segments, pre_rotation)
+
+/atom/movable/proc/stop_orbit(datum/component/orbiter/orbits)
+	return // We're just a simple hook
+
+/atom/proc/transfer_observers_to(atom/target)
+	if(!orbiters || !istype(target) || !get_turf(target) || target == src)
+		return
+	target.TakeComponent(orbiters)

code/datums/components/spooky.dm

@@ -27,7 +27,7 @@
 		C.stuttering = 20
 		if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly)))
 			C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
-		to_chat(C, "<font color='red' size='4'><B>DOOT</B></span>")
+		to_chat(C, "<font color='red' size='4'><B>DOOT</B></font>")
 		spectral_change(H)
 
 	else //the sound will spook monkeys.

code/datums/components/storage/concrete/_concrete.dm

@@ -7,6 +7,8 @@
 	can_transfer = TRUE
 	var/drop_all_on_deconstruct = TRUE
 	var/drop_all_on_destroy = FALSE
+	var/drop_all_on_break = FALSE
+	var/unlock_on_break = FALSE
 	var/transfer_contents_on_component_transfer = FALSE
 	var/list/datum/component/storage/slaves = list()
 
@@ -17,6 +19,7 @@
 	. = ..()
 	RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
 	RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct)
+	RegisterSignal(parent, COMSIG_OBJ_BREAK, .proc/on_break)
 
 /datum/component/storage/concrete/Destroy()
 	var/atom/real_location = real_location()
@@ -101,6 +104,12 @@
 	if(drop_all_on_deconstruct)
 		do_quick_empty()
 
+/datum/component/storage/concrete/proc/on_break(datum/source, damage_flag)
+	if(drop_all_on_break)
+		do_quick_empty()
+	if(unlock_on_break)
+		set_locked(source, FALSE)
+
 /datum/component/storage/concrete/can_see_contents()
 	. = ..()
 	for(var/i in slaves)

code/datums/components/storage/concrete/emergency.dm

@@ -0,0 +1,38 @@
+/datum/component/storage/concrete/emergency
+	drop_all_on_break = TRUE
+	unlock_on_break = TRUE
+	locked = TRUE
+
+/datum/component/storage/concrete/emergency/Initialize()
+	. = ..()
+	RegisterSignal(parent, COMSIG_ATOM_EMAG_ACT, .proc/unlock_me)
+
+/datum/component/storage/concrete/emergency/on_attack_hand(datum/source, mob/user)
+	var/atom/A = parent
+	if(!attack_hand_interact)
+		return
+	if(user.active_storage == src && A.loc == user) //if you're already looking inside the storage item
+		user.active_storage.close(user)
+		close(user)
+		. = COMPONENT_NO_ATTACK_HAND
+		return
+	. = COMPONENT_NO_ATTACK_HAND
+	if(!check_locked(source, user, TRUE))
+		show_to(user)
+		A.do_jiggle()
+		if(rustle_sound)
+			playsound(A, "rustle", 50, 1, -5)
+
+/datum/component/storage/concrete/emergency/signal_insertion_attempt(datum/source, obj/item/I, mob/M, silent = FALSE, force = FALSE)
+	if(!silent && istype(I, /obj/item/card/emag))
+		silent = TRUE // suppresses the message
+	return ..()
+
+/datum/component/storage/concrete/emergency/check_locked(datum/source, mob/user, message = FALSE)
+	. = locked && GLOB.security_level < SEC_LEVEL_RED
+	if(message && . && user)
+		to_chat(user, "The storage unit will only unlock during a Red or Delta security alert.")
+
+/datum/component/storage/concrete/emergency/proc/unlock_me(datum/source)
+	if(locked)
+		set_locked(source, FALSE)

code/datums/components/storage/storage.dm

@@ -156,8 +156,7 @@
 		next += slave.parent
 
 /datum/component/storage/proc/attack_self(datum/source, mob/M)
-	if(locked)
-		to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
+	if(check_locked(source, M, TRUE))
 		return FALSE
 	if((M.get_active_held_item() == parent) && allow_quick_empty)
 		quick_empty(M)
@@ -166,8 +165,7 @@
 	if(!isitem(O) || !click_gather || SEND_SIGNAL(O, COMSIG_CONTAINS_STORAGE))
 		return FALSE
 	. = COMPONENT_NO_ATTACK
-	if(locked)
-		to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
+	if(check_locked(source, M, TRUE))
 		return FALSE
 	var/atom/A = parent
 	var/obj/item/I = O
@@ -238,8 +236,7 @@
 	var/atom/A = parent
 	if((!ishuman(M) && (A.loc != M)) || (M.stat != CONSCIOUS) || M.restrained() || !M.canmove)
 		return
-	if(locked)
-		to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
+	if(check_locked(null, M, TRUE))
 		return FALSE
 	A.add_fingerprint(M)
 	to_chat(M, "<span class='notice'>You start dumping out [parent].</span>")
@@ -281,7 +278,7 @@
 
 /datum/component/storage/proc/set_locked(datum/source, new_state)
 	locked = new_state
-	if(locked)
+	if(check_locked())
 		close_all()
 
 /datum/component/storage/proc/_process_numerical_display()
@@ -456,8 +453,7 @@
 	var/atom/A = parent
 	var/atom/dump_destination = dest_object.get_dumping_location()
 	if(A.Adjacent(M) && dump_destination && M.Adjacent(dump_destination))
-		if(locked)
-			to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
+		if(check_locked(null, M, TRUE))
 			return FALSE
 		if(dump_destination.storage_contents_dump_act(src, M))
 			playsound(A, "rustle", 50, 1, -5)
@@ -535,11 +531,9 @@
 	if(!istype(M))
 		return FALSE
 	A.add_fingerprint(M)
-	if(locked && !force)
-		to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
+	if(!force && (check_locked(null, M) || !M.CanReach(parent, view_only = TRUE)))
 		return FALSE
-	if(force || M.CanReach(parent, view_only = TRUE))
-		show_to(M)
+	show_to(M)
 
 /datum/component/storage/proc/mousedrop_receive(datum/source, atom/movable/O, mob/M)
 	if(isitem(O))
@@ -563,10 +557,9 @@
 	var/atom/host = parent
 	if(real_location == I.loc)
 		return FALSE //Means the item is already in the storage item
-	if(locked)
+	if(check_locked(null, M, !stop_messages))
 		if(M && !stop_messages)
 			host.add_fingerprint(M)
-			to_chat(M, "<span class='warning'>[host] seems to be locked!</span>")
 		return FALSE
 	if(real_location.contents.len >= max_items)
 		if(!stop_messages)
@@ -599,7 +592,7 @@
 			if(!stop_messages)
 				to_chat(M, "<span class='warning'>[IP] cannot hold [I] as it's a storage item of the same size!</span>")
 			return FALSE //To prevent the stacking of same sized storage items.
-	if(I.item_flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry.
+	if(HAS_TRAIT(I, TRAIT_NODROP)) //SHOULD be handled in unEquip, but better safe than sorry.
 		to_chat(M, "<span class='warning'>\the [I] is stuck to your hand, you can't put it in \the [host]!</span>")
 		return FALSE
 	var/datum/component/storage/concrete/master = master()
@@ -659,8 +652,10 @@
 /datum/component/storage/proc/on_check()
 	return TRUE
 
-/datum/component/storage/proc/check_locked()
-	return locked
+/datum/component/storage/proc/check_locked(datum/source, mob/user, message = FALSE)
+	. = locked
+	if(message && . && user)
+		to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
 
 /datum/component/storage/proc/signal_take_type(datum/source, type, atom/destination, amount = INFINITY, check_adjacent = FALSE, force = FALSE, mob/user, list/inserted)
 	if(!force)
@@ -720,9 +715,7 @@
 
 	if(A.loc == user)
 		. = COMPONENT_NO_ATTACK_HAND
-		if(locked)
-			to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
-		else
+		if(!check_locked(source, user, TRUE))
 			show_to(user)
 			A.do_jiggle()
 
@@ -747,15 +740,15 @@
 /datum/component/storage/proc/on_alt_click(datum/source, mob/user)
 	if(!isliving(user) || !user.CanReach(parent))
 		return
-	if(locked)
-		to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
+	if(check_locked(source, user, TRUE))
 		return
 
 	var/atom/A = parent
 	if(!quickdraw)
 		A.add_fingerprint(user)
 		user_show_to_mob(user)
-		playsound(A, "rustle", 50, 1, -5)
+		if(rustle_sound)
+			playsound(A, "rustle", 50, 1, -5)
 		return
 
 	if(!user.incapacitated())

code/datums/components/uplink.dm

@@ -21,6 +21,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 	var/datum/uplink_purchase_log/purchase_log
 	var/list/uplink_items
 	var/hidden_crystals = 0
+	var/unlock_note
+	var/unlock_code
+	var/failsafe_code
 
 /datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20)
 	if(!isitem(parent))
@@ -219,7 +222,10 @@ GLOBAL_LIST_EMPTY(uplinks)
 
 /datum/component/uplink/proc/new_ringtone(datum/source, mob/living/user, new_ring_text)
 	var/obj/item/pda/master = parent
-	if(trim(lowertext(new_ring_text)) != trim(lowertext(master.lock_code))) //why is the lock code stored on the pda?
+	if(trim(lowertext(new_ring_text)) != trim(lowertext(unlock_code)))
+		if(trim(lowertext(new_ring_text)) == trim(lowertext(failsafe_code)))
+			failsafe()
+			return COMPONENT_STOP_RINGTONE_CHANGE
 		return
 	locked = FALSE
 	interact(null, user)
@@ -233,7 +239,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 /datum/component/uplink/proc/new_frequency(datum/source, list/arguments)
 	var/obj/item/radio/master = parent
 	var/frequency = arguments[1]
-	if(frequency != master.traitor_frequency)
+	if(frequency != unlock_code)
+		if(frequency == failsafe_code)
+			failsafe()
 		return
 	locked = FALSE
 	if(ismob(master.loc))
@@ -243,9 +251,38 @@ GLOBAL_LIST_EMPTY(uplinks)
 
 /datum/component/uplink/proc/pen_rotation(datum/source, degrees, mob/living/carbon/user)
 	var/obj/item/pen/master = parent
-	if(degrees != master.traitor_unlock_degrees)
+	if(degrees != unlock_code)
+		if(degrees == failsafe_code) //Getting failsafes on pens is risky business
+			failsafe()
 		return
 	locked = FALSE
 	master.degrees = 0
 	interact(null, user)
-	to_chat(user, "<span class='warning'>Your pen makes a clicking noise, before quickly rotating back to 0 degrees!</span>")
+	to_chat(user, "<span class='warning'>Your pen makes a clicking noise, before quickly rotating back to 0 degrees!</span>")
+
+/datum/component/uplink/proc/setup_unlock_code()
+	unlock_code = generate_code()
+	var/obj/item/P = parent
+	if(istype(parent,/obj/item/pda))
+		unlock_note = "<B>Uplink Passcode:</B> [unlock_code] ([P.name])."
+	else if(istype(parent,/obj/item/radio))
+		unlock_note = "<B>Radio Frequency:</B> [format_frequency(unlock_code)] ([P.name])."
+	else if(istype(parent,/obj/item/pen))
+		unlock_note = "<B>Uplink Degrees:</B> [unlock_code] ([P.name])."
+
+/datum/component/uplink/proc/generate_code()
+	if(istype(parent,/obj/item/pda))
+		return "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]"
+	else if(istype(parent,/obj/item/radio))
+		return sanitize_frequency(rand(MIN_FREQ, MAX_FREQ))
+	else if(istype(parent,/obj/item/pen))
+		return rand(1, 360)
+
+/datum/component/uplink/proc/failsafe()
+	if(!parent)
+		return
+	var/turf/T = get_turf(parent)
+	if(!T)
+		return
+	explosion(T,1,2,3)
+	qdel(parent) //Alternatively could brick the uplink.

code/datums/datum.dm

@@ -2,6 +2,7 @@
 	var/gc_destroyed //Time when this object was destroyed.
 	var/list/active_timers  //for SStimer
 	var/list/datum_components //for /datum/components
+	var/list/status_traits
 	var/list/comp_lookup //it used to be for looking up components which had registered a signal but now anything can register
 	var/list/signal_procs
 	var/signal_enabled = FALSE

code/datums/datumvars.dm

@@ -1351,8 +1351,8 @@
 
 			if(amount != 0)
 				log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
-				var/msg = "<span class='notice'>[key_name(usr)] dealt [amount] amount of [Text] damage to [L] </span>"
-				message_admins(msg)
+				var/msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [L] </span>"
+				message_admins("<span class='notice'>[msg]</span>")
 				admin_ticket_log(L, msg)
 				vv_update_display(L, Text, "[newamt]")
 		else if(href_list["copyoutfit"])

code/datums/diseases/_MobProcs.dm

@@ -117,7 +117,7 @@
 /mob/living/carbon/AirborneContractDisease(datum/disease/D, force_spread)
 	if(internal)
 		return
-	if(has_trait(TRAIT_NOBREATH))
+	if(HAS_TRAIT(src, TRAIT_NOBREATH))
 		return
 	..()
 
@@ -137,7 +137,7 @@
 
 /mob/living/carbon/human/CanContractDisease(datum/disease/D)
 	if(dna)
-		if(has_trait(TRAIT_VIRUSIMMUNE) && !D.bypasses_immunity)
+		if(HAS_TRAIT(src, TRAIT_VIRUSIMMUNE) && !D.bypasses_immunity)
 			return FALSE
 
 	for(var/thing in D.required_organs)

code/datums/diseases/advance/symptoms/heal.dm

@@ -233,7 +233,7 @@
 
 /datum/symptom/heal/coma/CanHeal(datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob
-	if(M.has_trait(TRAIT_DEATHCOMA))
+	if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
 		return power
 	else if(M.IsUnconscious() || M.stat == UNCONSCIOUS)
 		return power * 0.9
@@ -364,15 +364,15 @@
 /datum/symptom/heal/plasma/CanHeal(datum/disease/advance/A)
 	var/mob/living/M = A.affected_mob
 	var/datum/gas_mixture/environment
-	var/list/gases
+	var/plasmamount
 
 	. = 0
 
 	if(M.loc)
 		environment = M.loc.return_air()
 	if(environment)
-		gases = environment.gases
-		if(gases["plasma"] && gases["plasma"][MOLES] > gases["plasma"][GAS_META][META_GAS_MOLES_VISIBLE]) //if there's enough plasma in the air to see
+		plasmamount = environment.gases[/datum/gas/plasma]
+		if(plasmamount && plasmamount > GLOB.meta_gas_visibility[/datum/gas/plasma]) //if there's enough plasma in the air to see
 			. += power * 0.5
 	if(M.reagents.has_reagent("plasma"))
 		. +=  power * 0.75

code/datums/diseases/advance/symptoms/nanites.dm

@@ -25,7 +25,7 @@
 	if(!..())
 		return
 	var/mob/living/carbon/M = A.affected_mob
-	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, 0.5 * power)
+	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, src, power)
 	if(reverse_boost && SEND_SIGNAL(M, COMSIG_HAS_NANITES))
 		if(prob(A.stage_prob))
 			A.stage = min(A.stage + 1,A.max_stages)
@@ -60,4 +60,4 @@
 	SEND_SIGNAL(M, COMSIG_NANITE_ADJUST_VOLUME, -0.4 * power)
 	if(reverse_boost && SEND_SIGNAL(M, COMSIG_HAS_NANITES))
 		if(prob(A.stage_prob))
-			A.stage = min(A.stage + 1,A.max_stages)
+			A.stage = min(A.stage + 1,A.max_stages)

code/datums/diseases/advance/symptoms/sensory.dm

@@ -85,14 +85,14 @@
 		if(4, 5)
 			M.restoreEars()
 
-			if(M.has_trait(TRAIT_BLIND, EYE_DAMAGE))
+			if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE))
 				if(prob(20))
 					to_chat(M, "<span class='notice'>Your vision slowly returns...</span>")
 					M.cure_blind(EYE_DAMAGE)
 					M.cure_nearsighted(EYE_DAMAGE)
 					M.blur_eyes(35)
 
-				else if(M.has_trait(TRAIT_NEARSIGHT, EYE_DAMAGE))
+				else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE))
 					to_chat(M, "<span class='notice'>You can finally focus your eyes on distant objects.</span>")
 					M.cure_nearsighted(EYE_DAMAGE)
 					M.blur_eyes(10)

code/datums/diseases/advance/symptoms/vision.dm

@@ -61,7 +61,7 @@ Bonus
 					M.become_nearsighted(EYE_DAMAGE)
 				if(prob(eyes.eye_damage - 10 + 1))
 					if(!remove_eyes)
-						if(!M.has_trait(TRAIT_BLIND))
+						if(!HAS_TRAIT(M, TRAIT_BLIND))
 							to_chat(M, "<span class='userdanger'>You go blind!</span>")
 						M.become_blind(EYE_DAMAGE)
 					else

code/datums/diseases/pierrot_throat.dm

@@ -26,3 +26,30 @@
 		if(4)
 			if(prob(5))
 				affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) , forced = "pierrot's throat")
+
+/datum/disease/pierrot_throat/after_add()
+	RegisterSignal(affected_mob, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/disease/pierrot_throat/proc/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
+	var/list/split_message = splittext(message, " ") //List each word in the message
+	var/applied = 0
+	for (var/i in 1 to length(split_message))
+		if(prob(3 * stage)) //Stage 1: 3% Stage 2: 6% Stage 3: 9% Stage 4: 12%
+			if(findtext(split_message[i], "*") || findtext(split_message[i], ";") || findtext(split_message[i], ":"))
+				continue
+			split_message[i] = "HONK"
+			if (applied++ > stage)
+				break
+	if (applied)
+		speech_args[SPEECH_SPANS] |= SPAN_CLOWN // a little bonus
+	message = jointext(split_message, " ")
+	speech_args[SPEECH_MESSAGE] = message
+
+/datum/disease/pierrot_throat/Destroy()
+	UnregisterSignal(affected_mob, COMSIG_MOB_SAY)
+	return ..()
+
+/datum/disease/pierrot_throat/remove_disease()
+	UnregisterSignal(affected_mob, COMSIG_MOB_SAY)
+	return ..()

code/datums/dna.dm

@@ -185,25 +185,6 @@
 		if(DNA_TAUR_BLOCK)
 			construct_block(GLOB.taur_list.Find(features["taur"]), GLOB.taur_list.len)
 
-/datum/dna/proc/mutations_say_mods(message)
-	if(message)
-		for(var/datum/mutation/human/M in mutations)
-			message = M.say_mod(message)
-		return message
-
-/datum/dna/proc/mutations_get_spans()
-	var/list/spans = list()
-	for(var/datum/mutation/human/M in mutations)
-		spans |= M.get_spans()
-	return spans
-
-/datum/dna/proc/species_get_spans()
-	var/list/spans = list()
-	if(species)
-		spans |= species.get_spans()
-	return spans
-
-
 /datum/dna/proc/is_same_as(datum/dna/D)
 	if(uni_identity == D.uni_identity && struc_enzymes == D.struc_enzymes && real_name == D.real_name && nameless == D.nameless && custom_species == D.custom_species)
 		if(species.type == D.species.type && features == D.features && blood_type == D.blood_type)

code/datums/emotes.dm

@@ -133,7 +133,7 @@
 
 	if(isliving(user))
 		var/mob/living/L = user
-		if(L.has_trait(TRAIT_EMOTEMUTE))
+		if(HAS_TRAIT(L, TRAIT_EMOTEMUTE))
 			return FALSE
 
 /datum/emote/sound

code/datums/explosion.dm

@@ -198,7 +198,8 @@ GLOBAL_LIST_EMPTY(explosions)
 			var/list/items = list()
 			for(var/I in T)
 				var/atom/A = I
-				items += A.GetAllContents()
+				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.
+					items += A.GetAllContents()
 			for(var/O in items)
 				var/atom/A = O
 				if(!QDELETED(A))

code/datums/helper_datums/teleport.dm

@@ -103,11 +103,11 @@
 		// Can most things breathe?
 		if(trace_gases)
 			continue
-		if(!(A_gases[/datum/gas/oxygen] && A_gases[/datum/gas/oxygen][MOLES] >= 16))
+		if(A_gases[/datum/gas/oxygen] >= 16)
 			continue
 		if(A_gases[/datum/gas/plasma])
 			continue
-		if(A_gases[/datum/gas/carbon_dioxide] && A_gases[/datum/gas/carbon_dioxide][MOLES] >= 10)
+		if(A_gases[/datum/gas/carbon_dioxide] >= 10)
 			continue
 
 		// Aim for goldilocks temperatures and pressure

code/datums/looping_sounds/_looping_sound.dm

@@ -11,7 +11,6 @@
 
 	chance			(num)					Chance per loop to play a mid_sound
 	volume			(num)					Sound output volume
-	muted			(bool)					Private. Used to stop the sound loop.
 	max_loops		(num)					The max amount of loops to run for.
 	direct			(bool)					If true plays directly to provided atoms instead of from them
 */
@@ -68,7 +67,7 @@
 	if(!chance || prob(chance))
 		play(get_sound(starttime))
 	if(!timerid)
-		timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_STOPPABLE | TIMER_LOOP)
+		timerid = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP)
 
 /datum/looping_sound/proc/play(soundfile)
 	var/list/atoms_cache = output_atoms
@@ -84,10 +83,7 @@
 			playsound(thing, S, volume)
 
 /datum/looping_sound/proc/get_sound(starttime, _mid_sounds)
-	if(!_mid_sounds)
-		. = mid_sounds
-	else
-		. = _mid_sounds
+	. = _mid_sounds || mid_sounds
 	while(!isfile(.) && !isnull(.))
 		. = pickweight(.)
 
@@ -96,7 +92,7 @@
 	if(start_sound)
 		play(start_sound)
 		start_wait = start_length
-	addtimer(CALLBACK(src, .proc/sound_loop), start_wait)
+	addtimer(CALLBACK(src, .proc/sound_loop), start_wait, TIMER_CLIENT_TIME)
 
 /datum/looping_sound/proc/on_stop()
 	if(end_sound)

code/datums/martial.dm

@@ -5,6 +5,7 @@
 	var/current_target
 	var/datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary
 	var/deflection_chance = 0 //Chance to deflect projectiles
+	var/reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction?
 	var/block_chance = 0 //Chance to block melee attacks using items while on throw mode.
 	var/restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not
 	var/help_verb

code/datums/martial/krav_maga.dm

@@ -85,14 +85,14 @@
 			return 1
 	return 0
 
-/datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
-	if(D.stat || D.IsKnockdown())
+/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D)
+	if(D.lying || D.IsKnockdown())
 		return 0
 	D.visible_message("<span class='warning'>[A] leg sweeps [D]!</span>", \
 					  	"<span class='userdanger'>[A] leg sweeps you!</span>")
 	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 	D.apply_damage(5, BRUTE)
-	D.Knockdown(40)
+	D.Knockdown(40, override_hardstun = 0.01, 25)
 	log_combat(A, D, "leg sweeped")
 	return 1
 
@@ -191,3 +191,18 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
+
+/obj/item/clothing/gloves/krav_maga/combatglovesplus
+	name = "combat gloves plus"
+	desc = "These tactical gloves are fireproof and shock resistant, and using nanochip technology it teaches you the powers of krav maga."
+	icon_state = "combat"
+	item_state = "blackglovesplus"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.05
+	strip_delay = 80
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	resistance_flags = NONE
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)

code/datums/martial/sleeping_carp.dm

@@ -7,6 +7,7 @@
 /datum/martial_art/the_sleeping_carp
 	name = "The Sleeping Carp"
 	deflection_chance = 100
+	reroute_deflection = TRUE
 	no_guns = TRUE
 	allow_temp_override = FALSE
 	help_verb = /mob/living/carbon/human/proc/sleeping_carp_help
@@ -179,7 +180,7 @@
 
 /obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
 	add_fingerprint(user)
-	if((user.has_trait(TRAIT_CLUMSY)) && prob(50))
+	if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50))
 		to_chat(user, "<span class ='warning'>You club yourself over the head with [src].</span>")
 		user.Knockdown(60)
 		if(ishuman(user))

code/datums/mind.dm

@@ -130,7 +130,8 @@
 			L.update_arousal_hud() //Removes the old icon
 
 /datum/mind/proc/store_memory(new_text)
-	memory += "[new_text]<BR>"
+	if((length(memory) + length(new_text)) <= MAX_MESSAGE_LEN)
+		memory += "[new_text]<BR>"
 
 /datum/mind/proc/wipe_memory()
 	memory = null
@@ -233,13 +234,10 @@
 /datum/mind/proc/remove_antag_equip()
 	var/list/Mob_Contents = current.get_contents()
 	for(var/obj/item/I in Mob_Contents)
-		if(istype(I, /obj/item/pda))
-			var/obj/item/pda/P = I
-			P.lock_code = ""
-
-		else if(istype(I, /obj/item/radio))
-			var/obj/item/radio/R = I
-			R.traitor_frequency = 0
+		var/datum/component/uplink/O = I.GetComponent(/datum/component/uplink)
+//Todo make this reset signal
+		if(O)
+			O.unlock_code = null
 
 /datum/mind/proc/remove_all_antag() //For the Lazy amongst us.
 	remove_changeling()
@@ -304,33 +302,22 @@
 		. = 0
 	else
 		. = uplink_loc
-		uplink_loc.AddComponent(/datum/component/uplink, traitor_mob.key)
-		var/unlock_note
-
-		if(uplink_loc == R)
-			R.traitor_frequency = sanitize_frequency(rand(MIN_FREQ, MAX_FREQ))
-
-			if(!silent)
-				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(R.traitor_frequency)] to unlock its hidden features.")
-			unlock_note = "<B>Radio Frequency:</B> [format_frequency(R.traitor_frequency)] ([R.name])."
-		else if(uplink_loc == PDA)
-			PDA.lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]"
-
-			if(!silent)
-				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.")
-			unlock_note = "<B>Uplink Passcode:</B> [PDA.lock_code] ([PDA.name])."
-
-		else if(uplink_loc == P)
-			P.traitor_unlock_degrees = rand(1, 360)
-
-			if(!silent)
-				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [P.traitor_unlock_degrees] from its starting position to unlock its hidden features.")
-			unlock_note = "<B>Uplink Degrees:</B> [P.traitor_unlock_degrees] ([P.name])."
+		var/datum/component/uplink/U = uplink_loc.AddComponent(/datum/component/uplink, traitor_mob.key)
+		if(!U)
+			CRASH("Uplink creation failed.")
+		U.setup_unlock_code()
+		if(!silent)
+			if(uplink_loc == R)
+				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [R.name]. Simply dial the frequency [format_frequency(U.unlock_code)] to unlock its hidden features.")
+			else if(uplink_loc == PDA)
+				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[U.unlock_code]\" into the ringtone select to unlock its hidden features.")
+			else if(uplink_loc == P)
+				to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [P.name]. Simply twist the top of the pen [U.unlock_code] from its starting position to unlock its hidden features.")
 
 		if(uplink_owner)
-			uplink_owner.antag_memory += unlock_note + "<br>"
+			uplink_owner.antag_memory += U.unlock_note + "<br>"
 		else
-			traitor_mob.mind.store_memory(unlock_note)
+			traitor_mob.mind.store_memory(U.unlock_note)
 
 //Link a new mobs mind to the creator of said mob. They will join any team they are currently on, and will only switch teams when their creator does.
 

code/datums/mood_events/drink_events.dm

@@ -22,3 +22,8 @@
 	description = "<span class='nicegreen'>That drink was amazing!</span>\n"
 	mood_change = 4
 	timeout = 1200
+
+/datum/mood_event/amazingtaste
+	description = "<span class='nicegreen'>Amazing taste!</span>\n"
+	mood_change = 50
+	timeout = 10 MINUTES

code/datums/mood_events/generic_negative_events.dm

@@ -117,6 +117,16 @@
 	description = "<span class='warning'>I'm missing my family heirloom...</span>\n"
 	mood_change = -4
 
+/datum/mood_event/loud_gong
+	description = "<span class='warning'>That loud gong noise really hurt my ears!</span>\n"
+	mood_change = -3
+	timeout = 1200
+
+/datum/mood_event/spooked
+	description = "<span class='warning'>The rattling of those bones...It still haunts me.</span>\n"
+	mood_change = -4
+	timeout = 2400
+
 //These are unused so far but I want to remember them to use them later
 /datum/mood_event/cloned_corpse
 	description = "<span class='boldwarning'>I recently saw my own corpse...</span>\n"
@@ -125,3 +135,11 @@
 /datum/mood_event/surgery
 	description = "<span class='boldwarning'>HE'S CUTTING ME OPEN!!</span>\n"
 	mood_change = -8
+
+/datum/mood_event/sad_empath
+	description = "<span class='warning'>Someone seems upset...</span>\n"
+	mood_change = -2
+	timeout = 600
+
+/datum/mood_event/sad_empath/add_effects(mob/sadtarget)
+	description = "<span class='warning'>[sadtarget.name] seems upset...</span>\n"

code/datums/mood_events/generic_positive_events.dm

@@ -75,3 +75,27 @@
 	description = "<span class='nicegreen'>There is something soothing about this music.</span>\n"
 	mood_change = 3
 	timeout = 600
+
+/datum/mood_event/betterhug
+	description = "<span class='nicegreen'>Someone was very nice to me.</span>\n"
+	mood_change = 3
+	timeout = 3000
+
+/datum/mood_event/betterhug/add_effects(mob/friend)
+	description = "<span class='nicegreen'>[friend.name] was very nice to me.</span>\n"
+
+/datum/mood_event/besthug
+	description = "<span class='nicegreen'>Someone is great to be around, they make me feel so happy!</span>\n"
+	mood_change = 5
+	timeout = 3000
+
+/datum/mood_event/besthug/add_effects(mob/friend)
+	description = "<span class='nicegreen'>[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!</span>\n"
+
+/datum/mood_event/happy_empath
+	description = "<span class='warning'>Someone seems happy!</span>\n"
+	mood_change = 2
+	timeout = 600
+
+/datum/mood_event/happy_empath/add_effects(var/mob/happytarget)
+	description = "<span class='warning'>[happytarget.name]'s happiness is infectious!</span>\n"

code/datums/mutations.dm

@@ -105,13 +105,6 @@ GLOBAL_LIST_EMPTY(mutations_list)
 		return 0
 	return 1
 
-/datum/mutation/human/proc/say_mod(message)
-	if(message)
-		return message
-
-/datum/mutation/human/proc/get_spans()
-	return list()
-
 /mob/living/carbon/proc/update_mutations_overlay()
 	return
 

code/datums/mutations/body.dm

@@ -86,12 +86,12 @@
 /datum/mutation/human/clumsy/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.add_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
+	ADD_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
 
 /datum/mutation/human/clumsy/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.remove_trait(TRAIT_CLUMSY, GENETIC_MUTATION)
+	REMOVE_TRAIT(owner, TRAIT_CLUMSY, GENETIC_MUTATION)
 
 
 //Tourettes causes you to randomly stand in place and shout.
@@ -125,12 +125,12 @@
 /datum/mutation/human/deaf/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.add_trait(TRAIT_DEAF, GENETIC_MUTATION)
+	ADD_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
 
 /datum/mutation/human/deaf/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.remove_trait(TRAIT_DEAF, GENETIC_MUTATION)
+	REMOVE_TRAIT(owner, TRAIT_DEAF, GENETIC_MUTATION)
 
 
 //Monified turns you into a monkey.

code/datums/mutations/cold_resistance.dm

@@ -17,14 +17,14 @@
 /datum/mutation/human/cold_resistance/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.add_trait(TRAIT_RESISTCOLD, "cold_resistance")
-//	owner.add_trait(TRAIT_RESISTLOWPRESSURE, "cold_resistance")  CITADEL CHANGE
+	ADD_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
+//	ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")  CITADEL CHANGE
 
 /datum/mutation/human/cold_resistance/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.remove_trait(TRAIT_RESISTCOLD, "cold_resistance")
-//	owner.remove_trait(TRAIT_RESISTLOWPRESSURE, "cold_resistance")   CITADEL CHANGE
+	REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
+//	REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")   CITADEL CHANGE
 
 /datum/mutation/human/cold_resistance/on_life(mob/living/carbon/human/owner)
 	if(owner.getFireLoss())

code/datums/mutations/hulk.dm

@@ -11,10 +11,11 @@
 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.add_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
-	owner.add_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
+	ADD_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
+	ADD_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
 	owner.update_body_parts()
 	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
 
 /datum/mutation/human/hulk/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity)
 	if(proximity) //no telekinetic hulk attack
@@ -28,12 +29,15 @@
 /datum/mutation/human/hulk/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
-	owner.remove_trait(TRAIT_STUNIMMUNE, TRAIT_HULK)
-	owner.remove_trait(TRAIT_PUSHIMMUNE, TRAIT_HULK)
+	REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK)
+	REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK)
 	owner.update_body_parts()
 	SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk")
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
 
-/datum/mutation/human/hulk/say_mod(message)
+/datum/mutation/human/hulk/proc/handle_speech(original_message, wrapped_message)
+	var/message = wrapped_message[1]
 	if(message)
-		message = "[uppertext(replacetext(message, ".", "!"))]!!"
-	return message
+		message = "[replacetext(message, ".", "!")]!!"
+	wrapped_message[1] = message
+	return COMPONENT_UPPERCASE_SPEECH

code/datums/mutations/speech.dm

@@ -17,9 +17,20 @@
 	text_gain_indication = "<span class='sans'>You feel an off sensation in your voicebox.</span>"
 	text_lose_indication = "<span class='notice'>The off sensation passes.</span>"
 
-/datum/mutation/human/wacky/get_spans()
-	return list(SPAN_SANS)
+/datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
 
+/datum/mutation/human/wacky/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
+
+/datum/mutation/human/wacky/proc/handle_speech(datum/source, list/speech_args)
+	speech_args[SPEECH_SPANS] |= SPAN_SANS
 
 /datum/mutation/human/mute
 	name = "Mute"
@@ -28,14 +39,16 @@
 	text_lose_indication = "<span class='danger'>You feel able to speak freely again.</span>"
 
 /datum/mutation/human/mute/on_acquiring(mob/living/carbon/human/owner)
-	if(..())
+	. = ..()
+	if(.)
 		return
-	owner.add_trait(TRAIT_MUTE, GENETIC_MUTATION)
+	ADD_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
 
 /datum/mutation/human/mute/on_losing(mob/living/carbon/human/owner)
-	if(..())
+	. = ..()
+	if(.)
 		return
-	owner.remove_trait(TRAIT_MUTE, GENETIC_MUTATION)
+	REMOVE_TRAIT(owner, TRAIT_MUTE, GENETIC_MUTATION)
 
 
 /datum/mutation/human/smile
@@ -45,7 +58,20 @@
 	text_gain_indication = "<span class='notice'>You feel so happy. Nothing can be wrong with anything. :)</span>"
 	text_lose_indication = "<span class='notice'>Everything is terrible again. :(</span>"
 
-/datum/mutation/human/smile/say_mod(message)
+/datum/mutation/human/smile/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/mutation/human/smile/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
+
+/datum/mutation/human/smile/proc/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
 	if(message)
 		message = " [message] "
 		//Time for a friendly game of SS13
@@ -92,7 +118,7 @@
 		message = replacetext(message," cunt "," privates ")
 		message = replacetext(message," dick "," jerk ")
 		message = replacetext(message," vagina "," privates ")
-	return trim(message)
+	speech_args[SPEECH_MESSAGE] = trim(message)
 
 
 /datum/mutation/human/unintelligible
@@ -102,30 +128,17 @@
 	text_gain_indication = "<span class='danger'>You can't seem to form any coherent thoughts!</span>"
 	text_lose_indication = "<span class='danger'>Your mind feels more clear.</span>"
 
-/datum/mutation/human/unintelligible/say_mod(message)
-	if(message)
-		var/prefix=copytext(message,1,2)
-		if(prefix == ";")
-			message = copytext(message,2)
-		else if(prefix in list(":","#"))
-			prefix += copytext(message,2,3)
-			message = copytext(message,3)
-		else
-			prefix=""
+/datum/mutation/human/unintelligible/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	ADD_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
 
-		var/list/words = splittext(message," ")
-		var/list/rearranged = list()
-		for(var/i=1;i<=words.len;i++)
-			var/cword = pick(words)
-			words.Remove(cword)
-			var/suffix = copytext(cword,length(cword)-1,length(cword))
-			while(length(cword)>0 && suffix in list(".",",",";","!",":","?"))
-				cword  = copytext(cword,1              ,length(cword)-1)
-				suffix = copytext(cword,length(cword)-1,length(cword)  )
-			if(length(cword))
-				rearranged += cword
-		message ="[prefix][jointext(rearranged," ")]"
-	return message
+/datum/mutation/human/unintelligible/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	REMOVE_TRAIT(owner, TRAIT_UNINTELLIGIBLE_SPEECH, GENETIC_MUTATION)
 
 
 /datum/mutation/human/swedish
@@ -135,7 +148,20 @@
 	text_gain_indication = "<span class='notice'>You feel Swedish, however that works.</span>"
 	text_lose_indication = "<span class='notice'>The feeling of Swedishness passes.</span>"
 
-/datum/mutation/human/swedish/say_mod(message)
+/datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
+
+/datum/mutation/human/swedish/proc/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
 	if(message)
 		message = replacetext(message,"w","v")
 		message = replacetext(message,"j","y")
@@ -144,7 +170,7 @@
 		message = replacetext(message,"o",pick("�","�","o"))
 		if(prob(30))
 			message += " Bork[pick("",", bork",", bork, bork")]!"
-	return message
+		speech_args[SPEECH_MESSAGE] = trim(message)
 
 
 /datum/mutation/human/chav
@@ -154,7 +180,20 @@
 	text_gain_indication = "<span class='notice'>Ye feel like a reet prat like, innit?</span>"
 	text_lose_indication = "<span class='notice'>You no longer feel like being rude and sassy.</span>"
 
-/datum/mutation/human/chav/say_mod(message)
+/datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
+
+/datum/mutation/human/chav/proc/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
 	if(message)
 		message = " [message] "
 		message = replacetext(message," looking at  ","  gawpin' at ")
@@ -178,7 +217,7 @@
 		message = replacetext(message," break "," do ")
 		message = replacetext(message," your "," yer ")
 		message = replacetext(message," security "," coppers ")
-	return trim(message)
+		speech_args[SPEECH_MESSAGE] = trim(message)
 
 
 /datum/mutation/human/elvis
@@ -199,7 +238,20 @@
 			if(prob(15))
 				owner.visible_message("<b>[owner]</b> [pick("jiggles their hips", "rotates their hips", "gyrates their hips", "taps their foot", "dances to an imaginary song", "jiggles their legs", "snaps their fingers")]!")
 
-/datum/mutation/human/elvis/say_mod(message)
+/datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner)
+	. = ..()
+	if(.)
+		return
+	UnregisterSignal(owner, COMSIG_MOB_SAY)
+
+/datum/mutation/human/elvis/proc/handle_speech(datum/source, list/speech_args)
+	var/message = speech_args[SPEECH_MESSAGE]
 	if(message)
 		message = " [message] "
 		message = replacetext(message," i'm not "," I aint ")
@@ -211,7 +263,7 @@
 		message = replacetext(message," yes ",pick(" sure", "yea "))
 		message = replacetext(message," faggot "," square ")
 		message = replacetext(message," muh valids "," getting my kicks ")
-	return trim(message)
+		speech_args[SPEECH_MESSAGE] = trim(message)
 
 
 /datum/mutation/human/stoner
@@ -229,4 +281,4 @@
 /datum/mutation/human/stoner/on_losing(mob/living/carbon/human/owner)
 	..()
 	owner.grant_language(/datum/language/common)
-	owner.remove_language(/datum/language/beachbum)
+	owner.remove_language(/datum/language/beachbum)

code/datums/ruins/space.dm

@@ -281,3 +281,27 @@
 	suffix = "cloning_facility.dmm"
 	name = "Ancient Cloning Lab"
 	description = "An experimental cloning lab snapped off from an ancient ship. The cloner model inside lacks many modern functionalities and security measures."
+
+/datum/map_template/ruin/space/augmentation
+	id = "augmentationfacility"
+	suffix = "augmentationfacility.dmm"
+	name = "Roboticst Augmentation Facility"
+	description = "A mysterious lab in the depths of space containing robotics supplies and a one use autosurgeon."
+
+/datum/map_template/ruin/space/harambe
+	id = "bigape"
+	suffix = "bigape.dmm"
+	name = "Big Ape"
+	description = "A gorilla? Out here? But why."
+
+/datum/map_template/ruin/space/space_arcade
+	id = "arcade"
+	suffix = "arcade.dmm"
+	name = "Space Arcade"
+	description = "A lonely arcade in the depths of space."
+
+/datum/map_template/ruin/space/hermit
+	id = "spacehermit"
+	suffix = "spacehermit.dmm"
+	name = "Space Hermit"
+	description = "A late awakening cryo pod in a crashed escape pod wakes up to find what befell of his fellow survivors. Contains all the necessary resources to actually make it out alive. Good luck."

code/datums/saymode.dm

@@ -27,7 +27,7 @@
 					switch(M.lingcheck())
 						if (LINGHIVE_LING)
 							var/mob/living/L = M
-							if (!L.has_trait(CHANGELING_HIVEMIND_MUTE))
+							if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
 								to_chat(M, msg)
 						if(LINGHIVE_LINK)
 							to_chat(M, msg)
@@ -35,7 +35,7 @@
 							if(prob(40))
 								to_chat(M, "<i><font color=#800080>We can faintly sense an outsider trying to communicate through the hivemind...</font></i>")
 		if(LINGHIVE_LING)
-			if (user.has_trait(CHANGELING_HIVEMIND_MUTE))
+			if (HAS_TRAIT(user, CHANGELING_HIVEMIND_MUTE))
 				to_chat(user, "<span class='warning'>The poison in the air hinders our ability to interact with the hivemind.</span>")
 				return FALSE
 			var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling)
@@ -52,7 +52,7 @@
 							to_chat(M, msg)
 						if(LINGHIVE_LING)
 							var/mob/living/L = M
-							if (!L.has_trait(CHANGELING_HIVEMIND_MUTE))
+							if (!HAS_TRAIT(L, CHANGELING_HIVEMIND_MUTE))
 								to_chat(M, msg)
 						if(LINGHIVE_OUTSIDER)
 							if(prob(40))