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

2020-03-09 16:49:32 +08:00
parent 9b66940807 878947bf7e
commit cccd0e9eef
1093 changed files with 386415 additions and 224664 deletions
@@ -34,6 +34,21 @@
 #define HIJACK_HIJACKER 1 //Needs to be present for shuttle to be hijacked
 #define HIJACK_PREVENT 2 //Prevents hijacking same way as non-antags

+//Syndicate Contracts
+#define CONTRACT_STATUS_INACTIVE 1
+#define CONTRACT_STATUS_ACTIVE 2
+#define CONTRACT_STATUS_BOUNTY_CONSOLE_ACTIVE 3
+#define CONTRACT_STATUS_EXTRACTING 4
+#define CONTRACT_STATUS_COMPLETE 5
+#define CONTRACT_STATUS_ABORTED 6
+
+#define CONTRACT_PAYOUT_LARGE 1
+#define CONTRACT_PAYOUT_MEDIUM 2
+#define CONTRACT_PAYOUT_SMALL 3
+
+#define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS"
+#define CONTRACT_UPLINK_PAGE_HUB "HUB"
+
 //Overthrow time to update heads obj
 #define OBJECTIVE_UPDATING_TIME 300

@@ -39,9 +39,9 @@
 #define COCK_SIZE_MIN		1
 #define COCK_SIZE_MAX		20

-#define COCK_GIRTH_RATIO_MAX		1.25
-#define COCK_GIRTH_RATIO_DEF		0.75
-#define COCK_GIRTH_RATIO_MIN		0.5
+#define COCK_DIAMETER_RATIO_MAX		0.42
+#define COCK_DIAMETER_RATIO_DEF		0.25
+#define COCK_DIAMETER_RATIO_MIN		0.15

 #define KNOT_GIRTH_RATIO_MAX		3
 #define KNOT_GIRTH_RATIO_DEF		2.1
@@ -33,6 +33,10 @@
 #define COMSIG_GLOB_NEW_Z "!new_z"								//from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args)
 #define COMSIG_GLOB_VAR_EDIT "!var_edit"						//called after a successful var edit somewhere in the world: (list/args)
 #define COMSIG_GLOB_LIVING_SAY_SPECIAL "!say_special"			//global living say plug - use sparingly: (mob/speaker , message)
+
+// signals from globally accessible objects
+/// from SSsun when the sun changes position : (azimuth)
+#define COMSIG_SUN_MOVED "sun_moved"
 //////////////////////////////////////////////////////////////////

 // /datum signals
@@ -43,6 +47,10 @@
 #define COMSIG_PARENT_PREQDELETED "parent_preqdeleted"			//before a datum's Destroy() is called: (force), returning a nonzero value will cancel the qdel operation
 #define COMSIG_PARENT_QDELETING "parent_qdeleting"				//just before a datum's Destroy() is called: (force), at this point none of the other components chose to interrupt qdel and Destroy will be called

+/// Trait signals
+#define COMPONENT_ADD_TRAIT (1<<0)
+#define COMPONENT_REMOVE_TRAIT (1<<1)
+
 // /atom signals
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from base of atom/attackby(): (/obj/item, /mob/living, params)
 	#define COMPONENT_NO_AFTERATTACK 1								//Return this in response if you don't want afterattack to be called
@@ -58,6 +66,7 @@
 	#define COMSIG_ATOM_NO_UPDATE_ICON_STATE 1
 	#define COMSIG_ATOM_NO_UPDATE_OVERLAYS		2
 #define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays"		//from base of atom/update_overlays(): (list/new_overlays)
+#define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon"			//from base of atom/update_icon(): (signalOut, did_anything)
 #define COMSIG_ATOM_ENTERED "atom_entered"                      //from base of atom/Entered(): (atom/movable/entering, /atom)
 #define COMSIG_ATOM_EXIT "atom_exit"							//from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc)
 	#define COMPONENT_ATOM_BLOCK_EXIT 1
@@ -203,6 +212,16 @@
 #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"		//sent when a mob/login() finishes: (client)
 #define COMSIG_LIVING_GUN_PROCESS_FIRE "living_gun_process_fire"	//from base of /obj/item/gun/proc/process_fire(): (atom/target, params, zone_override)

+//ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
+#define COMSIG_LIVING_STATUS_STUN "living_stun"					//from base of mob/living/Stun() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"		//from base of mob/living/Knockdown() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_PARALYZE "living_paralyze"			//from base of mob/living/Paralyze() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_IMMOBILIZE "living_immobilize"		//from base of mob/living/Immobilize() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious"	//from base of mob/living/Unconscious() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_SLEEP "living_sleeping"			//from base of mob/living/Sleeping() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_DAZE "living_daze"					//from base of mob/living/Daze() (amount, update, ignore)
+	#define COMPONENT_NO_STUN 1			//For all of them
+
 // /mob/living/carbon signals
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))

@@ -228,6 +247,7 @@
 #define COMSIG_ITEM_PRE_ATTACK "item_pre_attack"				//from base of obj/item/pre_attack(): (atom/target, mob/user, params)
 	#define COMPONENT_NO_ATTACK 1
 #define COMSIG_ITEM_AFTERATTACK "item_afterattack"				//from base of obj/item/afterattack(): (atom/target, mob/user, params)
+#define COMSIG_ITEM_ALT_AFTERATTACK "item_alt_afterattack"		//from base of obj/item/altafterattack(): (atom/target, mob/user, proximity, params)
 #define COMSIG_ITEM_EQUIPPED "item_equip"						//from base of obj/item/equipped(): (/mob/equipper, slot)
 #define COMSIG_ITEM_DROPPED "item_drop"							//from base of obj/item/dropped(): (mob/user)
 #define COMSIG_ITEM_PICKUP "item_pickup"						//from base of obj/item/pickup(): (/mob/taker)
@@ -79,17 +79,19 @@
 #define CAT_BREAD	"Breads"
 #define CAT_BURGER	"Burgers"
 #define CAT_CAKE	"Cakes"
+#define CAT_DONUT	"Donuts"
 #define CAT_EGG	"Egg-Based Food"
 #define CAT_MEAT	"Meats"
+#define CAT_MEXICAN	"Mexican"
 #define CAT_MISCFOOD	"Misc. Food"
 #define CAT_PASTRY	"Pastries"
-#define CAT_PIE	"Pies"
+#define CAT_PIE	"Pies & Sweets"
 #define CAT_PIZZA	"Pizzas"
 #define CAT_SALAD	"Salads"
+#define CAT_SEAFOOD    "Seafood"
 #define CAT_SANDWICH	"Sandwiches"
 #define CAT_SOUP	"Soups"
 #define CAT_SPAGHETTI	"Spaghettis"
-#define CAT_FISH	"Fish"
 #define CAT_ICE	"Frozen"

 #define RCD_FLOORWALL 1
@@ -92,3 +92,30 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 // radiation
 #define RAD_PROTECT_CONTENTS (1<<0)
 #define RAD_NO_CONTAMINATE (1<<1)
+
+//Mob mobility var flags
+/// any flag
+#define CHECK_MOBILITY(target, flags) CHECK_BITFIELD(target.mobility_flags, flags)
+#define CHECK_ALL_MOBILITY(target, flags) CHECK_MULTIPLE_BITFIELDS(target.mobility_flags, flags)
+
+/// can move
+#define MOBILITY_MOVE			(1<<0)
+/// can, and is, standing up.
+#define MOBILITY_STAND			(1<<1)
+/// can pickup items
+#define MOBILITY_PICKUP			(1<<2)
+/// can use items and interact with world objects like opening closets/etc
+#define MOBILITY_USE			(1<<3)
+/// can use interfaces like consoles
+#define MOBILITY_UI				(1<<4)
+/// can use storage item
+#define MOBILITY_STORAGE		(1<<5)
+/// can pull things
+#define MOBILITY_PULL			(1<<6)
+/// can hold non-nodropped items voluntarily
+#define MOBILITY_HOLD			(1<<7)
+/// Can resist out of buckling, grabs, cuffs, etc, in the usual order (buckle --> cuffs --> grab)
+#define MOBILITY_RESIST			(1<<8)
+
+#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL | MOBILITY_RESIST)
+#define MOBILITY_FLAGS_ANY_INTERACTION (MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_UI | MOBILITY_STORAGE)
@@ -23,6 +23,7 @@
 #define DOCTOR			(1<<4)
 #define GENETICIST		(1<<5)
 #define VIROLOGIST		(1<<6)
+#define PARAMEDIC		(1<<7)


 #define CIVILIAN		(1<<2)
@@ -58,32 +59,33 @@
 #define JOB_DISPLAY_ORDER_ASSISTANT 1
 #define JOB_DISPLAY_ORDER_CAPTAIN 2
 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
-#define JOB_DISPLAY_ORDER_BARTENDER 4
-#define JOB_DISPLAY_ORDER_COOK 5
-#define JOB_DISPLAY_ORDER_BOTANIST 6
-#define JOB_DISPLAY_ORDER_JANITOR 7
-#define JOB_DISPLAY_ORDER_CLOWN 8
-#define JOB_DISPLAY_ORDER_MIME 9
-#define JOB_DISPLAY_ORDER_CURATOR 10
-#define JOB_DISPLAY_ORDER_LAWYER 11
-#define JOB_DISPLAY_ORDER_CHAPLAIN 12
-#define JOB_DISPLAY_ORDER_QUARTERMASTER 13
-#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14
-#define JOB_DISPLAY_ORDER_SHAFT_MINER 15
-#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
-#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
-#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
-#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19
-#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
-#define JOB_DISPLAY_ORDER_CHEMIST 21
-#define JOB_DISPLAY_ORDER_GENETICIST 22
-#define JOB_DISPLAY_ORDER_VIROLOGIST 23
-#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
-#define JOB_DISPLAY_ORDER_SCIENTIST 25
-#define JOB_DISPLAY_ORDER_ROBOTICIST 26
-#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
-#define JOB_DISPLAY_ORDER_WARDEN 28
-#define JOB_DISPLAY_ORDER_DETECTIVE 29
-#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
-#define JOB_DISPLAY_ORDER_AI 31
-#define JOB_DISPLAY_ORDER_CYBORG 32
+#define JOB_DISPLAY_ORDER_QUARTERMASTER 4
+#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5
+#define JOB_DISPLAY_ORDER_SHAFT_MINER 6
+#define JOB_DISPLAY_ORDER_BARTENDER 7
+#define JOB_DISPLAY_ORDER_COOK 8
+#define JOB_DISPLAY_ORDER_BOTANIST 9
+#define JOB_DISPLAY_ORDER_JANITOR 10
+#define JOB_DISPLAY_ORDER_CLOWN 11
+#define JOB_DISPLAY_ORDER_MIME 12
+#define JOB_DISPLAY_ORDER_CURATOR 13
+#define JOB_DISPLAY_ORDER_LAWYER 14
+#define JOB_DISPLAY_ORDER_CHAPLAIN 15
+#define JOB_DISPLAY_ORDER_AI 16
+#define JOB_DISPLAY_ORDER_CYBORG 17
+#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18
+#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19
+#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22
+#define JOB_DISPLAY_ORDER_PARAMEDIC 23
+#define JOB_DISPLAY_ORDER_CHEMIST 24
+#define JOB_DISPLAY_ORDER_VIROLOGIST 25
+#define JOB_DISPLAY_ORDER_GENETICIST 26
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
+#define JOB_DISPLAY_ORDER_SCIENTIST 28
+#define JOB_DISPLAY_ORDER_ROBOTICIST 29
+#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
+#define JOB_DISPLAY_ORDER_WARDEN 31
+#define JOB_DISPLAY_ORDER_DETECTIVE 32
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33
@@ -41,7 +41,7 @@
 //Individual logging panel pages
 #define INDIVIDUAL_ATTACK_LOG		(LOG_ATTACK)
 #define INDIVIDUAL_SAY_LOG			(LOG_SAY | LOG_WHISPER | LOG_DSAY)
-#define INDIVIDUAL_EMOTE_LOG		(LOG_EMOTE)
+#define INDIVIDUAL_EMOTE_LOG		(LOG_EMOTE | LOG_SUBTLER)
 #define INDIVIDUAL_COMMS_LOG		(LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS)
 #define INDIVIDUAL_OOC_LOG			(LOG_OOC | LOG_ADMIN)
 #define INDIVIDUAL_OWNERSHIP_LOG	(LOG_OWNERSHIP)
@@ -4,11 +4,8 @@
 /// Hard materials, such as iron or metal
 #define MAT_CATEGORY_RIGID "rigid material"

-
-/// Gets the reference for the material type that was given
-#define getmaterialref(A) (SSmaterials.materials[A] || A)
-
 /// Flag for atoms, this flag ensures it isn't re-colored by materials. Useful for snowflake icons such as default toolboxes.
 #define MATERIAL_COLOR (1<<0)
 #define MATERIAL_ADD_PREFIX (1<<1)
 #define MATERIAL_NO_EFFECTS (1<<2)
+#define MATERIAL_AFFECT_STATISTICS (1<<3)
@@ -407,6 +407,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define DUMMY_HUMAN_SLOT_ADMIN "admintools"
 #define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
 #define DUMMY_HUMAN_SLOT_HALLUCINATION "dummy_hallucination"
+#define DUMMY_HUMAN_SLOT_EXAMINER "dummy_examiner"

 #define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
 									//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
@@ -521,3 +522,5 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define NIGHTSHIFT_AREA_RECREATION			2		//dorms common areas, etc
 #define NIGHTSHIFT_AREA_DEPARTMENT_HALLS	3		//interior hallways, etc
 #define NIGHTSHIFT_AREA_NONE				4		//default/highest.
+
+#define UNTIL(X) while(!(X)) stoplag()
@@ -58,8 +58,10 @@
 #define BODYPART_DISABLED_DAMAGE 1
 #define BODYPART_DISABLED_PARALYSIS 2

+#define DEFAULT_BODYPART_ICON 'icons/mob/human_parts.dmi'
 #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi'
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
+#define DEFAULT_BODYPART_ICON_CITADEL 'modular_citadel/icons/mob/mutant_bodyparts.dmi'

 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
@@ -17,6 +17,9 @@
 //ids

 #define MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED			"MOB_WALK_RUN"
+#define MOVESPEED_ID_MOB_GRAB_STATE						"MOB_GRAB_STATE"
+#define MOVESPEED_ID_MOB_EQUIPMENT						"MOB_EQUIPMENT"
+#define MOVESPEED_ID_MOB_GRAVITY						"MOB_GRAVITY"
 #define MOVESPEED_ID_CONFIG_SPEEDMOD					"MOB_CONFIG_MODIFIER"

 #define MOVESPEED_ID_SLIME_REAGENTMOD					"SLIME_REAGENT_MODIFIER"
@@ -28,6 +31,7 @@
 #define MOVESPEED_ID_TARANTULA_WEB						"TARANTULA_WEB"

 #define MOVESPEED_ID_LIVING_TURF_SPEEDMOD				"LIVING_TURF_SPEEDMOD"
+#define MOVESPEED_ID_LIVING_LIMBLESS					"LIVING_LIMBLESS"

 #define MOVESPEED_ID_CARBON_SOFTCRIT					"CARBON_SOFTCRIT"
 #define MOVESPEED_ID_CARBON_OLDSPEED					"CARBON_DEPRECATED_SPEED"
@@ -59,13 +63,19 @@
 #define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
 #define MOVESPEED_ID_SHRINK_RAY							"SHRUNKEN_SPEED_MODIFIER"

-#define MOVESPEED_ID_TASED_STATUS						"TASED"
-
 #define MOVESPEED_ID_SLAUGHTER                          "SLAUGHTER"

 #define MOVESPEED_ID_CYBER_THRUSTER						"CYBER_IMPLANT_THRUSTER"
 #define MOVESPEED_ID_JETPACK							"JETPACK"

-#define MOVESPEED_ID_SHOVE 								"SHOVE"
+#define MOVESPEED_ID_MKULTRA							"MKULTRA"

-#define MOVESPEED_ID_MKULTRA							"MKULTRA"
+#define MOVESPEED_ID_TASED_STATUS						"TASED"
+#define MOVESPEED_ID_ELECTROSTAFF						"ELECTROSTAFF"
+
+#define MOVESPEED_ID_SHOVE 								"SHOVE"
+#define MOVESPEED_ID_FAT                                "FAT"
+#define MOVESPEED_ID_COLD                               "COLD"
+#define MOVESPEED_ID_HUNGRY                             "HUNGRY"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN                    "DAMAGE"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING				"FLYING"
@@ -0,0 +1,3 @@
+#define SOLAR_TRACK_OFF 0
+#define SOLAR_TRACK_TIMED 1
+#define SOLAR_TRACK_AUTO 2
@@ -23,6 +23,10 @@ Ask ninjanomnom if they're around

 #define RAD_MOB_MUTATE 1250							// How much stored radiation to check for mutation

+#define RAD_MONKEY_GORILLIZE 1650					// How much stored radiation to check for Harambe time.
+#define RAD_MOB_GORILLIZE_FACTOR 100
+#define RAD_MONKEY_GORILLIZE_EXPONENT 0.5
+
 #define RAD_MOB_VOMIT 2000							// The amount of radiation to check for vomitting
 #define RAD_MOB_VOMIT_PROB 1						// Chance per tick of vomitting

@@ -37,10 +37,17 @@
 /////////////
 // DEBUFFS //
 /////////////
+/// The affected is unable to move, or to use, hold, or pickup items.
+#define STATUS_EFFECT_STUN /datum/status_effect/incapacitating/stun

-#define STATUS_EFFECT_STUN /datum/status_effect/incapacitating/stun //the affected is stunned
+#define STATUS_EFFECT_KNOCKDOWN /datum/status_effect/incapacitating/knockdown //the affected is unable to stand up

-#define STATUS_EFFECT_KNOCKDOWN /datum/status_effect/incapacitating/knockdown //the affected is knocked down
+#define STATUS_EFFECT_IMMOBILIZED /datum/status_effect/incapacitating/immobilized //the affected is unable to move
+
+#define STATUS_EFFECT_PARALYZED /datum/status_effect/incapacitating/paralyzed //the affected is unable to move, use items, or stand up.
+
+/// The affected is unable to use or pickup items
+#define STATUS_EFFECT_DAZED /datum/status_effect/incapacitating/dazed

 #define STATUS_EFFECT_UNCONSCIOUS /datum/status_effect/incapacitating/unconscious //the affected is unconscious

@@ -90,6 +97,9 @@

 #define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
 #define STATUS_EFFECT_MESMERIZE /datum/status_effect/no_combat_mode/mesmerize //Just reskinned no_combat_mode
+
+#define STATUS_EFFECT_ELECTROSTAFF /datum/status_effect/electrostaff		//slows down victim
+
 /////////////
 // NEUTRAL //
 /////////////
@@ -56,7 +56,6 @@
 #define INIT_ORDER_SERVER_MAINT		93
 #define INIT_ORDER_INPUT			85
 #define INIT_ORDER_VIS				80
-#define INIT_ORDER_MATERIALS		76
 #define INIT_ORDER_RESEARCH			75
 #define INIT_ORDER_EVENTS			70
 #define INIT_ORDER_JOBS				65
@@ -1,3 +1,5 @@
+#define SIGNAL_TRAIT(trait_ref) "trait [trait_ref]"
+
 // trait accessor defines
 #define ADD_TRAIT(target, trait, source) \
 	do { \
@@ -6,12 +8,14 @@
 			target.status_traits = list(); \
 			_L = target.status_traits; \
 			_L[trait] = list(source); \
+			SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_ADD_TRAIT); \
 		} else { \
 			_L = target.status_traits; \
 			if (_L[trait]) { \
 				_L[trait] |= list(source); \
 			} else { \
 				_L[trait] = list(source); \
+				SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_ADD_TRAIT); \
 			} \
 		} \
 	} while (0)
@@ -31,7 +35,8 @@
 				} \
 			};\
 			if (!length(_L[trait])) { \
-				_L -= trait \
+				_L -= trait; \
+				SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_REMOVE_TRAIT); \
 			}; \
 			if (!length(_L)) { \
 				target.status_traits = null \
@@ -46,7 +51,8 @@
 			for (var/_T in _L) { \
 				_L[_T] &= _S;\
 				if (!length(_L[_T])) { \
-					_L -= _T } \
+					_L -= _T ; \
+					SEND_SIGNAL(target, SIGNAL_TRAIT(_T), COMPONENT_REMOVE_TRAIT); } \
 				};\
 				if (!length(_L)) { \
 					target.status_traits = null\
@@ -137,6 +143,19 @@
 #define TRAIT_NOMARROW			"nomarrow"		// You don't make blood, with chemicals or nanites.
 #define TRAIT_NOPULSE			"nopulse"		// Your heart doesn't beat.
 #define TRAIT_EXEMPT_HEALTH_EVENTS	"exempt-health-events"
+
+// mobility flag traits
+// IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
+// BUT FOR NOW, THESE ARE HOOKED TO DO update_mobility() VIA COMSIG IN living_mobility.dm
+// SO IF YOU ADD MORE, BESURE TO UPDATE IT THERE.
+
+/// Disallow movement
+#define TRAIT_MOBILITY_NOMOVE		"mobility_nomove"
+/// Disallow pickup
+#define TRAIT_MOBILITY_NOPICKUP		"mobility_nopickup"
+/// Disallow item use
+#define TRAIT_MOBILITY_NOUSE		"mobility_nouse"
+
 #define TRAIT_SWIMMING			"swimming"			//only applied by /datum/element/swimming, for checking

 //non-mob traits
@@ -115,7 +115,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)

 	var/new_flavor = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", flavor_text, MAX_FAVOR_LEN, TRUE)
 	if(!isnull(new_flavor))
-		flavor_text = new_flavor
+		flavor_text = html_decode(new_flavor)
 		to_chat(src, "Your flavor text has been updated.")

 //Flavor Text
@@ -126,10 +126,10 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)

 	var/new_flavor = stripped_multiline_input(usr, "Set the temporary flavor text in your 'examine' verb. This should be used only for things pertaining to the current round!", "Short-Term Flavor Text", flavor_text_2, MAX_FAVOR_LEN, TRUE)
 	if(!isnull(new_flavor))
-		flavor_text_2 = new_flavor
+		flavor_text_2 = html_decode(new_flavor)
 		to_chat(src, "Your temporary flavor text has been updated.")

-/mob/proc/print_flavor_text(flavor)
+/mob/proc/print_flavor_text(flavor,temp = FALSE)
 	if(!flavor)
 		return
 	// We are decoding and then encoding to not only get correct amount of characters, but also to prevent partial escaping characters being shown.
@@ -137,7 +137,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	if(length_char(msg) <= 40)
 		return "<span class='notice'>[html_encode(msg)]</span>"
 	else
-		return "<span class='notice'>[html_encode(copytext_char(msg, 1, 37))]... <a href='?src=[REF(src)];flavor_more=1'>More...</span></a>"
+		return "<span class='notice'>[html_encode(copytext_char(msg, 1, 37))]... <a href='?src=[REF(src)];flavor[temp ? "2" : ""]_more=1'>More...</span></a>"

 //LOOC toggles
 /client/verb/listen_looc()
@@ -174,6 +174,15 @@
 						L[T] = TRUE
 		return L

+/proc/typecacheof_assoc_list(list/pathlist, ignore_root_path = FALSE)
+	. = list()
+	if(!istype(pathlist))
+		return
+	for(var/P in pathlist)
+		var/value = pathlist[P]
+		for(var/T in (ignore_root_path ? subtypesof(P) : typesof(P)))
+			.[T] = value
+
 //Empties the list by setting the length to 0. Hopefully the elements get garbage collected
 /proc/clearlist(list/list)
 	if(istype(list))
@@ -579,4 +588,4 @@
 	var/list/ret = list()
 	for(var/key in input)
 		ret += key
-	return ret
+	return ret
@@ -1,5 +1,10 @@
 #define BP_MAX_ROOM_SIZE 300

+GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/engineering, \
+															    /area/engine/supermatter, \
+															    /area/engine/atmospherics_engine, \
+															    /area/ai_monitored/turret_protected/ai))
+
 //Repopulates sortedAreas list
 /proc/repopulate_sorted_areas()
 	GLOB.sortedAreas = list()
@@ -549,3 +549,36 @@
 	var/pressure = environment.return_pressure()
 	if(pressure <= LAVALAND_EQUIPMENT_EFFECT_PRESSURE)
 		. = TRUE
+
+/proc/ispipewire(item)
+	var/static/list/pipe_wire = list(
+		/obj/machinery/atmospherics,
+		/obj/structure/disposalpipe,
+		/obj/structure/cable
+	)
+	return (is_type_in_list(item, pipe_wire))
+
+// Find a obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type.
+/proc/find_obstruction_free_location(var/range, var/atom/center, var/area/specific_area)
+	var/list/turfs = RANGE_TURFS(range, center)
+	var/list/possible_loc = list()
+	for(var/turf/found_turf in turfs)
+		var/area/turf_area = get_area(found_turf)
+		if(specific_area)	// We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions.
+			if(!istype(turf_area, specific_area))
+				continue
+		if(!isspaceturf(found_turf))
+			if(!is_blocked_turf(found_turf))
+				possible_loc.Add(found_turf)
+	if(possible_loc.len < 1)	// Need at least one free location.
+		return FALSE
+	return pick(possible_loc)
+
+/proc/power_fail(duration_min, duration_max)
+	for(var/P in GLOB.apcs_list)
+		var/obj/machinery/power/apc/C = P
+		if(C.cell && SSmapping.level_trait(C.z, ZTRAIT_STATION))
+			var/area/A = C.area
+			if(GLOB.typecache_powerfailure_safe_areas[A.type])
+				continue
+			C.energy_fail(rand(duration_min,duration_max))
@@ -93,6 +93,8 @@

 	init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)

+	INVOKE_ASYNC(GLOBAL_PROC, /proc/init_ref_coin_values) //so the current procedure doesn't sleep because of UNTIL()
+
 //creates every subtype of prototype (excluding prototype) and adds it to list L.
 //if no list/L is provided, one is created.
 /proc/init_subtypes(prototype, list/L)
@@ -110,3 +112,10 @@
 		for(var/path in subtypesof(prototype))
 			L+= path
 		return L
+
+/proc/init_ref_coin_values()
+	for(var/path in typesof(/obj/item/coin))
+		var/obj/item/coin/C = new path
+		UNTIL(C.flags_1 & INITIALIZED_1) //we want to make sure the value is calculated and not null.
+		GLOB.coin_values[path] = C.value
+		qdel(C)
@@ -47,7 +47,7 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
 	return pick(GLOB.socks_list)

-/proc/random_features()
+/proc/random_features(intendedspecies)
 	if(!GLOB.tails_list_human.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, GLOB.tails_list_human)
 	if(!GLOB.tails_list_lizard.len)
@@ -105,6 +105,8 @@
 		var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[mtpath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_mam_tails_list[S.name] = mtpath
 	var/list/snowflake_markings_list = list()
@@ -112,6 +114,8 @@
 		var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[mmpath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_markings_list[S.name] = mmpath
 	var/list/snowflake_ears_list = list()
@@ -119,6 +123,8 @@
 		var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[mepath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_ears_list[S.name] = mepath
 	var/list/snowflake_mam_snouts_list = list()
@@ -126,8 +132,19 @@
 		var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[mspath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_mam_snouts_list[S.name] = mspath
+	var/list/snowflake_ipc_antenna_list = list()
+	for(var/mspath in GLOB.ipc_antennas_list)
+		var/datum/sprite_accessory/mam_snouts/instance = GLOB.ipc_antennas_list[mspath]
+		if(istype(instance, /datum/sprite_accessory))
+			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
+			if(!S.ckeys_allowed)
+				snowflake_ipc_antenna_list[S.name] = mspath
 	var/color1 = random_short_color()
 	var/color2 = random_short_color()
 	var/color3 = random_short_color()
@@ -153,10 +170,10 @@
 		"insect_fluff"		= "None",
 		"insect_markings"     = pick(GLOB.insect_markings_list),
 		"taur"				= "None",
-		"mam_body_markings" = pick(snowflake_markings_list),
-		"mam_ears" 			= pick(snowflake_ears_list),
-		"mam_snouts"		= pick(snowflake_mam_snouts_list),
-		"mam_tail"			= pick(snowflake_mam_tails_list),
+		"mam_body_markings" = snowflake_markings_list.len ? pick(snowflake_markings_list) : "None",
+		"mam_ears" 			= snowflake_ears_list ? pick(snowflake_ears_list) : "None",
+		"mam_snouts"		= snowflake_mam_snouts_list ? pick(snowflake_mam_snouts_list) : "None",
+		"mam_tail"			= snowflake_mam_tails_list ? pick(snowflake_mam_tails_list) : "None",
 		"mam_tail_animated" = "None",
 		"xenodorsal" 		= "Standard",
 		"xenohead" 			= "Standard",
@@ -165,7 +182,7 @@
 		"has_cock"			= FALSE,
 		"cock_shape"		= pick(GLOB.cock_shapes_list),
 		"cock_length"		= 6,
-		"cock_girth_ratio"	= COCK_GIRTH_RATIO_DEF,
+		"cock_diameter_ratio"	= COCK_DIAMETER_RATIO_DEF,
 		"cock_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"has_sheath"		= FALSE,
 		"sheath_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
@@ -204,7 +221,7 @@
 		"womb_cum_rate"		= CUM_RATE,
 		"womb_cum_mult"		= CUM_RATE_MULT,
 		"womb_efficiency"	= CUM_EFFICIENCY,
-		"ipc_screen"		= "Sunburst",
+		"ipc_screen"		= snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
 		"ipc_antenna"		= "None",
 		"flavor_text"		= "",
 		"meat_type"			= "Mammalian"
@@ -356,7 +373,7 @@ GLOBAL_LIST_EMPTY(species_list)
 		checked_health["health"] = health
 	return ..()

-/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null)
+/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null, required_mobility_flags = (MOBILITY_USE|MOBILITY_MOVE))
 	if(!user)
 		return 0
 	var/atom/Tloc = null
@@ -384,6 +401,7 @@ GLOBAL_LIST_EMPTY(species_list)
 	var/endtime = world.time + delay
 	var/starttime = world.time
 	. = 1
+	var/mob/living/L = isliving(user) && user			//evals to last thing eval'd
 	while (world.time < endtime)
 		stoplag(1)
 		if (progress)
@@ -393,15 +411,13 @@ GLOBAL_LIST_EMPTY(species_list)
 			drifting = 0
 			Uloc = user.loc

-		if(QDELETED(user) || user.stat || user.IsKnockdown() || user.IsStun() || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
+		if(L && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
 			. = 0
 			break

-		if(isliving(user))
-			var/mob/living/L = user
-			if(L.recoveringstam)
-				. = 0
-				break
+		if(QDELETED(user) || user.stat || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
+			. = 0
+			break

 		if(!QDELETED(Tloc) && (QDELETED(target) || Tloc != target.loc))
 			if((Uloc != Tloc || Tloc != user) && !drifting)
@@ -354,6 +354,7 @@
 	roundend_report.set_content(content)
 	roundend_report.stylesheets = list()
 	roundend_report.add_stylesheet("roundend", 'html/browser/roundend.css')
+	roundend_report.add_stylesheet("font-awesome", 'html/font-awesome/css/all.min.css')
 	roundend_report.open(0)

 /datum/controller/subsystem/ticker/proc/personal_report(client/C, popcount)
@@ -49,7 +49,7 @@
 		alert("Invalid name.")
 		return ""
 	return sanitize(t)
-	
+
 /proc/sanitize_filename(t)
 	return sanitize_simple(t, list("\n"="", "\t"="", "/"="", "\\"="", "?"="", "%"="", "*"="", ":"="", "|"="", "\""="", "<"="", ">"=""))

@@ -798,3 +798,17 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
 		out += prob(replaceprob)? pick(replacementchars) : char
 	return out.Join("")

+/proc/readable_corrupted_text(text)
+	var/list/corruption_options = list("..", "£%", "~~\"", "!!", "*", "^", "$!", "-", "}", "?")
+	var/corrupted_text = ""
+	for(var/letter_index = 1; letter_index <= length(text); letter_index++)	// Have every letter have a chance of creating corruption on either side
+		var/letter = text[letter_index]	// Small chance of letters being removed in place of corruption - still overall readable
+		if(prob(15))
+			corrupted_text += pick(corruption_options)
+		if(prob(95))
+			corrupted_text += letter
+		else
+			corrupted_text += pick(corruption_options)
+	if(prob(15))
+		corrupted_text += pick(corruption_options)
+	return corrupted_text
@@ -1,111 +0,0 @@
-/*
-// Contains VOREStation based vore description type2type functions
-// list2text - takes delimiter and returns text
-// text2list - takes delimiter, and creates list
-//
-*/
-
-// Concatenates a list of strings into a single string.  A seperator may optionally be provided.
-/proc/list2text(list/ls, sep)
-	if (ls.len <= 1) // Early-out code for empty or singleton lists.
-		return ls.len ? ls[1] : ""
-
-	var/l = ls.len // Made local for sanic speed.
-	var/i = 0      // Incremented every time a list index is accessed.
-
-	if (sep <> null)
-		// Macros expand to long argument lists like so: sep, ls[++i], sep, ls[++i], sep, ls[++i], etc...
-		#define S1  sep, ls[++i]
-		#define S4  S1,  S1,  S1,  S1
-		#define S16 S4,  S4,  S4,  S4
-		#define S64 S16, S16, S16, S16
-
-		. = "[ls[++i]]" // Make sure the initial element is converted to text.
-
-		// Having the small concatenations come before the large ones boosted speed by an average of at least 5%.
-		if (l-1 & 0x01) // 'i' will always be 1 here.
-			. = text("[][][]", ., S1) // Append 1 element if the remaining elements are not a multiple of 2.
-		if (l-i & 0x02)
-			. = text("[][][][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
-		if (l-i & 0x04)
-			. = text("[][][][][][][][][]", ., S4) // And so on....
-		if (l-i & 0x08)
-			. = text("[][][][][][][][][][][][][][][][][]", ., S4, S4)
-		if (l-i & 0x10)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16)
-		if (l-i & 0x20)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
-		if (l-i & 0x40)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
-		while (l > i) // Chomp through the rest of the list, 128 elements at a time.
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
-
-		#undef S64
-		#undef S16
-		#undef S4
-		#undef S1
-	else
-		// Macros expand to long argument lists like so: ls[++i], ls[++i], ls[++i], etc...
-		#define S1  ls[++i]
-		#define S4  S1,  S1,  S1,  S1
-		#define S16 S4,  S4,  S4,  S4
-		#define S64 S16, S16, S16, S16
-
-		. = "[ls[++i]]" // Make sure the initial element is converted to text.
-
-		if (l-1 & 0x01) // 'i' will always be 1 here.
-			. += S1 // Append 1 element if the remaining elements are not a multiple of 2.
-		if (l-i & 0x02)
-			. = text("[][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
-		if (l-i & 0x04)
-			. = text("[][][][][]", ., S4) // And so on...
-		if (l-i & 0x08)
-			. = text("[][][][][][][][][]", ., S4, S4)
-		if (l-i & 0x10)
-			. = text("[][][][][][][][][][][][][][][][][]", ., S16)
-		if (l-i & 0x20)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
-		if (l-i & 0x40)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
-		while (l > i) // Chomp through the rest of the list, 128 elements at a time.
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
-
-		#undef S64
-		#undef S16
-		#undef S4
-		#undef S1
-
-// Converts a string into a list by splitting the string at each delimiter found. (discarding the seperator)
-/proc/text2list(text, delimiter="\n")
-	var/delim_len = length(delimiter)
-	if (delim_len < 1)
-		return list(text)
-
-	. = list()
-	var/last_found = 1
-	var/found
-
-	do
-		found       = findtext(text, delimiter, last_found, 0)
-		.          += copytext(text, last_found, found)
-		last_found  = found + delim_len
-	while (found)
-
-// Returns true if val is from min to max, inclusive.
-/proc/IsInRange(val, min, max)
-	return (val >= min) && (val <= max)
@@ -1234,8 +1234,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 				return FALSE
 	return TRUE

-#define UNTIL(X) while(!(X)) stoplag()
-
 /proc/pass()
 	return

@@ -1,39 +0,0 @@
-
-
-/datum/projectile_data
-	var/src_x
-	var/src_y
-	var/time
-	var/distance
-	var/power_x
-	var/power_y
-	var/dest_x
-	var/dest_y
-
-/datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \
-							var/power_x, var/power_y, var/dest_x, var/dest_y)
-	src.src_x = src_x
-	src.src_y = src_y
-	src.time = time
-	src.distance = distance
-	src.power_x = power_x
-	src.power_y = power_y
-	src.dest_x = dest_x
-	src.dest_y = dest_y
-
-/proc/projectile_trajectory(src_x, src_y, rotation, angle, power)
-
-	// returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle],
-	// rotated at [rotation] and with the power of [power]
-	// Thanks to VistaPOWA for this function
-
-	var/power_x = power * cos(angle)
-	var/power_y = power * sin(angle)
-	var/time = 2* power_y / 10 //10 = g
-
-	var/distance = time * power_x
-
-	var/dest_x = src_x + distance*sin(rotation);
-	var/dest_y = src_y + distance*cos(rotation);
-
-	return new /datum/projectile_data(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y)
@@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"CAN_MASTURBATE_WITH" = CAN_MASTURBATE_WITH,
 		"MASTURBATE_LINKED_ORGAN" = MASTURBATE_LINKED_ORGAN,
 		"CAN_CLIMAX_WITH" = CAN_CLIMAX_WITH
-		
+
 	),
 	"mob_biotypes" = list (
 		"MOB_ORGANIC" = MOB_ORGANIC,
@@ -227,5 +227,16 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"MOB_EPIC" = MOB_EPIC,
 		"MOB_REPTILE" = MOB_REPTILE,
 		"MOB_SPIRIT" = MOB_SPIRIT
+	),
+	"mobility_flags" = list(
+		"MOBILITY_MOVE" = MOBILITY_MOVE,
+		"MOBILITY_STAND" = MOBILITY_STAND,
+		"MOBILITY_PICKUP" = MOBILITY_PICKUP,
+		"MOBILITY_USE" = MOBILITY_USE,
+		"MOBILITY_UI" = MOBILITY_UI,
+		"MOBILITY_STORAGE" = MOBILITY_STORAGE,
+		"MOBILITY_PULL" = MOBILITY_PULL,
+		"MOBILITY_HOLD" = MOBILITY_HOLD,
+		"MOBILITY_RESIST" = MOBILITY_RESIST
 	)
 	))
@@ -32,6 +32,7 @@ GLOBAL_LIST_EMPTY(meteor_list)				// List of all meteors.
 GLOBAL_LIST_EMPTY(active_jammers)             // List of active radio jammers
 GLOBAL_LIST_EMPTY(ladders)
 GLOBAL_LIST_EMPTY(trophy_cases)
+GLOBAL_LIST_EMPTY(coin_values)

 GLOBAL_LIST_EMPTY(wire_color_directory)
 GLOBAL_LIST_EMPTY(wire_name_directory)
@@ -18,6 +18,7 @@
 #define POLL_IGNORE_DEMON "demon"
 #define POLL_IGNORE_WIZARD "wizard"
 #define POLL_IGNORE_CLONE "clone"
+#define POLL_IGNORE_CONTRACTOR_SUPPORT "contractor_support"

 GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SENTIENCE_POTION = "Sentience potion",
@@ -37,7 +38,8 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SPLITPERSONALITY = "Split Personality",
 	POLL_IGNORE_DEMON = "Demons",
 	POLL_IGNORE_WIZARD = "Wizards",
-	POLL_IGNORE_CLONE = "Defective/SDGF clones"
+	POLL_IGNORE_CLONE = "Defective/SDGF clones",
+	POLL_IGNORE_CONTRACTOR_SUPPORT = "Contractor Support Unit"
 ))
 GLOBAL_LIST_INIT(poll_ignore, init_poll_ignore())

@@ -14,7 +14,7 @@
 	if(check_click_intercept(params,A))
 		return

-	if(stat || lockcharge || IsKnockdown() || IsStun() || IsUnconscious())
+	if(stat || locked_down || IsParalyzed() || IsStun() || IsUnconscious())
 		return

 	var/list/modifiers = params2list(params)
@@ -66,7 +66,7 @@
 				if(C.user_unbuckle_mob(C.buckled_mobs[1],src))
 					return

-	if(!W && get_dist(src,A) <= interaction_range)
+	if(!W && (get_dist(src,A) <= interaction_range))
 		A.attack_robot(src)
 		return

@@ -72,6 +72,22 @@
 	var/hide_icon = 'icons/mob/actions.dmi'
 	var/hide_state = "hide"
 	var/show_state = "show"
+	var/mutable_appearance/hide_appearance
+	var/mutable_appearance/show_appearance
+
+/obj/screen/movable/action_button/hide_toggle/Initialize()
+	. = ..()
+	var/static/list/icon_cache = list()
+
+	var/cache_key = "[hide_icon][hide_state]"
+	hide_appearance = icon_cache[cache_key]
+	if(!hide_appearance)
+		hide_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, hide_state)
+
+	cache_key = "[hide_icon][show_state]"
+	show_appearance = icon_cache[cache_key]
+	if(!show_appearance)
+		show_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, show_state)

 /obj/screen/movable/action_button/hide_toggle/Click(location,control,params)
 	if (!can_use(usr))
@@ -137,9 +153,12 @@
 	show_state = settings["toggle_show"]
 	update_icon()

-/obj/screen/movable/action_button/hide_toggle/update_icon()
-	cut_overlays()
-	add_overlay(mutable_appearance(hide_icon, hidden ? show_state : hide_state))
+/obj/screen/movable/action_button/hide_toggle/update_overlays()
+	. = ..()
+	if(hidden)
+		. += show_appearance
+	else
+		. += hide_appearance


 /obj/screen/movable/action_button/MouseEntered(location,control,params)
@@ -273,7 +273,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	if(!istype(L) || !L.can_resist())
 		return
 	L.changeNext_move(CLICK_CD_RESIST)
-	if(L.canmove)
+	if(CHECK_MOBILITY(L, MOBILITY_MOVE))
 		return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt.


@@ -601,7 +601,7 @@ so as to remain in compliance with the most up-to-date laws."
 	if(!istype(L) || !L.can_resist())
 		return
 	L.changeNext_move(CLICK_CD_RESIST)
-	if((L.canmove) && (L.last_special <= world.time))
+	if(CHECK_MOBILITY(L, MOBILITY_MOVE) && (L.last_special <= world.time))
 		return L.resist_restraints()

 /obj/screen/alert/restrained/buckled/Click()
@@ -166,29 +166,27 @@
 	var/static/mutable_appearance/blocked_overlay = mutable_appearance('icons/mob/screen_gen.dmi', "blocked")
 	var/held_index = 0

-/obj/screen/inventory/hand/update_icon()
+/obj/screen/inventory/hand/update_overlays()
 	. = ..()

 	if(!handcuff_overlay)
 		var/state = (!(held_index % 2)) ? "markus" : "gabrielle"
 		handcuff_overlay = mutable_appearance('icons/mob/screen_gen.dmi', state)

-	cut_overlay(list(handcuff_overlay, blocked_overlay, "hand_active"))
-
 	if(!hud?.mymob)
 		return

 	if(iscarbon(hud.mymob))
 		var/mob/living/carbon/C = hud.mymob
 		if(C.handcuffed)
-			add_overlay(handcuff_overlay)
+			. += handcuff_overlay

 		if(held_index)
 			if(!C.has_hand_for_held_index(held_index))
-				add_overlay(blocked_overlay)
+				. += blocked_overlay

 	if(held_index == hud.mymob.active_hand_index)
-		add_overlay("hand_active")
+		. += "hand_active"


 /obj/screen/inventory/hand/Click(location, control, params)
@@ -113,7 +113,7 @@
 		var/mob/living/carbon/tempcarb = user
 		if(!tempcarb.combatmode)
 			totitemdamage *= 0.5
-	if(user.resting)
+	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		totitemdamage *= 0.5
 	//CIT CHANGES END HERE
 	if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
@@ -76,8 +76,8 @@
 	layer = ABOVE_HUD_LAYER
 	plane = ABOVE_HUD_PLANE

-	var/atom/movable/focus = null
-	var/mob/living/carbon/tk_user = null
+	var/atom/movable/focus
+	var/mob/living/carbon/tk_user

 /obj/item/tk_grab/Initialize()
 	. = ..()
@@ -85,6 +85,8 @@

 /obj/item/tk_grab/Destroy()
 	STOP_PROCESSING(SSfastprocess, src)
+	focus = null
+	tk_user = null
 	return ..()

 /obj/item/tk_grab/process()
@@ -179,16 +181,14 @@
 		return
 	new /obj/effect/temp_visual/telekinesis(get_turf(focus))

-/obj/item/tk_grab/update_icon()
-	cut_overlays()
-	if(focus)
-		var/old_layer = focus.layer
-		var/old_plane = focus.plane
-		focus.layer = layer+0.01
-		focus.plane = ABOVE_HUD_PLANE
-		add_overlay(focus) //this is kind of ick, but it's better than using icon()
-		focus.layer = old_layer
-		focus.plane = old_plane
+/obj/item/tk_grab/update_overlays()
+	. = ..()
+	if(!focus)
+		return
+	var/mutable_appearance/focus_overlay = new(focus)
+	focus_overlay.layer = layer + 0.01
+	focus_overlay.plane = ABOVE_HUD_PLANE
+	. += focus_overlay

 /obj/item/tk_grab/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is using [user.p_their()] telekinesis to choke [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -254,13 +254,13 @@
 	config_entry_value = 1

 /datum/config_entry/number/movedelay/sprint_buffer_max
-	config_entry_value = 42
+	config_entry_value = 24

 /datum/config_entry/number/movedelay/sprint_stamina_cost
-	config_entry_value = 0.7
+	config_entry_value = 1.4

 /datum/config_entry/number/movedelay/sprint_buffer_regen_per_ds
-	config_entry_value = 0.3
+	config_entry_value = 0.4

 /////////////////////////////////////////////////Outdated move delay
 /datum/config_entry/number/outdated_movedelay
@@ -335,6 +335,10 @@
 	config_entry_value = 16
 	min_val = 0

+/datum/config_entry/number/station_space_budget
+	config_entry_value = 10
+	min_val = 0
+
 /datum/config_entry/flag/allow_random_events	// Enables random events mid-round when set

 /datum/config_entry/number/events_min_time_mul	// Multipliers for random events minimal starting time and minimal players amounts
@@ -404,10 +408,6 @@
 	lowercase = FALSE
 	splitter = ","

-/datum/config_entry/number/auto_transfer_delay
-	config_entry_value = 72000
-	min_val = 0
-
 /datum/config_entry/flag/pai_custom_holoforms

 /datum/config_entry/number/marauder_delay_non_reebe
@@ -82,6 +82,18 @@
 	config_entry_value = 600
 	min_val = 0

+/datum/config_entry/number/vote_autotransfer_initial //length of time before the first autotransfer vote is called (deciseconds, default 2 hours)
+	config_entry_value = 72000
+	min_val = 0
+
+/datum/config_entry/number/vote_autotransfer_interval //length of time to wait before subsequent autotransfer votes (deciseconds, default 30 minutes)
+	config_entry_value = 18000
+	min_val = 0
+
+/datum/config_entry/number/vote_autotransfer_maximum // maximum extensions until the round autoends
+	config_entry_value = 4
+	min_val = 0
+
 /datum/config_entry/flag/default_no_vote	// vote does not default to nochange/norestart

 /datum/config_entry/flag/no_dead_vote	// dead people can't vote
@@ -63,7 +63,7 @@
 //Sleeping in here prevents future fires until returned.
 /datum/controller/subsystem/proc/fire(resumed = 0)
 	flags |= SS_NO_FIRE
-	throw EXCEPTION("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.")
+	CRASH("Subsystem [src]([type]) does not fire() but did not set the SS_NO_FIRE flag. Please add the SS_NO_FIRE flag to any subsystem that doesn't fire so it doesn't get added to the processing list and waste cpu.")

 /datum/controller/subsystem/Destroy()
 	dequeue()
@@ -0,0 +1,27 @@
+SUBSYSTEM_DEF(autotransfer)
+	name = "Autotransfer Vote"
+	flags = SS_KEEP_TIMING | SS_BACKGROUND
+	wait = 1 MINUTES
+
+	var/starttime
+	var/targettime
+	var/voteinterval
+	var/maxvotes
+	var/curvotes
+
+/datum/controller/subsystem/autotransfer/Initialize(timeofday)
+	starttime = world.time
+	targettime = starttime + CONFIG_GET(number/vote_autotransfer_initial)
+	voteinterval = CONFIG_GET(number/vote_autotransfer_interval)
+	maxvotes = CONFIG_GET(number/vote_autotransfer_maximum)
+	curvotes = 0
+	return ..()
+
+/datum/controller/subsystem/autotransfer/fire()
+	if(maxvotes > curvotes)
+		if(world.time > targettime)
+			SSvote.initiate_vote("transfer",null) //TODO figure out how to not use null as the user
+			targettime = targettime + voteinterval
+			curvotes += 1
+	else
+		SSshuttle.autoEnd()
@@ -6,7 +6,7 @@ SUBSYSTEM_DEF(garbage)
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY
 	init_order = INIT_ORDER_GARBAGE

-	var/list/collection_timeout = list(0, 2 MINUTES, 10 SECONDS)	// deciseconds to wait before moving something up in the queue to the next level
+	var/list/collection_timeout = list(15 SECONDS, 30 SECONDS)	// deciseconds to wait before moving something up in the queue to the next level

 	//Stat tracking
 	var/delslasttick = 0			// number of del()'s we've done this tick
@@ -27,6 +27,7 @@ SUBSYSTEM_DEF(garbage)

 	#ifdef TESTING
 	var/list/reference_find_on_fail = list()
+	var/list/reference_find_on_fail_types = list()
 	#endif


@@ -98,9 +99,6 @@ SUBSYSTEM_DEF(garbage)
 					state = SS_RUNNING
 				break

-
-
-
 /datum/controller/subsystem/garbage/proc/HandleQueue(level = GC_QUEUE_CHECK)
 	if (level == GC_QUEUE_CHECK)
 		delslasttick = 0
@@ -183,6 +181,11 @@ SUBSYSTEM_DEF(garbage)
 	var/gctime = world.time
 	var/refid = "\ref[D]"

+#ifdef TESTING
+	if(reference_find_on_fail_types[D.type])
+		reference_find_on_fail["\ref[D]"] = TRUE
+#endif
+
 	D.gc_destroyed = gctime
 	var/list/queue = queues[level]
 	if (queue[refid])
@@ -190,6 +193,21 @@ SUBSYSTEM_DEF(garbage)

 	queue[refid] = gctime

+#ifdef TESTING
+/datum/controller/subsystem/garbage/proc/add_type_to_findref(type)
+	if(!ispath(type))
+		return "NOT A VAILD PATH"
+	reference_find_on_fail_types |= typecacheof(type)
+
+/datum/controller/subsystem/garbage/proc/remove_type_from_findref(type)
+	if(!ispath(type))
+		return "NOT A VALID PATH"
+	reference_find_on_fail_types -= typesof(type)
+
+/datum/controller/subsystem/garbage/proc/clear_findref_types()
+	reference_find_on_fail_types = list()
+#endif
+
 //this is mainly to separate things profile wise.
 /datum/controller/subsystem/garbage/proc/HardDelete(datum/D)
 	var/time = world.timeofday
@@ -244,7 +262,7 @@ SUBSYSTEM_DEF(garbage)

 #ifdef TESTING
 /proc/qdel_and_find_ref_if_fail(datum/D, force = FALSE)
-	SSgarbage.reference_find_on_fail[REF(D)] = TRUE
+	SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
 	qdel(D, force)
 #endif

@@ -309,7 +327,7 @@ SUBSYSTEM_DEF(garbage)
 			if (QDEL_HINT_IFFAIL_FINDREFERENCE)
 				SSgarbage.Queue(D)
 				#ifdef TESTING
-				SSgarbage.reference_find_on_fail[REF(D)] = TRUE
+				SSgarbage.reference_find_on_fail["\ref[D]"] = TRUE
 				#endif
 			else
 				#ifdef TESTING
@@ -83,15 +83,15 @@ SUBSYSTEM_DEF(jukeboxes)
 		return
 	for(var/list/jukeinfo in activejukeboxes)
 		if(!jukeinfo.len)
-			EXCEPTION("Active jukebox without any associated metadata.")
+			stack_trace("Active jukebox without any associated metadata.")
 			continue
 		var/datum/track/juketrack = jukeinfo[1]
 		if(!istype(juketrack))
-			EXCEPTION("Invalid jukebox track datum.")
+			stack_trace("Invalid jukebox track datum.")
 			continue
 		var/obj/jukebox = jukeinfo[3]
 		if(!istype(jukebox))
-			EXCEPTION("Nonexistant or invalid object associated with jukebox.")
+			stack_trace("Nonexistant or invalid object associated with jukebox.")
 			continue
 		var/sound/song_played = sound(juketrack.song_path)
 		var/area/currentarea = get_area(jukebox)
@@ -14,6 +14,7 @@ SUBSYSTEM_DEF(mapping)
 	var/list/ruins_templates = list()
 	var/list/space_ruins_templates = list()
 	var/list/lava_ruins_templates = list()
+	var/list/station_ruins_templates = list()
 	var/datum/space_level/isolated_ruins_z //Created on demand during ruin loading.

 	var/list/shuttle_templates = list()
@@ -94,6 +95,11 @@ SUBSYSTEM_DEF(mapping)
 	var/list/space_ruins = levels_by_trait(ZTRAIT_SPACE_RUINS)
 	if (space_ruins.len)
 		seedRuins(space_ruins, CONFIG_GET(number/space_budget), /area/space, space_ruins_templates)
+
+	// Generate station space ruins
+	var/list/station_ruins = levels_by_trait(ZTRAIT_STATION)
+	if (station_ruins.len)
+		seedRuins(station_ruins, CONFIG_GET(number/station_space_budget), /area/space/station_ruins, station_ruins_templates)
 	SSmapping.seedStation()
 	loading_ruins = FALSE
 #endif
@@ -161,6 +167,7 @@ SUBSYSTEM_DEF(mapping)
 	ruins_templates = SSmapping.ruins_templates
 	space_ruins_templates = SSmapping.space_ruins_templates
 	lava_ruins_templates = SSmapping.lava_ruins_templates
+	station_ruins_templates = SSmapping.station_ruins_templates
 	shuttle_templates = SSmapping.shuttle_templates
 	shelter_templates = SSmapping.shelter_templates
 	unused_turfs = SSmapping.unused_turfs
@@ -352,6 +359,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 	// Still supporting bans by filename
 	var/list/banned = generateMapList("[global.config.directory]/lavaruinblacklist.txt")
 	banned += generateMapList("[global.config.directory]/spaceruinblacklist.txt")
+	banned += generateMapList("[global.config.directory]/stationruinblacklist.txt")

 	for(var/item in sortList(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority))
 		var/datum/map_template/ruin/ruin_type = item
@@ -372,6 +380,8 @@ GLOBAL_LIST_EMPTY(the_station_areas)
 			space_ruins_templates[R.name] = R
 		else if(istype(R, /datum/map_template/ruin/station))
 			station_room_templates[R.name] = R
+		else if(istype(R, /datum/map_template/ruin/spacenearstation))
+			station_ruins_templates[R.name] = R

 /datum/controller/subsystem/mapping/proc/preloadShuttleTemplates()
 	var/list/unbuyable = generateMapList("[global.config.directory]/unbuyableshuttles.txt")
@@ -5,23 +5,25 @@ These materials call on_applied() on whatever item they are applied to, common e

 SUBSYSTEM_DEF(materials)
 	name = "Materials"
-	flags = SS_NO_FIRE
-	init_order = INIT_ORDER_MATERIALS
+	flags = SS_NO_FIRE | SS_NO_INIT
 	///Dictionary of material.type || material ref
-	var/list/materials = list()
+	var/list/materials
 	///Dictionary of category || list of material refs
-	var/list/materials_by_category = list()
+	var/list/materials_by_category
 	///List of stackcrafting recipes for materials using rigid materials
 	var/list/rigid_stack_recipes = list(new/datum/stack_recipe("chair", /obj/structure/chair/greyscale, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE))

-/datum/controller/subsystem/materials/Initialize(timeofday)
-	InitializeMaterials()
-	return ..()
-
 ///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropiate vars (See these variables for more info)
-/datum/controller/subsystem/materials/proc/InitializeMaterials(timeofday)
+/datum/controller/subsystem/materials/proc/InitializeMaterials()
+	materials = list()
+	materials_by_category = list()
 	for(var/type in subtypesof(/datum/material))
 		var/datum/material/ref = new type
 		materials[type] = ref
 		for(var/c in ref.categories)
 			materials_by_category[c] += list(ref)
+
+/datum/controller/subsystem/materials/proc/GetMaterialRef(datum/material/fakemat)
+	if(!materials)
+		InitializeMaterials()
+	return materials[fakemat] || fakemat
@@ -55,7 +55,8 @@ SUBSYSTEM_DEF(shuttle)

 	var/lockdown = FALSE	//disallow transit after nuke goes off

-	var/auto_call = 72000 //CIT CHANGE - time before in deciseconds in which the shuttle is auto called. Default is 2ish hours plus 15 for the shuttle. So total is 3.
+	var/endvote_passed = FALSE
+
 	var/realtimeofstart = 0

 /datum/controller/subsystem/shuttle/Initialize(timeofday)
@@ -78,7 +79,6 @@ SUBSYSTEM_DEF(shuttle)
 	if(!supply)
 		WARNING("No /obj/docking_port/mobile/supply placed on the map!")
 	realtimeofstart = world.realtime
-	auto_call = CONFIG_GET(number/auto_transfer_delay)
 	return ..()

 /datum/controller/subsystem/shuttle/proc/initial_load()
@@ -113,11 +113,8 @@ SUBSYSTEM_DEF(shuttle)
 				qdel(T, force=TRUE)
 	CheckAutoEvac()

-	//Cargo stuff start
-	var/fire_time_diff = max(0, world.time - last_fire)		//Don't want this to be below 0, seriously.
-	var/point_gain = (fire_time_diff / 600) * passive_supply_points_per_minute
-	points += point_gain
-	//Cargo stuff end
+	if(!(times_fired % CEILING(600/wait, 1)))
+		points += passive_supply_points_per_minute

 	var/esETA = emergency?.getModeStr()
 	emergency_shuttle_stat_text = "[esETA? "[esETA] [emergency.getTimerStr()]" : ""]"
@@ -185,14 +182,13 @@ SUBSYSTEM_DEF(shuttle)
 		WARNING("requestEvac(): There is no emergency shuttle, but the \
 			shuttle was called. Using the backup shuttle instead.")
 		if(!backup_shuttle)
-			throw EXCEPTION("requestEvac(): There is no emergency shuttle, \
+			CRASH("requestEvac(): There is no emergency shuttle, \
 			or backup shuttle! The game will be unresolvable. This is \
 			possibly a mapping error, more likely a bug with the shuttle \
 			manipulation system, or badminry. It is possible to manually \
 			resolve this problem by loading an emergency shuttle template \
 			manually, and then calling register() on the mobile docking port. \
 			Good luck.")
-			return
 		emergency = backup_shuttle
 	var/srd = CONFIG_GET(number/shuttle_refuel_delay)
 	if(world.time - SSticker.round_start_time < srd)
@@ -420,7 +416,7 @@ SUBSYSTEM_DEF(shuttle)

 /datum/controller/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M)
 	if(!istype(M))
-		throw EXCEPTION("[M] is not a mobile docking port")
+		CRASH("[M] is not a mobile docking port")

 	if(M.assigned_transit)
 		return
@@ -643,10 +639,11 @@ SUBSYSTEM_DEF(shuttle)

 	QDEL_LIST(remove_images)

-/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
-	if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
+/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end without being a proper shuttle call?
+	if(EMERGENCY_IDLE_OR_RECALLED)
 		SSshuttle.emergency.request(silent = TRUE)
 		priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, "shuttlecalled", "Priority")
-		log_game("Round time limit reached. Shuttle has been auto-called.")
-		message_admins("Round time limit reached. Shuttle called.")
-		emergencyNoRecall = TRUE
+		log_game("Round end vote passed. Shuttle has been auto-called.")
+		message_admins("Round end vote passed. Shuttle has been auto-called.")
+	emergencyNoRecall = TRUE
+	endvote_passed = TRUE
@@ -1,49 +1,32 @@
 SUBSYSTEM_DEF(sun)
 	name = "Sun"
-	wait = 600
-	flags = SS_NO_TICK_CHECK|SS_NO_INIT
-	var/angle
-	var/dx
-	var/dy
-	var/rate
-	var/list/solars	= list()
-
-/datum/controller/subsystem/sun/PreInit()
-	angle = rand (0,360)			// the station position to the sun is randomised at round start
-	rate = rand(50,200)/100			// 50% - 200% of standard rotation
-	if(prob(50))					// same chance to rotate clockwise than counter-clockwise
-		rate = -rate
-
-/datum/controller/subsystem/sun/stat_entry(msg)
-	..("P:[solars.len]")
-
-/datum/controller/subsystem/sun/fire()
-	angle = (360 + angle + rate * 6) % 360	 // increase/decrease the angle to the sun, adjusted by the rate
-
-	// now calculate and cache the (dx,dy) increments for line drawing
-	var/s = sin(angle)
-	var/c = cos(angle)
-
-	// Either "abs(s) < abs(c)" or "abs(s) >= abs(c)"
-	// In both cases, the greater is greater than 0, so, no "if 0" check is needed for the divisions
-
-	if(abs(s) < abs(c))
-		dx = s / abs(c)
-		dy = c / abs(c)
-	else
-		dx = s / abs(s)
-		dy = c / abs(s)
-
-	//now tell the solar control computers to update their status and linked devices
-	for(var/obj/machinery/power/solar_control/SC in solars)
-		if(!SC.powernet)
-			solars.Remove(SC)
-			continue
-		SC.update()
-
-
+	wait = 1 MINUTES
+	flags = SS_NO_TICK_CHECK

+	var/azimuth = 0 ///clockwise, top-down rotation from 0 (north) to 359
+	var/azimuth_mod = 1 ///multiplier against base_rotation
+	var/base_rotation = 6 ///base rotation in degrees per fire

+/datum/controller/subsystem/sun/Initialize(start_timeofday)
+	azimuth = rand(0, 359)
+	azimuth_mod = round(rand(50, 200)/100, 0.01) // 50% - 200% of standard rotation
+	if(prob(50))
+		azimuth_mod *= -1
+	return ..()

+/datum/controller/subsystem/sun/fire(resumed = FALSE)
+	azimuth += azimuth_mod * base_rotation
+	azimuth = round(azimuth, 0.01)
+	if(azimuth >= 360)
+		azimuth -= 360
+	if(azimuth < 0)
+		azimuth += 360
+	complete_movement()

+/datum/controller/subsystem/sun/proc/complete_movement()
+	SEND_SIGNAL(src, COMSIG_SUN_MOVED, azimuth)

+/datum/controller/subsystem/sun/vv_edit_var(var_name, var_value)
+	. = ..()
+	if(var_name == NAMEOF(src, azimuth))
+		complete_movement()
@@ -213,7 +213,7 @@ SUBSYSTEM_DEF(ticker)
 			check_queue()
 			check_maprotate()
 			scripture_states = scripture_unlock_alert(scripture_states)
-			SSshuttle.autoEnd()
+			//SSshuttle.autoEnd()

 			if(!roundend_check_paused && mode.check_finished(force_ending) || force_ending)
 				current_state = GAME_STATE_FINISHED
@@ -701,6 +701,7 @@ SUBSYSTEM_DEF(ticker)
 		round_end_sound = pick(\
 		'sound/roundend/newroundsexy.ogg',
 		'sound/roundend/apcdestroyed.ogg',
+		'sound/roundend/seeyoulaterokay.ogg',
 		'sound/roundend/bangindonk.ogg',
 		'sound/roundend/leavingtg.ogg',
 		'sound/roundend/its_only_game.ogg',
@@ -89,6 +89,20 @@ SUBSYSTEM_DEF(vote)
 					choices[GLOB.master_mode] += non_voters.len
 					if(choices[GLOB.master_mode] >= greatest_votes)
 						greatest_votes = choices[GLOB.master_mode]
+			else if(mode == "transfer") // austation begin -- Crew autotransfer vote
+				var/factor = 1
+				switch(world.time / (1 MINUTES))
+					if(0 to 60)
+						factor = 0.5
+					if(61 to 120)
+						factor = 0.8
+					if(121 to 240)
+						factor = 1
+					if(241 to 300)
+						factor = 1.2
+					else
+						factor = 1.4
+				choices["Initiate Crew Transfer"] += round(non_voters.len * factor) // austation end
 	//get all options with that many votes and return them in a list
 	. = list()
 	if(greatest_votes)
@@ -365,6 +379,12 @@ SUBSYSTEM_DEF(vote)
 				log_admin("The map has been voted for and will change to: [VM.map_name]")
 				if(SSmapping.changemap(config.maplist[.]))
 					to_chat(world, "<span class='boldannounce'>The map vote has chosen [VM.map_name] for next round!</span>")
+			if("transfer") // austation begin -- Crew autotransfer vote
+				if(. == "Initiate Crew Transfer")
+					SSshuttle.autoEnd()
+					var/obj/machinery/computer/communications/C = locate() in GLOB.machines
+					if(C)
+						C.post_status("shuttle") // austation end
 	if(restart)
 		var/active_admins = 0
 		for(var/client/C in GLOB.admins)
@@ -444,6 +464,7 @@ SUBSYSTEM_DEF(vote)
 				to_chat(usr, "<span class='warning'>A vote was initiated recently, you must wait [DisplayTimeText(next_allowed_time-world.time)] before a new vote can be started!</span>")
 				return 0

+		SEND_SOUND(world, sound('sound/misc/notice2.ogg'))
 		reset()
 		obfuscated = hideresults //CIT CHANGE - adds obfuscated votes
 		switch(vote_type)
@@ -465,6 +486,8 @@ SUBSYSTEM_DEF(vote)
 					if(targetmap.max_round_search_span && count_occurences_of_value(lastmaps, M, targetmap.max_round_search_span) >= targetmap.max_rounds_played)
 						continue
 					choices |= M
+			if("transfer") // austation begin -- Crew autotranfer vote
+				choices.Add("Initiate Crew Transfer","Continue Playing") // austation end
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
 			if("mode tiers")
@@ -476,10 +499,11 @@ SUBSYSTEM_DEF(vote)
 				modes_to_add -= "traitor" // makes it so that traitor is always available
 				choices.Add(modes_to_add)
 			if("dynamic")
+				var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
 				for(var/T in config.storyteller_cache)
 					var/datum/dynamic_storyteller/S = T
-					var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
-					if(probabilities[initial(S.config_tag)] > 0)
+					var/probability = ((initial(S.config_tag) in probabilities) ? probabilities[initial(S.config_tag)] : initial(S.weight))
+					if(probability > 0)
 						choices.Add(initial(S.name))
 						choice_descs.Add(initial(S.desc))
 			if("custom")
@@ -496,7 +520,7 @@ SUBSYSTEM_DEF(vote)
 			else
 				return 0
 		mode = vote_type
-		initiator = initiator_key
+		initiator = initiator_key ? initiator_key : "the Server" // austation -- Crew autotransfer vote
 		started_time = world.time
 		var/text = "[capitalize(mode)] vote started by [initiator]."
 		if(mode == "custom")
@@ -8,6 +8,7 @@
 	var/desc = null
 	var/obj/target = null
 	var/check_flags = 0
+	var/required_mobility_flags = MOBILITY_USE
 	var/processing = FALSE
 	var/obj/screen/movable/action_button/button = null
 	var/buttontooltipstyle = ""
@@ -31,6 +32,7 @@

 /datum/action/proc/link_to(Target)
 	target = Target
+	RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, .proc/OnUpdatedIcon)

 /datum/action/Destroy()
 	if(owner)
@@ -95,20 +97,23 @@

 /datum/action/proc/IsAvailable()
 	if(!owner)
-		return 0
+		return FALSE
+	var/mob/living/L = owner
+	if(istype(L) && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
+		return FALSE
 	if(check_flags & AB_CHECK_RESTRAINED)
 		if(owner.restrained())
-			return 0
+			return FALSE
 	if(check_flags & AB_CHECK_STUN)
-		if(owner.IsKnockdown() || owner.IsStun())
-			return 0
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE))
+			return FALSE
 	if(check_flags & AB_CHECK_LYING)
-		if(owner.lying)
-			return 0
+		if(istype(L) && !CHECK_MOBILITY(L, MOBILITY_STAND))
+			return FALSE
 	if(check_flags & AB_CHECK_CONSCIOUS)
 		if(owner.stat)
-			return 0
-	return 1
+			return FALSE
+	return TRUE

 /datum/action/proc/UpdateButtonIcon(status_only = FALSE, force = FALSE)
 	if(button)
@@ -153,6 +158,9 @@
 	var/mob/M = target
 	M.ghostize(1)

+/datum/action/proc/OnUpdatedIcon()
+	UpdateButtonIcon()
+
 //Presets for item actions
 /datum/action/item_action
 	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_LYING|AB_CHECK_CONSCIOUS
@@ -301,10 +309,7 @@
 /datum/action/item_action/synthswitch/Trigger()
 	if(istype(target, /obj/item/instrument/piano_synth))
 		var/obj/item/instrument/piano_synth/synth = target
-		var/chosen = input("Choose the type of instrument you want to use", "Instrument Selection", "piano") as null|anything in synth.insTypes
-		if(!synth.insTypes[chosen])
-			return
-		return synth.changeInstrument(chosen)
+		return synth.selectInstrument()
 	return ..()

 /datum/action/item_action/vortex_recall
@@ -429,7 +434,8 @@
 	name = "Shift Nerves"

 /datum/action/item_action/explosive_implant
-	check_flags = 0
+	check_flags = NONE
+	required_mobility_flags = NONE
 	name = "Activate Explosive Implant"

 /datum/action/item_action/toggle_research_scanner
@@ -827,4 +833,4 @@
 	for(var/datum/action/A in M.actions)
 		if(istype(A, action_type))
 			return A
-	return 
+	return
@@ -136,7 +136,7 @@
 		fall_chance += 2
 	if(prob(fall_chance) && !owner.lying && !owner.buckled)
 		to_chat(owner, "<span class='warning'>Your leg gives out!</span>")
-		owner.Knockdown(35)
+		owner.DefaultCombatKnockdown(35)

 	else if(owner.get_active_held_item())
 		var/drop_chance = 1
@@ -13,7 +13,7 @@
 /datum/brain_trauma/special/godwoken/on_life()
 	..()
 	if(prob(4))
-		if(prob(33) && (owner.IsStun() || owner.IsKnockdown() || owner.IsUnconscious()))
+		if(prob(33) && owner.HighestImmobilityAmount())
 			speak("unstun", TRUE)
 		else if(prob(60) && owner.health <= owner.crit_threshold)
 			speak("heal", TRUE)
@@ -39,12 +39,18 @@
 	//title_image = ntitle_image

 /datum/browser/proc/add_stylesheet(name, file)
-	if(istype(name, /datum/asset/spritesheet))
+	if (istype(name, /datum/asset/spritesheet))
 		var/datum/asset/spritesheet/sheet = name
 		stylesheets["spritesheet_[sheet.name].css"] = "data/spritesheets/[sheet.name]"
 	else
-		stylesheets["[ckey(name)].css"] = file
-		register_asset("[ckey(name)].css", file)
+		var/asset_name = "[name].css"
+		stylesheets[asset_name] = file
+		if(!SSassets.cache[asset_name])
+			register_asset(asset_name, file)
+
+/datum/browser/proc/add_script(name, file)
+	scripts["[ckey(name)].js"] = file
+	register_asset("[ckey(name)].js", file)

 /datum/browser/proc/set_content(ncontent)
 	content = ncontent
@@ -12,6 +12,8 @@
 	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
 	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
 	RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
+	if(istype(parent, /obj/mecha/working/ripley))
+		RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays)

 	if(_maxamount)
 		maxamount = _maxamount
@@ -75,4 +77,13 @@
 /datum/component/armor_plate/proc/dropplates(datum/source, force)
 	if(ismecha(parent)) //items didn't drop the plates before and it causes erroneous behavior for the time being with collapsible helmets
 		for(var/i in 1 to amount)
-			new upgrade_item(get_turf(parent))
+			new upgrade_item(get_turf(parent))
+
+/datum/component/armor_plate/proc/apply_mech_overlays(obj/mecha/mech, list/overlays)
+	if(amount)
+		var/overlay_string = "ripley-g"
+		if(amount >= 3)
+			overlay_string += "-full"
+		if(!mech.occupant)
+			overlay_string += "-open"
+		overlays += overlay_string
@@ -59,4 +59,4 @@
 						"<span class='userdanger'>You slide on [A]!</span>")

 			cooldown = world.time
-		H.Knockdown(60)
+		H.DefaultCombatKnockdown(60)
@@ -100,7 +100,7 @@
 		AM.forceMove(T)
 		if(isliving(AM))
 			var/mob/living/L = AM
-			L.Knockdown(100)
+			L.DefaultCombatKnockdown(100)
 			L.adjustBruteLoss(30)
 		falling_atoms -= AM

@@ -110,8 +110,7 @@
 		if (isliving(AM))
 			var/mob/living/L = AM
 			L.notransform = TRUE
-			L.Stun(200)
-			L.resting = TRUE
+			L.Paralyze(200)

 		var/oldtransform = AM.transform
 		var/oldcolor = AM.color
@@ -27,14 +27,16 @@
 					CAT_BREAD,
 					CAT_BURGER,
 					CAT_CAKE,
+					CAT_DONUT,
 					CAT_EGG,
-					CAT_FISH,
 					CAT_ICE,
 					CAT_MEAT,
+					CAT_MEXICAN,
 					CAT_MISCFOOD,
 					CAT_PASTRY,
 					CAT_PIE,
 					CAT_PIZZA,
+					CAT_SEAFOOD,
 					CAT_SALAD,
 					CAT_SANDWICH,
 					CAT_SOUP,
@@ -16,6 +16,6 @@

 /obj/item/weaponcrafting/silkstring
 	name = "silkstring"
-	desc = "A long pice of silk looks like cable coil."
+	desc = "A long piece of silk with some resemblance to cable coil."
 	icon = 'icons/obj/improvised.dmi'
-	icon_state = "silkstring"
+	icon_state = "silkstring"
@@ -33,11 +33,17 @@
 				/obj/item/organ/ears/cat = 1)
 	category = CAT_CLOTHING

+////////
+//Huds//
+////////
+
 /datum/crafting_recipe/hudsunsec
 	name = "Security HUDsunglasses"
 	result = /obj/item/clothing/glasses/hud/security/sunglasses
 	time = 20
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/security = 1,
+					/obj/item/clothing/glasses/sunglasses = 1)
 	reqs = list(/obj/item/clothing/glasses/hud/security = 1,
 				  /obj/item/clothing/glasses/sunglasses = 1,
 				  /obj/item/stack/cable_coil = 5)
@@ -56,9 +62,11 @@
 	result = /obj/item/clothing/glasses/hud/health/sunglasses
 	time = 20
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/health = 1,
+				/obj/item/clothing/glasses/sunglasses = 1)
 	reqs = list(/obj/item/clothing/glasses/hud/health = 1,
-				  /obj/item/clothing/glasses/sunglasses = 1,
-				  /obj/item/stack/cable_coil = 5)
+				/obj/item/clothing/glasses/sunglasses = 1,
+				/obj/item/stack/cable_coil = 5)
 	category = CAT_CLOTHING

 /datum/crafting_recipe/hudsunmedremoval
@@ -86,6 +94,27 @@
 	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
 	reqs = list(/obj/item/clothing/glasses/sunglasses/reagent = 1)
 	category = CAT_CLOTHING
+
+/datum/crafting_recipe/diagnostic_sunglasses
+	name = "Diagnostic HUDsunglasses"
+	result = /obj/item/clothing/glasses/hud/diagnostic/sunglasses
+	time = 20
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	parts = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				/obj/item/clothing/glasses/sunglasses = 1)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic = 1,
+				  /obj/item/clothing/glasses/sunglasses = 1,
+				  /obj/item/stack/cable_coil = 5)
+	category = CAT_CLOTHING
+
+/datum/crafting_recipe/diagnostic_singlasses_removal
+	name = "Diagnostic HUDsunglasses removal"
+	result = /obj/item/clothing/glasses/sunglasses
+	time = 20
+	tools = list(TOOL_SCREWDRIVER, TOOL_WIRECUTTER)
+	reqs = list(/obj/item/clothing/glasses/hud/diagnostic/sunglasses = 1)
+	category = CAT_CLOTHING
+
 /* //Kevinz doesn't want it as a recipe for now, leaving it in if anything ever changes to let it in
 /datum/crafting_recipe/stunglasses
 	name = "Stunglasses"
@@ -130,7 +159,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 7,
 				/obj/item/stack/sheet/leather = 3)
 	time = 70
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_toolbelt
@@ -139,7 +167,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 5,
 				/obj/item/stack/sheet/leather = 2)
 	time = 30
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_bandolier
@@ -148,7 +175,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 6,
 				/obj/item/stack/sheet/leather = 2)
 	time = 50
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_helmet
@@ -157,7 +183,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 4,
 				/obj/item/stack/sheet/leather = 2)
 	time = 30
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_vest
@@ -166,7 +191,6 @@
 	reqs = list(/obj/item/stack/sheet/durathread = 6,
 				/obj/item/stack/sheet/leather = 3)
 	time = 50
-	always_availible = TRUE
 	category = CAT_CLOTHING

 /datum/crafting_recipe/durathread_wintercoat
@@ -183,5 +207,4 @@
 	reqs = list(/obj/item/clothing/suit/hooded/wintercoat = 1,
 				/obj/item/bedsheet/cosmos = 1)
 	time = 60
-	always_availible = TRUE
 	category = CAT_CLOTHING
@@ -119,18 +119,6 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON

-/datum/crafting_recipe/switchblade_ms
-	name = "Switchblade"
-	result = /obj/item/switchblade/crafted
-	reqs = list(/obj/item/weaponcrafting/stock = 1,
-				/obj/item/weaponcrafting/receiver = 1,
-				/obj/item/kitchen/knife = 1,
-				/obj/item/stack/cable_coil = 2)
-	tools = list(TOOL_WELDER)
-	time = 45
-	category = CAT_WEAPONRY
-	subcategory = CAT_WEAPON
-
 //////////////////
 ///BOMB CRAFTING//
 //////////////////
@@ -204,7 +192,7 @@
 	result =  /obj/item/gun/ballistic/bow/pipe
 	reqs = list(/obj/item/pipe = 5,
 	/obj/item/stack/sheet/plastic = 15,
-	/obj/item/weaponcrafting/silkstring = 10)
+	/obj/item/weaponcrafting/silkstring = 5)
 	time = 450
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON
@@ -291,17 +279,17 @@
 /datum/crafting_recipe/arrow
 	name = "Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow
-	time = 40
+	time = 30
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
-				 /obj/item/weaponcrafting/silkstring = 1,
-				 /obj/item/stack/rods = 3) // 1 metal sheet is worth 1.5 arrows
+				 /obj/item/stack/sheet/silk = 1,
+				 /obj/item/stack/rods = 1) // 1 metal sheet = 2 rods = 2 arrows
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO

 /datum/crafting_recipe/bone_arrow
 	name = "Bone Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/bone
-	time = 40
+	time = 30
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/sheet/bone = 1,
 				 /obj/item/stack/sheet/sinew = 1,
@@ -310,10 +298,10 @@
 	subcategory = CAT_AMMO

 /datum/crafting_recipe/ashen_arrow
-	name = "Harden Arrow"
+	name = "Fire Hardened Arrow"
 	result = /obj/item/ammo_casing/caseless/arrow/ashen
-	tools = list(/obj/structure/bonfire)
-	time = 20
+	tools = list(TOOL_WELDER)
+	time = 30
 	always_availible = FALSE
 	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1)
 	category = CAT_WEAPONRY
@@ -18,7 +18,7 @@
 	var/mob/living/LM = parent
 	var/v = volume
 	var/e = e_range
-	if(!T.footstep || LM.buckled || LM.lying || !LM.canmove || LM.resting || LM.buckled || LM.throwing || LM.movement_type & (VENTCRAWLING | FLYING))
+	if(!T.footstep || LM.buckled || !CHECK_MOBILITY(LM, MOBILITY_STAND) || LM.buckled || LM.throwing || (LM.movement_type & (VENTCRAWLING | FLYING)))
 		if (LM.lying && !LM.buckled && !(!T.footstep || LM.movement_type & (VENTCRAWLING | FLYING))) //play crawling sound if we're lying
 			playsound(T, 'sound/effects/footstep/crawl1.ogg', 15 * v)
 		return
@@ -54,7 +54,7 @@
 			msg += " and knocks [target] [target_buckled? "off of [target.buckled]" : "down"]"
 			if(target_buckled)
 				target.buckled.unbuckle_mob(target)
-			target.Knockdown(knockdown_time)
+			target.DefaultCombatKnockdown(knockdown_time)
 		if(length(msg))
 			user.visible_message("<span class='danger'>[msg]!</span>")

@@ -42,7 +42,7 @@
 	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/OnExamine)

 	for(var/mat in mat_list) //Make the assoc list ref | amount
-		var/datum/material/M = getmaterialref(mat) || mat
+		var/datum/material/M = SSmaterials.GetMaterialRef(mat)
 		materials[M] = 0

 /datum/component/material_container/proc/OnExamine(datum/source, mob/user, list/examine_list)
@@ -130,7 +130,7 @@
 /// For inserting an amount of material
 /datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	if(amt > 0 && has_space(amt))
 		var/total_amount_saved = total_amount
 		if(mat)
@@ -145,7 +145,7 @@
 /// Uses an amount of a specific material, effectively removing it.
 /datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	var/amount = materials[mat]
 	if(mat)
 		if(amount >= amt)
@@ -157,7 +157,7 @@
 /// Proc for transfering materials to another container.
 /datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	if((amt==0)||(!T)||(!mat))
 		return FALSE
 	if(amt<0)
@@ -190,7 +190,7 @@
 	for(var/x in mats) //Loop through all required materials
 		var/datum/material/req_mat = x
 		if(!istype(req_mat))
-			req_mat = getmaterialref(req_mat) //Get the ref if necesary
+			req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref if necesary
 		if(!materials[req_mat]) //Do we have the resource?
 			return FALSE //Can't afford it
 		var/amount_required = mats[x] * multiplier
@@ -251,7 +251,7 @@
 		var/datum/material/req_mat = x
 		if(!istype(req_mat))
 			if(ispath(req_mat)) //Is this an actual material, or is it a category?
-				req_mat = getmaterialref(req_mat) //Get the ref
+				req_mat = SSmaterials.GetMaterialRef(req_mat) //Get the ref

 			else // Its a category. (For example MAT_CATEGORY_RIGID)
 				if(!has_enough_of_category(req_mat, mats[req_mat], multiplier)) //Do we have enough of this category?
@@ -316,5 +316,5 @@
 /// Returns the amount of a specific material in this container.
 /datum/component/material_container/proc/get_material_amount(var/datum/material/mat)
 	if(!istype(mat))
-		mat = getmaterialref(mat)
+		mat = SSmaterials.GetMaterialRef(mat)
 	return(materials[mat])
@@ -240,7 +240,7 @@
 /datum/component/riding/human/force_dismount(mob/living/user)
 	var/atom/movable/AM = parent
 	AM.unbuckle_mob(user)
-	user.Knockdown(60)
+	user.DefaultCombatKnockdown(60)
 	user.visible_message("<span class='warning'>[AM] pushes [user] off of [AM.p_them()]!</span>")

 /datum/component/riding/cyborg
@@ -298,7 +298,7 @@
 	M.Move(targetm)
 	M.visible_message("<span class='warning'>[M] is thrown clear of [AM]!</span>")
 	M.throw_at(target, 14, 5, AM)
-	M.Knockdown(60)
+	M.DefaultCombatKnockdown(60)

 /datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, mob/living/riding_target_override)
 	var/list/equipped
@@ -22,7 +22,7 @@
 			return //undeads are unaffected by the spook-pocalypse.
 		if(istype(H.dna.species, /datum/species/zombie))
 			H.adjustStaminaLoss(25)
-			H.Knockdown(15) //zombies can't resist the doot
+			H.DefaultCombatKnockdown(15) //zombies can't resist the doot
 		C.Jitter(35)
 		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)))
@@ -36,7 +36,7 @@

 /datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user)
 	if((H.getStaminaLoss() > 95) && (!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)))
-		H.Knockdown(20)
+		H.DefaultCombatKnockdown(20)
 		H.set_species(/datum/species/skeleton)
 		H.visible_message("<span class='warning'>[H] has given up on life as a mortal.</span>")
 		var/T = get_turf(H)
@@ -11,7 +11,7 @@
 		var/turf/loccheck = get_turf(A)
 		if(is_reebe(loccheck.z))
 			user.visible_message("<span class='warning'>An unseen force knocks [user] to the ground!</span>", "<span class='big_brass'>\"I think not!\"</span>")
-			user.Knockdown(60)
+			user.DefaultCombatKnockdown(60)
 			return
 		if(istype(loccheck.loc, /area/fabric_of_reality))
 			to_chat(user, "<span class='danger'>You can't do that here!</span>")
@@ -25,7 +25,7 @@
 			for(var/mob/living/M in T)
 				if(M.movement_type & FLYING)
 					M.visible_message("<span class='danger'>The bluespace collapse crushes the air towards it, pulling [M] towards the ground...</span>")
-					M.Knockdown(5, TRUE, TRUE)		//Overrides stun absorbs.
+					M.DefaultCombatKnockdown(5, TRUE, TRUE)		//Overrides stun absorbs.
 			T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic)
 		for (var/obj/structure/ladder/unbreakable/binary/ladder in GLOB.ladders)
 			ladder.ActivateAlmonds()
@@ -409,7 +409,7 @@

 /datum/component/storage/proc/check_views()
 	for(var/mob/M in can_see_contents())
-		if(!isobserver(M) && !M.CanReach(src, view_only = TRUE))
+		if(!isobserver(M) && !M.CanReach(parent, view_only = TRUE))
 			close(M)

 /datum/component/storage/proc/emp_act(datum/source, severity)
@@ -26,10 +26,10 @@
 /datum/proc/vv_get_dropdown()
 	. = list()
 	. += "---"
-	.["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=[REF(src)]"
-	.["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=[REF(src)]"
-	.["Delete"] = "?_src_=vars;[HrefToken()];delete=[REF(src)]"
-	.["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=[REF(src)]"
+	.["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]"
+	.["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]"
+	.["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]"
+	.["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]"


 /datum/proc/on_reagent_change(changetype)
@@ -54,7 +54,7 @@
 		return

 	var/title = ""
-	var/refid = REF(D)
+	var/refid = "\ref[D]"
 	var/icon/sprite
 	var/hash

@@ -62,8 +62,6 @@
 	if (!islist)
 		type = D.type

-
-
 	if(istype(D, /atom))
 		var/atom/AT = D
 		if(AT.icon && AT.icon_state)
@@ -410,7 +408,7 @@


 /client/proc/vv_update_display(datum/D, span, content)
-	src << output("[span]:[content]", "variables[REF(D)].browser:replace_span")
+	src << output("[span]:[content]", "variables\ref[D].browser:replace_span")


 #define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing )
@@ -423,9 +421,9 @@
 				name = DA[name] //name is really the index until this line
 			else
 				value = DA[name]
-			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];listedit=[REF(DA)];index=[index]'>E</a>) (<a href='?_src_=vars;[HrefToken()];listchange=[REF(DA)];index=[index]'>C</a>) (<a href='?_src_=vars;[HrefToken()];listremove=[REF(DA)];index=[index]'>-</a>) "
+			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];listedit=\ref[DA];index=[index]'>E</a>) (<a href='?_src_=vars;[HrefToken()];listchange=\ref[DA];index=[index]'>C</a>) (<a href='?_src_=vars;[HrefToken()];listremove=\ref[DA];index=[index]'>-</a>) "
 		else
-			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];datumedit=[REF(DA)];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;[HrefToken()];datumchange=[REF(DA)];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;[HrefToken()];datummass=[REF(DA)];varnamemass=[name]'>M</a>) "
+			header = "<li style='backgroundColor:white'>(<a href='?_src_=vars;[HrefToken()];datumedit=\ref[DA];varnameedit=[name]'>E</a>) (<a href='?_src_=vars;[HrefToken()];datumchange=\ref[DA];varnamechange=[name]'>C</a>) (<a href='?_src_=vars;[HrefToken()];datummass=\ref[DA];varnamemass=[name]'>M</a>) "
 	else
 		header = "<li>"

@@ -440,7 +438,7 @@
 		#ifdef VARSICON
 		var/icon/I = new/icon(value)
 		var/rnd = rand(1,10000)
-		var/rname = "tmp[REF(I)][rnd].png"
+		var/rname = "tmp\ref[I][rnd].png"
 		usr << browse_rsc(I, rname)
 		item = "[VV_HTML_ENCODE(name)] = (<span class='value'>[value]</span>) <img class=icon src=\"[rname]\">"
 		#else
@@ -453,9 +451,9 @@
 	else if (istype(value, /datum))
 		var/datum/D = value
 		if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D] [D.type]"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D] [D.type]"
 		else
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D.type]"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] [REF(value)]</a> = [D.type]"

 	else if (islist(value))
 		var/list/L = value
@@ -473,9 +471,9 @@

 				items += debug_variable(key, val, level + 1, sanitize = sanitize)

-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a><ul>[items.Join()]</ul>"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a><ul>[items.Join()]</ul>"
 		else
-			item = "<a href='?_src_=vars;[HrefToken()];Vars=[REF(value)]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a>"
+			item = "<a href='?_src_=vars;[HrefToken()];Vars=\ref[value]'>[VV_HTML_ENCODE(name)] = /list ([L.len])</a>"

 	else if (name in GLOB.bitfields)
 		var/list/flags = list()
@@ -587,7 +585,7 @@
 		var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No")
 		if (prompt != "Yes" || !usr.client)
 			return
-		message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a <a href='?_src_=vars;[HrefToken(TRUE)];datumrefresh=[REF(thing)]'>VV window</a>")
+		message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a <a href='?_src_=vars;[HrefToken(TRUE)];datumrefresh=\ref[thing]'>VV window</a>")
 		log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [thing]")
 		to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window")
 		C.debug_variables(thing)
@@ -21,7 +21,7 @@
 		return FALSE


-	if(!(type in D.viable_mobtypes))
+	if(!D.viable_mobtypes[type])
 		return FALSE

 	return TRUE
@@ -18,7 +18,7 @@
 	var/stage_prob = 4

 	//Other
-	var/list/viable_mobtypes = list() //typepaths of viable mobs
+	var/list/viable_mobtypes = list() //typecache of viable mobs
 	var/mob/living/carbon/affected_mob = null
 	var/list/cures = list() //list of cures if the disease has the CURABLE flag, these are reagent ids
 	var/infectivity = 65
@@ -34,6 +34,10 @@
 	var/process_dead = FALSE //if this ticks while the host is dead
 	var/copy_type = null //if this is null, copies will use the type of the instance being copied

+/datum/disease/New(make_typecache = TRUE)
+	if(make_typecache && length(viable_mobtypes))
+		viable_mobtypes = typecacheof(viable_mobtypes)
+
 /datum/disease/Destroy()
 	. = ..()
 	if(affected_mob)
@@ -80,7 +80,8 @@

 */

-/datum/disease/advance/New()
+/datum/disease/advance/New(make_typecache = TRUE)
+	..()
 	Refresh()

 /datum/disease/advance/Destroy()
@@ -2,7 +2,7 @@
 /datum/disease/advance/cold
 	copy_type = /datum/disease/advance

-/datum/disease/advance/cold/New()
+/datum/disease/advance/cold/New(make_typecache = TRUE)
 	name = "Cold"
 	symptoms = list(new/datum/symptom/sneeze)
 	..()
@@ -11,7 +11,7 @@
 /datum/disease/advance/flu
 	copy_type = /datum/disease/advance

-/datum/disease/advance/flu/New()
+/datum/disease/advance/flu/New(make_typecache = TRUE)
 	name = "Flu"
 	symptoms = list(new/datum/symptom/cough)
 	..()
@@ -21,7 +21,7 @@
 	name = "Experimental Disease"
 	copy_type = /datum/disease/advance

-/datum/disease/advance/random/New(max_symptoms, max_level = 8)
+/datum/disease/advance/random/New(make_typecache = TRUE, max_symptoms, max_level = 8)
 	if(!max_symptoms)
 		max_symptoms = rand(1, VIRUS_SYMPTOM_LIMIT)
 	var/list/datum/symptom/possible_symptoms = list()
@@ -37,6 +37,6 @@
 		if(chosen_symptom)
 			var/datum/symptom/S = new chosen_symptom
 			symptoms += S
-	Refresh()

-	name = "Sample #[rand(1,10000)]"
+	name = "Sample #[rand(1,10000)]"
+	..()
@@ -279,7 +279,7 @@
 		M.emote("deathgasp")
 	M.fakedeath("regenerative_coma")
 	M.update_stat()
-	M.update_canmove()
+	M.update_mobility()
 	addtimer(CALLBACK(src, .proc/uncoma, M), 300)

 /datum/symptom/heal/coma/proc/uncoma(mob/living/M)
@@ -288,7 +288,7 @@
 	active_coma = FALSE
 	M.cure_fakedeath("regenerative_coma")
 	M.update_stat()
-	M.update_canmove()
+	M.update_mobility()

 /datum/symptom/heal/coma/Heal(mob/living/carbon/M, datum/disease/advance/A, actual_power)
 	var/heal_amt = 4 * actual_power
@@ -44,7 +44,7 @@
 					if(prob(25))
 						affected_mob.vomit(95)
 					H.emote("cough")
-					H.Knockdown(40)
+					H.DefaultCombatKnockdown(40)
 					H.losebreath += 4
 				if(prob(3))
 					to_chat(H, "<span class='danger'>You feel very weak and dizzy...</span>")
@@ -13,7 +13,7 @@
 	stage_prob = 2
 	var/restcure = 0

-/datum/disease/dna_retrovirus/New()
+/datum/disease/dna_retrovirus/New(make_typecache = TRUE)
 	..()
 	agent = "Virus class [pick("A","B","C","D","E","F")][pick("A","B","C","D","E","F")]-[rand(50,300)]"
 	if(prob(40))
@@ -301,7 +301,7 @@
 	unique_enzymes = generate_unique_enzymes()
 	uni_identity = generate_uni_identity()
 	generate_dna_blocks()
-	features = random_features()
+	features = random_features(species?.id)


 /datum/dna/stored //subtype used by brain mob's stored_dna
@@ -17,7 +17,8 @@
 			penalty += roundstart_quit_limit - world.time
 		if(penalty)
 			penalty += world.realtime
-			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+			var/maximumRoundEnd = SSautotransfer.starttime + SSautotransfer.voteinterval * SSautotransfer.maxvotes
+			if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 				penalty = CANT_REENTER_ROUND
 			if(!(M.ckey in timeouts))
 				timeouts += M.ckey
@@ -150,7 +150,8 @@
 		L.forceMove(get_turf(L))
 		L.reset_perspective()
 		L.setDir(SOUTH)
-	qdel(src)
+	if(!QDELETED(src))
+		qdel(src)

 /obj/item/clothing/head/mob_holder/relaymove(mob/user)
 	return
@@ -0,0 +1,18 @@
+/datum/element/sword_point
+	element_flags = ELEMENT_DETACH
+
+/datum/element/sword_point/Attach(datum/target)
+	. = ..()
+	if(. == ELEMENT_INCOMPATIBLE)
+		return
+	if(!istype(target))
+		return ELEMENT_INCOMPATIBLE
+	RegisterSignal(target, COMSIG_ITEM_ALT_AFTERATTACK, .proc/point)
+
+/datum/element/sword_point/Detach(datum/source)
+	. = ..()
+	UnregisterSignal(source, COMSIG_ITEM_ALT_AFTERATTACK)
+
+/datum/element/sword_point/proc/point(datum/source, atom/target, mob/user, proximity_flag, params)
+	if(!proximity_flag && ismob(target))
+		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
@@ -0,0 +1,10 @@
+//Prevents calling anything in update_icon() like update_icon_state() or update_overlays()
+
+/datum/element/update_icon_blocker/Attach(datum/target)
+	. = ..()
+	if(!istype(target, /atom))
+		return ELEMENT_INCOMPATIBLE
+	RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon)
+
+/datum/element/update_icon_blocker/proc/block_update_icon()
+	return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
@@ -0,0 +1,16 @@
+//update_icon() may change the onmob icons
+//Very good name, I know
+
+/datum/element/update_icon_updates_onmob/Attach(datum/target)
+	. = ..()
+	if(!istype(target, /obj/item))
+		return ELEMENT_INCOMPATIBLE
+	RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/update_onmob)
+
+/datum/element/update_icon_updates_onmob/proc/update_onmob(obj/item/target)
+	if(ismob(target.loc))
+		var/mob/M = target.loc
+		if(M.is_holding(target))
+			M.update_inv_hands()
+		else
+			M.regenerate_icons() //yeah this is shit, but we don't know which update_foo() proc to call instead so we'll call them all
@@ -118,7 +118,8 @@
 				if(DEAD)
 					to_chat(user, "<span class='notice'>You cannot [key] while dead.</span>")
 			return FALSE
-		if(restraint_check && (user.IsStun() || user.IsKnockdown()))
+		var/mob/living/L = user
+		if(restraint_check && (istype(L) && !CHECK_MOBILITY(L, MOBILITY_USE)))
 			if(!intentional)
 				return FALSE
 			to_chat(user, "<span class='notice'>You cannot [key] while stunned.</span>")
@@ -42,19 +42,19 @@
 /datum/martial_art/cqc/proc/Slam(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
-	if(!D.stat || !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] slams [D] into the ground!</span>", \
 						  	"<span class='userdanger'>[A] slams you into the ground!</span>")
 		playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, 1, -1)
 		D.apply_damage(10, BRUTE)
-		D.Knockdown(120)
+		D.DefaultCombatKnockdown(120)
 		log_combat(A, D, "slammed (CQC)")
 	return TRUE

 /datum/martial_art/cqc/proc/Kick(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!can_use(A))
 		return FALSE
-	if(!D.stat || !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] kicks [D] back!</span>", \
 							"<span class='userdanger'>[A] kicks you back!</span>")
 		playsound(get_turf(A), 'sound/weapons/cqchit1.ogg', 50, 1, -1)
@@ -62,7 +62,7 @@
 		D.throw_at(throw_target, 1, 14, A)
 		D.apply_damage(10, BRUTE)
 		log_combat(A, D, "kicked (CQC)")
-	if(D.IsKnockdown() && !D.stat)
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND) && CHECK_MOBILITY(D, MOBILITY_USE))
 		log_combat(A, D, "knocked out (Head kick)(CQC)")
 		D.visible_message("<span class='warning'>[A] kicks [D]'s head, knocking [D.p_them()] out!</span>", \
 					  		"<span class='userdanger'>[A] kicks your head, knocking you out!</span>")
@@ -119,7 +119,7 @@
 		D.grabbedby(A, 1)
 		if(old_grab_state == GRAB_PASSIVE)
 			D.drop_all_held_items()
-			A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
+			A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent
 			log_combat(A, D, "grabbed", addition="aggressively")
 			D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
 								"<span class='userdanger'>[A] violently grabs you!</span>")
@@ -136,7 +136,7 @@
 	A.do_attack_animation(D)
 	var/picked_hit_type = pick("CQC'd", "Big Bossed")
 	var/bonus_damage = 13
-	if(D.IsKnockdown() || D.resting || D.lying)
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND))
 		bonus_damage += 5
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)
@@ -147,12 +147,12 @@
 	D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
 					  "<span class='userdanger'>[A] [picked_hit_type] you!</span>")
 	log_combat(A, D, "[picked_hit_type] (CQC)")
-	if(A.resting && !D.stat && !D.IsKnockdown())
+	if(!CHECK_MOBILITY(A, MOBILITY_STAND) && !D.stat && CHECK_MOBILITY(D, MOBILITY_STAND))
 		D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \
 							"<span class='userdanger'>[A] leg sweeps you!</span>")
 		playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1)
 		D.apply_damage(10, BRUTE)
-		D.Knockdown(60)
+		D.DefaultCombatKnockdown(60)
 		log_combat(A, D, "sweeped (CQC)")
 	return TRUE

@@ -164,7 +164,7 @@
 	if(check_streak(A,D))
 		return TRUE
 	if(prob(65))
-		if(!D.stat || !D.IsKnockdown() || !restraining)
+		if(CHECK_MOBILITY(D, MOBILITY_MOVE) || !restraining)
 			I = D.get_active_held_item()
 			D.visible_message("<span class='warning'>[A] strikes [D]'s jaw with their hand!</span>", \
 								"<span class='userdanger'>[A] strikes your jaw, disorienting you!</span>")
@@ -185,7 +185,7 @@
 		D.SetSleeping(400)
 		restraining = FALSE
 		if(A.grab_state < GRAB_NECK)
-			A.grab_state = GRAB_NECK
+			A.setGrabState(GRAB_NECK)
 	else
 		restraining = FALSE
 		return FALSE
@@ -96,13 +96,13 @@
 	return 0

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

@@ -138,7 +138,7 @@
 	log_combat(A, D, "punched")
 	var/picked_hit_type = pick("punches", "kicks")
 	var/bonus_damage = 10
-	if(D.IsKnockdown() || D.resting || D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		bonus_damage += 5
 		picked_hit_type = "stomps on"
 	D.apply_damage(bonus_damage, BRUTE)
@@ -16,7 +16,7 @@
 	playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -1)
 	var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 	D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
-	D.Knockdown(20)
+	D.DefaultCombatKnockdown(20)
 	if(atk_verb)
 		log_combat(A, D, "[atk_verb] (Mushroom Punch)")
 	return TRUE
@@ -34,10 +34,10 @@
 						log_combat(A, D, "grabbed", addition="aggressively")
 						D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
 						  "<span class='userdanger'>[A] violently grabs you!</span>")
-						A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
+						A.setGrabState(GRAB_AGGRESSIVE) //Instant aggressive grab
 					else
 						log_combat(A, D, "grabbed", addition="passively")
-						A.grab_state = GRAB_PASSIVE
+						A.setGrabState(GRAB_PASSIVE)
 		if(4)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = "headbutts"
@@ -49,7 +49,7 @@
 			if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
 				D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
 			A.Stun(rand(10,45))
-			D.Knockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
+			D.DefaultCombatKnockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
 		if(5,6)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = pick("punches", "kicks", "hits", "slams into")
@@ -59,7 +59,7 @@
 			playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -1)
 			var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 			D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
-			D.Knockdown(60)
+			D.DefaultCombatKnockdown(60)
 		if(7,8)
 			basic_hit(A,D)

@@ -1,6 +1,8 @@
-#define SIDE_KICK_COMBO "DH"
+#define REPULSE_PUNCH_COMBO "HDHD"
 #define SHOULDER_FLIP_COMBO "GHDGHH"
 #define FOOT_SMASH_COMBO "HH"
+#define SIDE_KICK_COMBO "skick"
+#define DEFT_SWITCH_COMBO "deft"

 /datum/martial_art/the_rising_bass
 	name = "The Rising Bass"
@@ -8,7 +10,7 @@
 	dodge_chance = 100
 	allow_temp_override = FALSE
 	help_verb = /mob/living/carbon/human/proc/rising_bass_help
-	var/datum/action/risingbassmove/repulsepunch = new/datum/action/risingbassmove/repulsepunch()
+	var/datum/action/risingbassmove/sidekick = new/datum/action/risingbassmove/sidekick()
 	var/datum/action/risingbassmove/deftswitch = new/datum/action/risingbassmove/deftswitch()
 	var/repulsecool = 0

@@ -21,7 +23,7 @@
 		streak = ""
 		shoulderFlip(A,D)
 		return 1
-	if(findtext(streak,"rplse"))
+	if(findtext(streak,REPULSE_PUNCH_COMBO))
 		streak = ""
 		repulsePunch(A,D)
 		return 1
@@ -29,7 +31,7 @@
 		streak = ""
 		footSmash(A,D)
 		return 1
-	if(findtext(streak,"deft"))
+	if(findtext(streak,DEFT_SWITCH_COMBO))
 		streak = ""
 		deftSwitch(A,D)
 		return 1
@@ -58,42 +60,46 @@
 		to_chat(H,"<span class='danger'>You get ready to use the [name] maneuver!</span>")
 		H.mind.martial_art.streak = "[movestreak]"

-/datum/action/risingbassmove/repulsepunch
-	name = "Repulse Punch"
-	button_icon_state = "repulsepunch"
-	movestreak = "rplse"
+/datum/action/risingbassmove/sidekick
+	name = "Side Kick"
+	button_icon_state = "sidekick"
+	movestreak = "skick"

 /datum/action/risingbassmove/deftswitch
 	name = "Deft Switch"
 	button_icon_state = "deftswitch"
 	movestreak = "deft"

+/datum/martial_art/the_rising_bass/proc/checkfordensity(turf/T,mob/M)
+	if (T.density)
+		return FALSE
+	for(var/obj/O in T)
+		if(!O.CanPass(M,T))
+			return FALSE
+	return TRUE

 /datum/martial_art/the_rising_bass/proc/sideKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || D.lying == 0)
-		var/turf/H = get_step(D, A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH))
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
+		var/dir = A.dir & (NORTH | SOUTH) ? pick(EAST, WEST) : pick(NORTH, SOUTH)
+		var/oppdir = dir == NORTH ? SOUTH : dir == SOUTH ? NORTH : dir == EAST ? WEST : EAST
+		var/turf/H = get_step(D, dir)
+		var/turf/K = get_step(D, oppdir)
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the side, sliding them over!</span>", \
 						  "<span class='userdanger'>[A] kicks you in the side, forcing you to step away!</span>")
 		playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
 		D.apply_damage(5, BRUTE, BODY_ZONE_CHEST)
-		D.Knockdown(60)
-		var/L = H
-		for(var/obj/i in H.contents)
-			if(!istype(i,/mob) && i.density == 1)
-				L = D.loc
+		D.DefaultCombatKnockdown(60)
+		var/L = !checkfordensity(H,D) ? (!checkfordensity(K,D) ? D.loc : K) : H
 		D.forceMove(L)
 		log_combat(A, D, "side kicked (Rising Bass)")
-		return 1
+		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_rising_bass/proc/shoulderFlip(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		var/turf/H = get_step(A, get_dir(D,A))
-		var/L = H
-		for(var/obj/i in H.contents)
-			if(!istype(i,/mob) && i.density == 1)//(i.anchored == 1 && i.density == 1) || istype(i,/obj/structure) || istype(i,/turf/closed)
-				L = A.loc
+		var/L = checkfordensity(H,D) ? H : A.loc
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] flips [D] over their shoulder, slamming them into the ground!</span>", \
 						  "<span class='userdanger'>[A] flips you over their shoulder, slamming you into the ground!</span>")
@@ -102,14 +108,14 @@
 		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
 		D.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
 		D.Sleeping(60)
-		D.Knockdown(300)
+		D.DefaultCombatKnockdown(300)
 		D.forceMove(L)
 		log_combat(A, D, "shoulder flipped (Rising Bass)")
-		return 1
+		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying || repulsecool > world.time)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND) && repulsecool < world.time)
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] smashes [D] in the chest, throwing them away!</span>", \
 						  "<span class='userdanger'>[A] smashes you in the chest, repelling you away!</span>")
@@ -117,14 +123,14 @@
 		var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A)))
 		D.throw_at(F, 10, 1)
 		D.apply_damage(10, BRUTE, BODY_ZONE_CHEST)
-		D.Knockdown(90)
+		D.DefaultCombatKnockdown(90)
 		log_combat(A, D, "repulse punched (Rising Bass)")
 		repulsecool = world.time + 3 SECONDS
-		return 1
+		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_rising_bass/proc/footSmash(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] smashes their foot down on [D]'s foot!</span>", \
 						  "<span class='userdanger'>[A] smashes your foot!</span>")
@@ -132,11 +138,11 @@
 		D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
 		D.dropItemToGround(D.get_active_held_item())
 		log_combat(A, D, "foot smashed (Rising Bass)")
-		return 1
+		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_rising_bass/proc/deftSwitch(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.IsKnockdown() || !D.lying)
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		if (D.get_active_held_item())
 			var/obj/item/G = D.get_active_held_item()
 			if (G && !(G.item_flags & (ABSTRACT|DROPDEL)) && D.temporarilyRemoveItemFromInventory(G))
@@ -144,10 +150,10 @@
 				D.visible_message("<span class='warning'>[A] slaps [D]'s hands, taking [G] from them!</span>", \
 					"<span class='userdanger'>[A] slaps you, taking [G] from you!</span>")
 				log_combat(A, D, "deft switched (Rising Bass)")
-				return 1
+				return TRUE
 			else
 				to_chat(A, "<i>[G] can't be taken out of [D]'s hands!</i>")
-	return 0
+	return FALSE

 /datum/martial_art/the_rising_bass/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	add_to_streak("D",D)
@@ -168,7 +174,7 @@
 	return ..()

 /datum/martial_art/the_rising_bass/add_to_streak(element,mob/living/carbon/human/D)
-	if (streak == "deft" || streak == "rplse")
+	if (streak == DEFT_SWITCH_COMBO || streak == SIDE_KICK_COMBO)
 		return
 	. = ..()

@@ -179,24 +185,24 @@

 	to_chat(usr, "<b><i>You retreat inward and recall the teachings of the Rising Bass...</i></b>")

-	to_chat(usr, "<span class='notice'>Side Kick</span>: Disarm Harm. Forces opponent to step to the side.")
+	to_chat(usr, "<span class='notice'>Side Kick</span>: Forces opponent to step to the side.")
 	to_chat(usr, "<span class='notice'>Shoulder Flip</span>: Grab Harm Disarm Grab Harm Harm. Flips opponent over your shoulder and stuns.")
-	to_chat(usr, "<span class='notice'>Repulse Punch</span>: Grab Harm Grab Harm. Slams the opponent far away from you.")
+	to_chat(usr, "<span class='notice'>Repulse Punch</span>: Harm Disarm Harm Disarm. Slams the opponent far away from you.")
 	to_chat(usr, "<span class='notice'>Foot Smash</span>: Harm Harm. Stuns opponent, minor damage.")
-	to_chat(usr, "<span class='notice'>Deft Switch</span>: Grab Disarm Disarm. Switches the opponent's held item for your own. Most useful with nothing in your hand.")
+	to_chat(usr, "<span class='notice'>Deft Switch</span>: Switches the opponent's held item for your own. Most useful with nothing in your hand.")

 /datum/martial_art/the_rising_bass/teach(mob/living/carbon/human/H, make_temporary = FALSE)
 	. = ..()
 	if(!.)
 		return
 	deftswitch.Grant(H)
-	repulsepunch.Grant(H)
+	sidekick.Grant(H)
 	ADD_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
 	ADD_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)

 /datum/martial_art/the_rising_bass/on_remove(mob/living/carbon/human/H)
 	. = ..()
 	deftswitch.Remove(H)
-	repulsepunch.Remove(H)
+	sidekick.Remove(H)
 	REMOVE_TRAIT(H, TRAIT_NOGUNS, RISING_BASS_TRAIT)
-	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_AUTO_CATCH_ITEM, RISING_BASS_TRAIT)
@@ -37,7 +37,7 @@
 	return FALSE

 /datum/martial_art/the_sleeping_carp/proc/wristWrench(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsStun() && !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_USE))
 		log_combat(A, D, "wrist wrenched (Sleeping Carp)")
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] grabs [D]'s wrist and wrenches it sideways!</span>", \
@@ -46,19 +46,19 @@
 		D.emote("scream")
 		D.dropItemToGround(D.get_active_held_item())
 		D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
-		D.Knockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
+		D.DefaultCombatKnockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
 		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_sleeping_carp/proc/backKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		if(A.dir == D.dir)
 			log_combat(A, D, "back-kicked (Sleeping Carp)")
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			D.visible_message("<span class='warning'>[A] kicks [D] in the back!</span>", \
 							  "<span class='userdanger'>[A] kicks you in the back, making you stumble and fall!</span>")
 			step_to(D,get_step(D,D.dir),1)
-			D.Knockdown(80)
+			D.DefaultCombatKnockdown(80)
 			playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
 			return TRUE
 		else
@@ -68,20 +68,20 @@
 	return basic_hit(A,D)

 /datum/martial_art/the_sleeping_carp/proc/kneeStomach(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		log_combat(A, D, "stomach kneed (Sleeping Carp)")
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] knees [D] in the stomach!</span>", \
 						  "<span class='userdanger'>[A] winds you with a knee in the stomach!</span>")
 		D.audible_message("<b>[D]</b> gags!")
 		D.losebreath += 3
-		D.Knockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
+		D.DefaultCombatKnockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
 		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
 		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_sleeping_carp/proc/headKick(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(!D.stat && !D.IsKnockdown())
+	if(CHECK_MOBILITY(D, MOBILITY_STAND))
 		log_combat(A, D, "head kicked (Sleeping Carp)")
 		A.do_attack_animation(D, ATTACK_EFFECT_KICK)
 		D.visible_message("<span class='warning'>[A] kicks [D] in the head!</span>", \
@@ -89,12 +89,12 @@
 		D.apply_damage(20, BRUTE, BODY_ZONE_HEAD)
 		D.drop_all_held_items()
 		playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
-		D.Knockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
+		D.DefaultCombatKnockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
 		return TRUE
 	return basic_hit(A,D)

 /datum/martial_art/the_sleeping_carp/proc/elbowDrop(mob/living/carbon/human/A, mob/living/carbon/human/D)
-	if(D.IsKnockdown() || D.resting || D.stat)
+	if(!CHECK_MOBILITY(D, MOBILITY_STAND))
 		log_combat(A, D, "elbow dropped (Sleeping Carp)")
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] elbow drops [D]!</span>", \
@@ -115,7 +115,7 @@
 		D.grabbedby(A, 1)
 		if(old_grab_state  == GRAB_PASSIVE)
 			D.drop_all_held_items()
-			A.grab_state = GRAB_AGGRESSIVE //Instant agressive grab if on grab intent
+			A.setGrabState(GRAB_AGGRESSIVE) //Instant agressive grab if on grab intent
 			log_combat(A, D, "grabbed", addition="aggressively")
 			D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
 			  "<span class='userdanger'>[A] violently grabs you!</span>")
@@ -134,7 +134,7 @@
 	playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1)
 	if(prob(D.getBruteLoss()) && !D.lying)
 		D.visible_message("<span class='warning'>[D] stumbles and falls!</span>", "<span class='userdanger'>The blow sends you to the ground!</span>")
-		D.Knockdown(80)
+		D.DefaultCombatKnockdown(80)
 	log_combat(A, D, "[atk_verb] (Sleeping Carp)")
 	return TRUE

@@ -192,7 +192,7 @@
 	add_fingerprint(user)
 	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)
+		user.DefaultCombatKnockdown(60)
 		if(ishuman(user))
 			var/mob/living/carbon/human/H = user
 			H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD)
@@ -226,7 +226,7 @@
 		if(prob(10))
 			H.visible_message("<span class='warning'>[H] collapses!</span>", \
 								   "<span class='userdanger'>Your legs give out!</span>")
-			H.Knockdown(80)
+			H.DefaultCombatKnockdown(80)
 		if(H.staminaloss && !H.IsSleeping())
 			var/total_health = (H.health - H.staminaloss)
 			if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
@@ -207,7 +207,7 @@
 		if (T && isturf(T))
 			if (!D.stat)
 				D.emote("scream")
-			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/Knockdown, 20))
+			D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/DefaultCombatKnockdown, 20))
 	log_combat(A, D, "has thrown with wrestling")
 	return 0

@@ -303,7 +303,7 @@
 		playsound(A.loc, "swing_hit", 50, 1)
 		if (!D.stat)
 			D.emote("scream")
-			D.Knockdown(40)
+			D.DefaultCombatKnockdown(40)

 			switch(rand(1,3))
 				if (2)
@@ -361,7 +361,7 @@

 	var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 	if (T && isturf(T))
-		D.Knockdown(20)
+		D.DefaultCombatKnockdown(20)
 		D.throw_at(T, 3, 2)
 	log_combat(A, D, "roundhouse-kicked")

@@ -400,7 +400,7 @@
 			if (falling == 1)
 				A.visible_message("<span class = 'danger'><B>...and dives head-first into the ground, ouch!</b></span>")
 				A.adjustBruteLoss(rand(10,20))
-				A.Knockdown(60)
+				A.DefaultCombatKnockdown(60)
 			to_chat(A, "[D] is too far away!")
 			return 0

@@ -429,7 +429,7 @@
 		else
 			D.adjustBruteLoss(rand(20,30))

-		D.Knockdown(40)
+		D.DefaultCombatKnockdown(40)

 		A.pixel_y = 0

@@ -41,20 +41,21 @@ Simple datum which is instanced once per type and is used for every object of sa

 ///This proc is called when the material is added to an object specifically.
 /datum/material/proc/on_applied_obj(var/obj/o, amount, material_flags)
-	var/new_max_integrity = CEILING(o.max_integrity * integrity_modifier, 1)
-	o.modify_max_integrity(new_max_integrity)
-	o.force *= strength_modifier
-	o.throwforce *= strength_modifier
+	if(material_flags & MATERIAL_AFFECT_STATISTICS)
+		var/new_max_integrity = CEILING(o.max_integrity * integrity_modifier, 1)
+		o.modify_max_integrity(new_max_integrity)
+		o.force *= strength_modifier
+		o.throwforce *= strength_modifier

-	var/list/temp_armor_list = list() //Time to add armor modifiers!
+		var/list/temp_armor_list = list() //Time to add armor modifiers!

-	if(!istype(o.armor))
-		return
-	var/list/current_armor = o.armor?.getList()
+		if(!istype(o.armor))
+			return
+		var/list/current_armor = o.armor?.getList()

-	for(var/i in current_armor)
-		temp_armor_list[i] = current_armor[i] * armor_modifiers[i]
-	o.armor = getArmor(arglist(temp_armor_list))
+		for(var/i in current_armor)
+			temp_armor_list[i] = current_armor[i] * armor_modifiers[i]
+		o.armor = getArmor(arglist(temp_armor_list))

 ///This proc is called when the material is removed from an object.
 /datum/material/proc/on_removed(atom/source, material_flags)
@@ -71,7 +72,8 @@ Simple datum which is instanced once per type and is used for every object of sa

 ///This proc is called when the material is removed from an object specifically.
 /datum/material/proc/on_removed_obj(var/obj/o, amount, material_flags)
-	var/new_max_integrity = initial(o.max_integrity)
-	o.modify_max_integrity(new_max_integrity)
-	o.force = initial(o.force)
-	o.throwforce = initial(o.throwforce)
+	if(material_flags & MATERIAL_AFFECT_STATISTICS)
+		var/new_max_integrity = initial(o.max_integrity)
+		o.modify_max_integrity(new_max_integrity)
+		o.force = initial(o.force)
+		o.throwforce = initial(o.throwforce)
@@ -617,6 +617,10 @@
 	if(!(has_antag_datum(/datum/antagonist/traitor)))
 		add_antag_datum(/datum/antagonist/traitor)

+/datum/mind/proc/make_Contractor_Support()
+	if(!(has_antag_datum(/datum/antagonist/traitor/contractor_support)))
+		add_antag_datum(/datum/antagonist/traitor/contractor_support)
+
 /datum/mind/proc/make_Changeling()
 	var/datum/antagonist/changeling/C = has_antag_datum(/datum/antagonist/changeling)
 	if(!C)
@@ -243,6 +243,11 @@
 	description = "<span class='boldwarning'>I have been scorched by the unforgiving rays of the sun.</span>\n"
 	mood_change = -6
 	timeout = 15 MINUTES
+
+/datum/mood_event/bloodsucker_disgust
+	description = "<span class='boldwarning'>Something I recently ate was horrifyingly disgusting.</span>\n"
+	mood_change = -5
+	timeout = 5 MINUTES
 	
 /datum/mood_event/nanite_sadness
 	description = "<span class='warning robot'>+++++++HAPPINESS SUPPRESSION+++++++</span>\n"
@@ -11,7 +11,7 @@
 /datum/progressbar/New(mob/User, goal_number, atom/target)
 	. = ..()
 	if (!istype(target))
-		EXCEPTION("Invalid target given")
+		CRASH("Invalid target given")
 	if (goal_number)
 		goal = goal_number
 	bar = image('icons/effects/progessbar.dmi', target, "prog_bar_0", HUD_LAYER)
@@ -245,4 +245,14 @@
 	suffix = "lavaland_surface_elite_tumor.dmm"
 	cost = 5
 	always_place = TRUE
-	allow_duplicates = TRUE 
+	allow_duplicates = TRUE
+
+// Mining Base
+/datum/map_template/ruin/lavaland/mining_base //THIS IS THE MINING BASE. DO NOT FUCK WITH THIS UNLESS YOU ARE 100% CERTAIN YOU KNOW WHAT YOU'RE DOING, OR THE MINING BASE WILL DISAPPEAR
+	name = "Mining Base"
+	id = "miningbase"
+	description = "The mining base that Nanotrasen uses for their mining operations."
+	suffix = "miningbase.dmm"
+	cost = 0
+	always_place = TRUE
+	unpickable = TRUE
@@ -322,3 +322,70 @@
 	suffix = "advancedlab.dmm"
 	name = "Abductor Replication Lab"
 	description = "Some scientists tried and almost succeeded to recreate abductor tools. Somewhat slower and a bit less modern than their originals, these tools are the best you can get if you aren't an alien."
+
+//Space ruins for the station z
+/datum/map_template/ruin/spacenearstation
+	prefix = "_maps/RandomRuins/SpaceRuinsStation/"
+	cost = 1
+	allow_duplicates = FALSE
+
+/datum/map_template/ruin/spacenearstation/roid1
+	id = "roid1"
+	suffix = "roid1.dmm"
+	name = "Mineable Asteroid 1"
+	description = "Mineral asteroid 1."
+	allow_duplicates = TRUE
+
+/datum/map_template/ruin/spacenearstation/roid2
+	id = "roid2"
+	suffix = "roid2.dmm"
+	name = "Crab Roid"
+	description = "Mineral asteroid. Ft. Crabs."
+
+/datum/map_template/ruin/spacenearstation/roid3
+	id = "roid3"
+	suffix = "roid3.dmm"
+	name = "Dorm Roid"
+	description = "Mineral asteroid. Ft. Dorm."
+
+/datum/map_template/ruin/spacenearstation/roid4
+	id = "roid4"
+	suffix = "roid4.dmm"
+	name = "Mineable Asteroid 2"
+	description = "Mineral asteroid 2."
+
+/datum/map_template/ruin/spacenearstation/roid5
+	id = "roid5"
+	suffix = "roid5.dmm"
+	name = "Mineable Asteroid 3"
+	description = "Mineral asteroid. Ft. Holofans."
+
+/datum/map_template/ruin/spacenearstation/roid6
+	id = "roid6"
+	suffix = "roid6.dmm"
+	name = "Mineable Asteroid 4"
+	description = "Mineral asteroid. Ft. Crashed escape pod."
+
+/datum/map_template/ruin/spacenearstation/roid7
+	id = "roid7"
+	suffix = "roid7.dmm"
+	name = "Mineable Asteroid 5"
+	description = "Mineral asteroid. Ft. Derelict space bar."
+
+/datum/map_template/ruin/spacenearstation/roid8
+	id = "roid8"
+	suffix = "roid8.dmm"
+	name = "Dead wizard Roid"
+	description = "Mineral asteroid. Ft. Dead wizard and toilet paradox bag."
+
+/datum/map_template/ruin/spacenearstation/roid9
+	id = "roid9"
+	suffix = "roid9.dmm"
+	name = "Monitoring Roid"
+	description = "Mineral asteroid. Ft. Station monitoring, syndie toolbox and erp."
+
+/datum/map_template/ruin/spacenearstation/roid10
+	id = "roid10"
+	suffix = "roid10.dmm"
+	name = "Maze Roid"
+	description = "Mineral asteroid. Ft. Brief maze."
@@ -54,10 +54,3 @@
 	id = "engine_budget"
 	suffix = "Box/Engine/budget.dmm"
 	name = "Box P.A.C.M.A.N"
-
-// Lavaland
-	// Mining Base
-/datum/map_template/ruin/station/lavaland/mining_base
-	id = "mining_public_01"
-	suffix = "Lavaland/Mining_Station/Mining_Station_Public_01.dmm"
-	name = "Public Mining Base"
@@ -287,6 +287,12 @@
 	credit_cost = 4000
 	description = "A fairly standard shuttle, though larger and slightly better equipped than the Box Station variant."

+/datum/map_template/shuttle/emergency/kilo
+	suffix = "kilo"
+	name = "Kilo Station Emergency Shuttle"
+	credit_cost = 5000
+	description = "A fully functional shuttle including a complete infirmary, storage facilties and regular amenities."
+
 /datum/map_template/shuttle/emergency/mini
 	suffix = "mini"
 	name = "Ministation emergency shuttle"
@@ -419,6 +425,11 @@
 	name = "fancy transport ferry"
 	description = "At some point, someone upgraded the ferry to have fancier flooring... and less seats."

+/datum/map_template/shuttle/ferry/kilo
+	suffix = "kilo"
+	name = "kilo transport ferry"
+	description = "Standard issue CentCom Ferry for Kilo pattern stations. Includes additional equipment and rechargers."
+
 /datum/map_template/shuttle/whiteship/box
 	suffix = "box"
 	name = "Hospital Ship"
@@ -447,6 +458,10 @@
 	suffix = "box"
 	name = "supply shuttle (Box)"

+/datum/map_template/shuttle/cargo/kilo
+	suffix = "kilo"
+	name = "supply shuttle (Kilo)"
+
 /datum/map_template/shuttle/cargo/birdboat
 	suffix = "birdboat"
 	name = "supply shuttle (Birdboat)"
@@ -481,6 +496,10 @@
 	suffix = "box"
 	name = "labour shuttle (Box)"

+/datum/map_template/shuttle/labour/kilo
+	suffix = "kilo"
+	name = "labour shuttle (Kilo)"
+
 /datum/map_template/shuttle/infiltrator/basic
 	suffix = "basic"
 	name = "basic syndicate infiltrator"
@@ -493,6 +512,10 @@
 	suffix = "delta"
 	name = "mining shuttle (Delta)"

+/datum/map_template/shuttle/mining/kilo
+	suffix = "kilo"
+	name = "mining shuttle (Kilo)"
+
 /datum/map_template/shuttle/labour/delta
 	suffix = "delta"
 	name = "labour shuttle (Delta)"
@@ -501,10 +524,18 @@
 	suffix = "meta"
 	name = "lavaland shuttle (Meta)"

+/datum/map_template/shuttle/labour/kilo
+	suffix = "kilo"
+	name = "labour shuttle (Kilo)"
+
 /datum/map_template/shuttle/arrival/delta
 	suffix = "delta"
 	name = "arrival shuttle (Delta)"

+/datum/map_template/shuttle/arrival/kilo
+	suffix = "kilo"
+	name = "arrival shuttle (Kilo)"
+
 /datum/map_template/shuttle/arrival/pubby
 	suffix = "pubby"
 	name = "arrival shuttle (Pubby)"
@@ -559,4 +590,4 @@

 /datum/map_template/shuttle/snowdin/excavation
 	suffix = "excavation"
-	name = "Snowdin Excavation Elevator"
+	name = "Snowdin Excavation Elevator"
@@ -73,8 +73,7 @@
 	owner.log_message("gained Vanguard stun immunity", LOG_ATTACK)
 	owner.add_stun_absorption("vanguard", INFINITY, 1, "'s yellow aura momentarily intensifies!", "Your ward absorbs the stun!", " radiating with a soft yellow light!")
 	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
-	owner.SetStun(0, FALSE)
-	owner.SetKnockdown(0)
+	owner.SetAllImmobility(0, FALSE)
 	owner.setStaminaLoss(0, FALSE)
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
@@ -97,7 +96,7 @@
 			if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"])
 				otheractiveabsorptions = TRUE
 		if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions)
-			owner.Knockdown(stuns_blocked)
+			owner.DefaultCombatKnockdown(stuns_blocked)
 			message_to_owner = "<span class='boldwarning'>The weight of the Vanguard's protection crashes down upon you!</span>"
 			if(stuns_blocked >= 300)
 				message_to_owner += "\n<span class='userdanger'>You faint from the exertion!</span>"
@@ -226,9 +225,8 @@
 	return ..()

 /datum/status_effect/wish_granters_gift/on_remove()
-	owner.revive(full_heal = 1, admin_revive = 1)
+	owner.revive(full_heal = TRUE, admin_revive = TRUE)
 	owner.visible_message("<span class='warning'>[owner] appears to wake from the dead, having healed all wounds!</span>", "<span class='notice'>You have regenerated.</span>")
-	owner.update_canmove()

 /obj/screen/alert/status_effect/wish_granters_gift
 	name = "Wish Granter's Immortality"
@@ -12,12 +12,12 @@
 	. = ..()
 	if(.)
 		if(updating_canmove)
-			owner.update_canmove()
+			owner.update_mobility()
 			if(needs_update_stat || issilicon(owner))
 				owner.update_stat()

 /datum/status_effect/incapacitating/on_remove()
-	owner.update_canmove()
+	owner.update_mobility()
 	if(needs_update_stat || issilicon(owner)) //silicons need stat updates in addition to normal canmove updates
 		owner.update_stat()

@@ -29,10 +29,22 @@
 /datum/status_effect/incapacitating/knockdown
 	id = "knockdown"

-/datum/status_effect/incapacitating/knockdown/tick()
+//IMMOBILIZED
+/datum/status_effect/incapacitating/immobilized
+	id = "immobilized"
+
+//PARALYZED
+/datum/status_effect/incapacitating/paralyzed
+	id = "paralyzed"
+
+/datum/status_effect/incapacitating/paralyzed/tick()
 	if(owner.getStaminaLoss())
 		owner.adjustStaminaLoss(-0.3) //reduce stamina loss by 0.3 per tick, 6 per 2 seconds

+//DAZED
+/datum/status_effect/incapacitating/dazed
+	id = "dazed"
+
 //UNCONSCIOUS
 /datum/status_effect/incapacitating/unconscious
 	id = "unconscious"
@@ -101,14 +113,16 @@
 /datum/status_effect/no_combat_mode/mesmerize/on_creation(mob/living/new_owner, set_duration)
 	. = ..()
 	ADD_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+	owner.add_movespeed_modifier("[STATUS_EFFECT_MESMERIZE]_[id]", TRUE, priority = 64, override = TRUE, multiplicative_slowdown = 5, blacklisted_movetypes = FALSE? NONE : CRAWLING)

 /datum/status_effect/no_combat_mode/mesmerize/on_remove()
 	. = ..()
 	REMOVE_TRAIT(owner, TRAIT_MUTE, "mesmerize")
+	owner.remove_movespeed_modifier("[STATUS_EFFECT_MESMERIZE]_[id]")

 /obj/screen/alert/status_effect/mesmerized
 	name = "Mesmerized"
-	desc = "You cant tear your sight from who is in front of you...Their gaze is simply too enthralling.."
+	desc = "You cant tear your sight from who is in front of you... their gaze is simply too enthralling.."
 	icon = 'icons/mob/actions/bloodsucker.dmi'
 	icon_state = "power_mez"

@@ -209,7 +223,7 @@
 	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(chargecost = 0) && number_legs)
 		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
 			if(GLOB.ratvar_awakens)
-				owner.Knockdown(20)
+				owner.DefaultCombatKnockdown(20)
 			if(iscultist(owner))
 				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_L_LEG)
 				owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_R_LEG)
@@ -556,7 +570,7 @@
 	var/old_oxyloss

 /datum/status_effect/kindle/tick()
-	owner.Knockdown(15, TRUE, FALSE, 15)
+	owner.DefaultCombatKnockdown(15, TRUE, FALSE, 15)
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
 		C.silent = max(2, C.silent)
@@ -609,6 +623,19 @@
 	icon_state = "ichorial_stain"
 	alerttooltipstyle = "clockcult"

+/datum/status_effect/electrostaff
+	id = "electrostaff"
+	alert_type = null
+	status_type = STATUS_EFFECT_REPLACE
+
+/datum/status_effect/electrostaff/on_creation(mob/living/new_owner, set_duration)
+	if(isnum(set_duration))
+		duration = set_duration
+	. = ..()
+	owner.add_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF, multiplicative_slowdown = 1, movetypes = GROUND)
+
+/datum/status_effect/electrostaff/on_remove()
+	owner.remove_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF)

 //GOLEM GANG

@@ -17,11 +17,11 @@
 		to_chat(owner, "<span class='userdanger'>You become frozen in a cube!</span>")
 	cube = icon('icons/effects/freeze.dmi', "ice_cube")
 	owner.add_overlay(cube)
-	owner.update_canmove()
+	owner.update_mobility()
 	return ..()

 /datum/status_effect/freon/tick()
-	owner.update_canmove()
+	owner.update_mobility()
 	if(can_melt && owner.bodytemperature >= BODYTEMP_NORMAL)
 		qdel(src)

@@ -31,14 +31,14 @@
 		if(!QDELETED(src))
 			to_chat(owner, "You break out of the ice cube!")
 			owner.remove_status_effect(/datum/status_effect/freon)
-			owner.update_canmove()
+			owner.update_mobility()

 /datum/status_effect/freon/on_remove()
 	if(!owner.stat)
 		to_chat(owner, "The cube melts!")
 	owner.cut_overlay(cube)
 	owner.adjust_bodytemperature(100)
-	owner.update_canmove()
+	owner.update_mobility()
 	UnregisterSignal(owner, COMSIG_LIVING_RESIST)

 /datum/status_effect/freon/watcher
@@ -106,9 +106,9 @@

 /datum/quirk/musician/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
-	var/obj/item/instrument/guitar/guitar = new(get_turf(H))
-	H.put_in_hands(guitar)
-	H.equip_to_slot(guitar, SLOT_IN_BACKPACK)
+	var/obj/item/choice_beacon/music/B = new(get_turf(H))
+	H.put_in_hands(B)
+	H.equip_to_slot(B, SLOT_IN_BACKPACK)
 	var/obj/item/musicaltuner/musicaltuner = new(get_turf(H))
 	H.put_in_hands(musicaltuner)
 	H.equip_to_slot(musicaltuner, SLOT_IN_BACKPACK)
--- a/Show More
+++ b/Show More