Merge remote-tracking branch 'upstream/master' into heretic-tweaks

2020-12-07 21:18:11 +01:00
parent ff29b7ee14 d2949c64db
commit 33e4486c53
783 changed files with 40932 additions and 10750 deletions
@@ -171,6 +171,7 @@
 #define ORGAN_SLOT_HEART_AID "heartdrive"
 #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
+#define ORGAN_SLOT_BRAIN_ROBOT_RADSHIELDING "brain_robot_radshielding"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
 #define ORGAN_SLOT_WOMB "womb"
@@ -162,3 +162,6 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 		REMOVE_TRAIT(x, TRAIT_KEEP_TOGETHER, KEEP_TOGETHER_ORIGINAL);\
 	else if(!HAS_TRAIT(x, TRAIT_KEEP_TOGETHER))\
 	 	x.appearance_flags &= ~KEEP_TOGETHER
+
+/// 33554431 (2^24 - 1) is the maximum value our bitflags can reach.
+#define MAX_BITFLAG_DIGITS 8
@@ -7,4 +7,4 @@
 }\
 ##Path/CanProcCall(procname){\
 	return FALSE;\
-}
+}
@@ -11,4 +11,4 @@
 	and most importantly,
 	how to undo your changes if you screw it up.
 	- Sayu
-*/
+*/
@@ -10,4 +10,4 @@
 #define CINEMATIC_NUKE_NO_CORE 10
 #define CINEMATIC_NUKE_FAR 11
 #define CINEMATIC_NUKE_CLOWNOP 12
-#define CINEMATIC_CULT_NUKE 13
+#define CINEMATIC_CULT_NUKE 13
@@ -114,3 +114,17 @@

 //special species definitions
 #define MINIMUM_MUTANT_COLOR	"#202020" //this is how dark players mutant parts and skin can be
+
+//defines for different matrix sections
+#define MATRIX_RED			"red"
+#define MATRIX_GREEN		"green"
+#define MATRIX_BLUE			"blue"
+#define MATRIX_RED_GREEN	"red_green"
+#define MATRIX_RED_BLUE		"red_blue"
+#define MATRIX_GREEN_BLUE	"green_blue"
+#define MATRIX_ALL			"red_green_blue"
+#define MATRIX_NONE			"none"
+
+//defines for the two colour schemes, advanced and old
+#define OLD_CHARACTER_COLORING			"old_color_system"
+#define ADVANCED_CHARACTER_COLORING		"advanced_color_system"
@@ -96,4 +96,4 @@ GLOBAL_LIST_EMPTY(all_clockwork_rites) //a list containing all clockwork rites.

 #define ARK_SCREAM_COOLDOWN 300 //This much time has to pass between instances of the Ark taking damage before it will "scream" again

-#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes
+#define PRISM_DELAY_DURATION 1200 //how long prolonging prisms delay the shuttle for; defaults to 2 minutes
@@ -11,6 +11,12 @@
 #define STAMINA 	"stamina"
 #define BRAIN		"brain"

+//Toxins damage 'typeflag' - is this normal toxins damage or does it have to do with systems corruption (ROBOTIC_ORGANISM species trait)
+
+#define TOX_DEFAULT 1 //For normal toxins damage / healing (toxins, etc), adjustToxLoss() defaults to this
+#define TOX_SYSCORRUPT 2 //For toxins damage causing adverse effects to robotic organisms, up to and including fatal corruption, or healing that damage
+#define TOX_OMNI 3 //For tox damage / healing that affects both organics and robotic organisms. Used by very few things, e.g. aheals / by default setToxLoss()
+
 //bitflag damage defines used for suicide_act
 #define BRUTELOSS 		(1<<0)
 #define FIRELOSS 		(1<<1)
@@ -41,4 +41,4 @@
 #define BANISH_FUNERAL_GARB "funeral"

 #define LORE 1
-#define LAW 2
+#define LAW 2
@@ -20,4 +20,4 @@
 #define DEFAULT_TOOLTIP "6:-29,5:-2"
 //misc
 #define SOULS_TO_REVIVE 3
-#define BLOODCULT_EYE "f00"
+#define BLOODCULT_EYE "f00"
@@ -82,4 +82,4 @@
 /// combat mode is active.
 #define COMBAT_MODE_ACTIVE					(1<<1)
 /// combat mode is not active
-#define COMBAT_MODE_INACTIVE				(1<<2)
+#define COMBAT_MODE_INACTIVE				(1<<2)
@@ -13,4 +13,4 @@
 #define RemoveElement(arguments...) _RemoveElement(list(##arguments))

 /// A wrapper for _AddComponent that allows us to pretend we're using normal named arguments
-#define AddComponent(arguments...) _AddComponent(list(##arguments))
+#define AddComponent(arguments...) _AddComponent(list(##arguments))
@@ -1,7 +1,7 @@
 #define CURRENT_LIVING_PLAYERS	1
 #define CURRENT_LIVING_ANTAGS	2
 #define CURRENT_DEAD_PLAYERS	3
-#define CURRENT_OBSERVERS	    4
+#define CURRENT_OBSERVERS		4

 #define NO_ASSASSIN				(1<<0)
 #define WAROPS_ALWAYS_ALLOWED	(1<<1)
@@ -9,9 +9,11 @@
 #define FORCE_IF_WON			(1<<3)
 #define USE_PREV_ROUND_WEIGHTS	(1<<4)

-#define ONLY_RULESET       (1<<0)
-#define HIGHLANDER_RULESET (1<<1)
-#define TRAITOR_RULESET    (1<<2)
-#define MINOR_RULESET      (1<<3)
+#define ONLY_RULESET				(1<<0)
+#define HIGHLANDER_RULESET			(1<<1)
+#define TRAITOR_RULESET				(1<<2)
+#define MINOR_RULESET				(1<<3)
+#define FAKE_ANTAG_RULESET			(1<<4)
+#define ALWAYS_MAX_WEIGHT_RULESET	(1<<5)

 #define RULESET_STOP_PROCESSING 1
@@ -1,4 +1,4 @@
 #define EXPORT_CARGO 1
 #define EXPORT_EMAG 2
 #define EXPORT_CONTRABAND 4
-#define EXPORT_PIRATE 8
+#define EXPORT_PIRATE 8
@@ -2,4 +2,4 @@
 #define AFFIX_SUFFIX 		(1 << 1)

 #define AFFIX_GOOD 			(1 << 0)
-#define AFFIX_EVIL 			(1 << 1)
+#define AFFIX_EVIL 			(1 << 1)
@@ -125,7 +125,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

 #define isbot(A) (istype(A, /mob/living/simple_animal/bot))

-#define isshade(A) (istype(A, /mob/living/simple_animal/shade))
+#define isshade(A) (istype(A, /mob/living/simple_animal/hostile/construct/shade))

 #define ismouse(A) (istype(A, /mob/living/simple_animal/mouse))

@@ -188,6 +188,8 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(

 #define islandmine(A) (istype(A, /obj/effect/mine))

+#define issupplypod(A) (istype(A, /obj/structure/closet/supplypod))
+
 #define isammocasing(A) (istype(A, /obj/item/ammo_casing))

 #define isidcard(I) (istype(I, /obj/item/card/id))
@@ -66,4 +66,4 @@
 #define LOADOUT_LIMB_PROSTHETIC		"Prosthetic"
 #define LOADOUT_LIMB_AMPUTATED		"Amputated"

-#define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
+#define LOADOUT_LIMBS		 		list(LOADOUT_LIMB_NORMAL,LOADOUT_LIMB_PROSTHETIC,LOADOUT_LIMB_AMPUTATED) //you can amputate your legs/arms though
@@ -120,4 +120,4 @@

 #define CLONEPOD_GET_MIND		1
 #define CLONEPOD_POLL_MIND		2
-#define CLONEPOD_NO_MIND		3
+#define CLONEPOD_NO_MIND		3
@@ -12,4 +12,4 @@
 #define MATERIAL_ADD_PREFIX (1<<1)
 #define MATERIAL_AFFECT_STATISTICS (1<<2)

-#define MATERIAL_SOURCE(mat) "[mat.name]_material"
+#define MATERIAL_SOURCE(mat) "[mat.name]_material"
@@ -26,4 +26,4 @@
 //Misc medals
 #define MEDAL_METEOR 	"Your Life Before Your Eyes"
 #define MEDAL_PULSE 	"Jackpot"
-#define MEDAL_TIMEWASTE "Overextended The Joke"
+#define MEDAL_TIMEWASTE "Overextended The Joke"
@@ -8,4 +8,4 @@
 #define MARTIALART_KRAVMAGA "krav maga"
 #define MARTIALART_CQC "CQC"
 #define MARTIALART_PLASMAFIST "plasma fist"
-#define MARTIALART_RISINGBASS "rising bass"
+#define MARTIALART_RISINGBASS "rising bass"
@@ -1,3 +1,3 @@
 #define CHECKBOX_NONE 0
 #define CHECKBOX_GROUP 1
-#define CHECKBOX_TOGGLE 2
+#define CHECKBOX_TOGGLE 2
@@ -159,6 +159,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 #define BLOOD_COLOR_LIZARD			"#db004D"
 #define BLOOD_COLOR_UNIVERSAL		"#db3300"
 #define BLOOD_COLOR_BUG				"#a37c0f"
+#define BLOOD_COLOR_PLANT			"#3d610e"


 //suit sensors: sensor_mode defines
@@ -78,7 +78,9 @@
 #define EXP_TYPE_ADMIN			"Admin"

 //Flags in the players table in the db
-#define DB_FLAG_EXEMPT 1
+#define DB_FLAG_EXEMPT 							(1<<0)
+#define DB_FLAG_AGE_CONFIRMATION_INCOMPLETE		(1<<1)
+#define DB_FLAG_AGE_CONFIRMATION_COMPLETE		(1<<2)

 #define DEFAULT_CYBORG_NAME "Default Cyborg Name"

@@ -18,6 +18,8 @@ Ask ninjanomnom if they're around
 #define RAD_BURN_THRESHOLD 1000						// Applied radiation must be over this to burn

 #define RAD_MOB_SAFE 500							// How much stored radiation in a mob with no ill effects
+#define RAD_DEFAULT_ROBOT_SAFE 250					// Like above, except for robotic carbons. Far more susceptible to corruption from radiation.
+#define RAD_UPGRADED_ROBOT_SAFE 750					// If the robot has been upgraded via an implant, their radiation threshold is raised to be somewhat above that of organics.

 #define RAD_MOB_HAIRLOSS 800						// How much stored radiation to check for hair loss

@@ -4,4 +4,4 @@
 #define ROCKPAPERSCISSORS_LOSE				"lose"
 #define ROCKPAPERSCISSORS_WIN				"win"
 #define ROCKPAPERSCISSORS_TIE				"tie"
-#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"
+#define ROCKPAPERSCISSORS_NOT_DECIDED		"not_decided"
@@ -76,8 +76,14 @@
 #define LINGHIVE_LINK 3

 //whether the emote is visible or audible.
+// Requires sight
 #define EMOTE_VISIBLE 1
+// Requires hearing
 #define EMOTE_AUDIBLE 2
+// Requires sight or hearing
+#define EMOTE_BOTH 3
+// Always able to be seen
+#define EMOTE_OMNI 4

 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
 #define MAX_MESSAGE_LEN			2048		//Citadel edit: What's the WORST that could happen?
@@ -89,4 +95,4 @@

 // Audio/Visual Flags. Used to determine what sense are required to notice a message.
 #define MSG_VISUAL (1<<0)
-#define MSG_AUDIBLE (1<<1)
+#define MSG_AUDIBLE (1<<1)
@@ -5,6 +5,7 @@
 #define SPECIES_ANDROID				"android"
 #define SPECIES_ANGEL				"angel"
 #define SPECIES_MAMMAL				"mammal"
+#define SPECIES_ARACHNID			"arachnid"
 #define SPECIES_INSECT				"insect"
 #define SPECIES_DULLAHAN			"dullahan"
 #define SPECIES_DWARF				"dwarf"
@@ -33,7 +34,9 @@
 #define SPECIES_SYNTH				"synth"
 	#define SPECIES_SYNTH_MIL		"military_synth"
 #define SPECIES_VAMPIRE				"vampire"
+	#define SPECIES_VAMPIRE_WEAK	"vampire_roundstart"
 #define SPECIES_XENOHYBRID			"xeno"
+#define SPECIES_ZOMBIE				"zombie"

 // Species Category Defines ---------------------

@@ -45,6 +48,7 @@
 #define SPECIES_CATEGORY_PLANT		"plant"
 #define SPECIES_CATEGORY_ROBOT		"robotic"
 #define SPECIES_CATEGORY_JELLY		"jelly"
+#define SPECIES_CATEGORY_LIZARD		"lizard"
 #define SPECIES_CATEGORY_SHADOW		"shadow"
 #define SPECIES_CATEGORY_SKELETON	"skeleton"
 #define SPECIES_CATEGORY_UNDEAD		"undead"
@@ -1,6 +1,6 @@
 // tgstation-server DMAPI

-#define TGS_DMAPI_VERSION "5.2.1"
+#define TGS_DMAPI_VERSION "5.2.8"

 // All functions and datums outside this document are subject to change with any version and should not be relied on.

@@ -95,6 +95,8 @@
 #define TGS_EVENT_WATCHDOG_SHUTDOWN 15
 /// Before the watchdog detaches for a TGS update/restart. No parameters.
 #define TGS_EVENT_WATCHDOG_DETACH 16
+// We don't actually implement this value as the DMAPI can never receive it
+// #define TGS_EVENT_WATCHDOG_LAUNCH 17

 // OTHER ENUMS

@@ -127,6 +129,7 @@
  * Call this when your initializations are complete and your game is ready to play before any player interactions happen.
  *
  * This may use [/world/var/sleep_offline] to make this happen so ensure no changes are made to it while this call is running.
+  * Afterwards, consider explicitly setting it to what you want to avoid this BYOND bug: http://www.byond.com/forum/post/2575184
  * Before this point, note that any static files or directories may be in use by another server. Your code should account for this.
  * This function should not be called before ..() in [/world/proc/New].
  */
@@ -32,4 +32,4 @@
 	url_encode(json_encode(list( \
 		"type" = type, \
 		"payload" = payload, \
-	))))
+	))))
@@ -118,6 +118,8 @@
 #define TRAIT_NOLIMBDISABLE		"no_limb_disable"
 #define TRAIT_EASYLIMBDISABLE	"easy_limb_disable"
 #define TRAIT_TOXINLOVER		"toxinlover"
+#define TRAIT_ROBOTIC_ORGANISM	"robotic_organism"
+#define TRAIT_ROBOT_RADSHIELDING	"robot_radshielding"
 #define TRAIT_NOBREATH			"no_breath"
 #define TRAIT_ANTIMAGIC			"anti_magic"
 #define TRAIT_HOLY				"holy"
@@ -203,15 +205,14 @@
 #define TRAIT_THERMAL_VISION    "thermal_vision"
 #define TRAIT_NO_TELEPORT		"no-teleport" //you just can't
 #define TRAIT_NO_INTERNALS		"no-internals"
-#define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
+#define TRAIT_TOXIC_ALCOHOL		"alcohol_intolerance"
 #define TRAIT_MUTATION_STASIS			"mutation_stasis" //Prevents processed genetics mutations from processing.
 #define TRAIT_FAST_PUMP				"fast_pump"
 #define TRAIT_NO_PROCESS_FOOD	"no-process-food" // You don't get benefits from nutriment, nor nutrition from reagent consumables
 #define TRAIT_NICE_SHOT			"nice_shot" //hnnnnnnnggggg..... you're pretty good...
-/// Prevents stamina buffer regeneration
-#define TRAIT_NO_STAMINA_BUFFER_REGENERATION			"block_stamina_buffer_regen"
-/// Prevents stamina regeneration
-#define TRAIT_NO_STAMINA_REGENERATION					"block_stamina_regen"
+#define TRAIT_NO_STAMINA_BUFFER_REGENERATION			"block_stamina_buffer_regen" /// Prevents stamina buffer regeneration
+#define TRAIT_NO_STAMINA_REGENERATION					"block_stamina_regen" /// Prevents stamina regeneration
+#define TRAIT_ARMOR_BROKEN		"armor_broken" //acts as if you are wearing no clothing when taking damage, does not affect non-clothing sources of protection

 // 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)
@@ -308,6 +309,7 @@
 #define LOCKED_HELMET_TRAIT "locked-helmet"
 #define NINJA_SUIT_TRAIT "ninja-suit"
 #define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
+#define ROBOT_RADSHIELDING_IMPLANT_TRAIT "robot-radshielding-implant"
 #define MARTIAL_ARTIST_TRAIT "martial_artist"
 #define SLEEPING_CARP_TRAIT "sleeping_carp"
 #define RISING_BASS_TRAIT "rising_bass"
@@ -319,8 +321,10 @@
 #define MEGAFAUNA_TRAIT "megafauna"
 #define DEATHSQUAD_TRAIT "deathsquad"
 #define SLIMEPUDDLE_TRAIT "slimepuddle"
+#define CORRUPTED_SYSTEM "corrupted-system"
 /// This trait is added by the active directional block system.
 #define ACTIVE_BLOCK_TRAIT				"active_block"
 /// This trait is added by the parry system.
 #define ACTIVE_PARRY_TRAIT				"active_parry"
 #define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name
+#define TRAIT_SACRIFICED "sacrificed" //Makes sure that people cant be cult sacrificed twice.
@@ -3,4 +3,4 @@
 #define CHANGETURF_FORCEOP			4
 #define CHANGETURF_SKIP				8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE
 #define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR
-#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.
+#define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing.
@@ -6,4 +6,4 @@


 //Car trait flags
-#define CAN_KIDNAP 1
+#define CAN_KIDNAP 1
@@ -1,9 +1,9 @@
-#define PLURALITY_VOTING 0
-#define APPROVAL_VOTING 1
-#define SCHULZE_VOTING 2
-#define SCORE_VOTING 3
-#define MAJORITY_JUDGEMENT_VOTING 4
-#define INSTANT_RUNOFF_VOTING 5
+#define PLURALITY_VOTING "PLURALITY"
+#define APPROVAL_VOTING "APPROVAL"
+#define SCHULZE_VOTING "SCHULZE"
+#define SCORE_VOTING "SCORE"
+#define MAJORITY_JUDGEMENT_VOTING "MAJORITY_JUDGEMENT"
+#define INSTANT_RUNOFF_VOTING "IRV"

 #define SHOW_RESULTS (1<<0)
 #define SHOW_VOTES (1<<1)
@@ -26,4 +26,4 @@ GLOBAL_LIST_INIT(display_vote_settings, list(\
 "Ongoing Votes" = SHOW_VOTES,
 "Winner" =  SHOW_WINNER,
 "Abstainers" = SHOW_ABSTENTION
-))
+))
@@ -176,4 +176,4 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro
 		offset = (y-1)*4
 		for(x in 1 to 4)
 			output[offset+x] = round(A[offset+1]*B[x] + A[offset+2]*B[x+4] + A[offset+3]*B[x+8] + A[offset+4]*B[x+12]+(y==5?B[x+16]:0), 0.001)
-	return output
+	return output
@@ -94,4 +94,4 @@
 			chosen_id = input(user, "Choose a reagent to add.", "Choose a reagent.") as null|anything in subtypesof(/datum/reagent)
 		if("I'm feeling lucky")
 			chosen_id = pick(subtypesof(/datum/reagent))
-	return chosen_id
+	return chosen_id
@@ -16,4 +16,4 @@
 		SI.associative = associative

 		SI.binarySort(fromIndex, toIndex, fromIndex)
-	return L
+	return L
@@ -16,4 +16,4 @@
 		SI.associative = associative

 		SI.mergeSort(fromIndex, toIndex)
-	return L
+	return L
@@ -17,4 +17,4 @@
 		SI.associative = associative

 		SI.timSort(fromIndex, toIndex)
-	return L
+	return L
@@ -29,4 +29,4 @@ GLOBAL_LIST_EMPTY(whitelisted_species_list)

 /proc/log_looc(text)
 	if (CONFIG_GET(flag/log_ooc))
-		WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]")
+		WRITE_FILE(GLOB.world_game_log, "\[[TIME_STAMP("hh:mm:ss", FALSE)]]LOOC: [text]")
@@ -40,4 +40,4 @@ GLOBAL_LIST_EMPTY(typelistkeys)

 	for (var/saving in savings)
 		to_chat(world, "Savings for [saving]: [savings[saving]] lists, [saveditems[saving]] items")
-#endif
+#endif
@@ -54,4 +54,4 @@
 	return locate(T.x + V.x, T.y + V.y, z)

 /proc/atoms2vector(var/atom/A, var/atom/B)
-	return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B
+	return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B
@@ -131,4 +131,4 @@ GLOBAL_LIST_INIT(ratking_coins, list(//Coins: Used by the regal rat mob when spa
 			/obj/item/coin/iron,
 			/obj/item/coin/silver,
 			/obj/item/coin/plastic,
-			/obj/item/coin/titanium))
+			/obj/item/coin/titanium))
@@ -1 +1 @@
-GLOBAL_LIST_EMPTY(commendations)
+GLOBAL_LIST_EMPTY(commendations)
@@ -13,6 +13,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NEARSIGHT" = TRAIT_NEARSIGHT,
 		"TRAIT_FAT" = TRAIT_FAT,
 		"TRAIT_HUSK" = TRAIT_HUSK,
+		"TRAIT_SACRIFICED" = TRAIT_SACRIFICED,
 		"TRAIT_NOCLONE" = TRAIT_NOCLONE,
 		"TRAIT_CLUMSY" = TRAIT_CLUMSY,
 		"TRAIT_CHUNKYFINGERS" = TRAIT_CHUNKYFINGERS,
@@ -51,6 +52,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NOLIMBDISABLE" = TRAIT_NOLIMBDISABLE,
 		"TRAIT_EASYLIMBDISABLE" = TRAIT_EASYLIMBDISABLE,
 		"TRAIT_TOXINLOVER" = TRAIT_TOXINLOVER,
+		"TRAIT_ROBOTIC_ORGANISM" = TRAIT_ROBOTIC_ORGANISM,
+		"TRAIT_ROBOT_RADSHIELDING" = TRAIT_ROBOT_RADSHIELDING,
 		"TRAIT_NOBREATH" = TRAIT_NOBREATH,
 		"TRAIT_ANTIMAGIC" = TRAIT_ANTIMAGIC,
 		"TRAIT_HOLY" = TRAIT_HOLY,
@@ -101,7 +104,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_AUTO_CATCH_ITEM" = TRAIT_AUTO_CATCH_ITEM,
 		"TRAIT_FREESPRINT" = TRAIT_FREESPRINT,
 		"TRAIT_NO_INTERNALS" = TRAIT_NO_INTERNALS,
-		"TRAIT_NO_ALCOHOL" = TRAIT_NO_ALCOHOL,
+		"TRAIT_TOXIC_ALCOHOL" = TRAIT_TOXIC_ALCOHOL,
 		"TRAIT_MUTATION_STASIS" = TRAIT_MUTATION_STASIS,
 		"TRAIT_HEAVY_SLEEPER" = TRAIT_HEAVY_SLEEPER,
 		"TRAIT_LIGHT_STEP" = TRAIT_LIGHT_STEP,
@@ -34,4 +34,4 @@ function dropdowns() {
 		}
 	}
 }
-"}
+"}
@@ -24,7 +24,7 @@
  * Common mob click code
  */
 /mob/proc/CommonClickOn(atom/A, params)
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 	if(mob_transforming)
 		return
 	if(SEND_SIGNAL(src, COMSIG_MOB_CLICKON, A, params) & COMSIG_MOB_CANCEL_CLICKON)
@@ -34,7 +34,7 @@
 		FlushCurrentAction()
 	else
 		DiscardCurrentAction()
-	
+
 /*
 	Standard mob ClickOn()
 	Handles exceptions: Buildmode, middle click, modified clicks, mech actions
@@ -49,7 +49,6 @@
 	* mob/RangedAttack(atom,params) - used only ranged, only used for tk and laser eyes but could be changed
 */
 /mob/proc/ClickOn(atom/A, params)
-	SHOULD_NOT_SLEEP(TRUE)
 	if(check_click_intercept(params,A))
 		return

@@ -87,4 +87,4 @@

 	S.screen_loc = screen_l

-	screen += S
+	screen += S
@@ -36,7 +36,7 @@
 	return . | A.attack_hand(src, intent, .)

 /atom/proc/attack_hand(mob/user, act_intent = user.a_intent, attackchain_flags)
-	SHOULD_NOT_SLEEP(TRUE)
+	//SHOULD_NOT_SLEEP(TRUE)
 	if(!(interaction_flags_atom & INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND))
 		add_fingerprint(user)
 	if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_NO_ATTACK_HAND)
@@ -391,6 +391,8 @@ Example config:
 	for(var/T in storyteller_cache)
 		var/datum/dynamic_storyteller/S = T
 		var/config_tag = initial(S.config_tag)
+		if(!config_tag)
+			continue
 		var/probability = (config_tag in probabilities) ? probabilities[config_tag] : initial(S.weight)
 		var/min_players = (config_tag in min_player_counts) ? min_player_counts[config_tag] : initial(S.min_players)
 		if(probability <= 0)
@@ -509,21 +509,21 @@

 //Body size configs, the feature will be disabled if both min and max have the same value.
 /datum/config_entry/number/body_size_min
-	config_entry_value = RESIZE_DEFAULT_SIZE
+	config_entry_value = 0.9
 	min_val = 0.1 //to avoid issues with zeros and negative values.
 	max_val = RESIZE_DEFAULT_SIZE
 	integer = FALSE

 /datum/config_entry/number/body_size_max
-	config_entry_value = RESIZE_DEFAULT_SIZE
+	config_entry_value = 1.25
 	min_val = RESIZE_DEFAULT_SIZE
 	integer = FALSE

-//Pun-Pun movement slowdown given to characters with a body size smaller than this value,
+//Penalties given to characters with a body size smaller than this value,
 //to compensate for their smaller hitbox.
 //To disable, just make sure the value is lower than 'body_size_min'
-/datum/config_entry/number/threshold_body_size_slowdown
-	config_entry_value = RESIZE_DEFAULT_SIZE * 0.85
+/datum/config_entry/number/threshold_body_size_penalty
+	config_entry_value = RESIZE_DEFAULT_SIZE
 	min_val = 0
 	max_val = RESIZE_DEFAULT_SIZE
 	integer = FALSE
@@ -531,8 +531,8 @@
 //multiplicative slowdown multiplier. See 'dna.update_body_size' for the operation.
 //doesn't apply to floating or crawling mobs
 /datum/config_entry/number/body_size_slowdown_multiplier
-	config_entry_value = 0.25
-	min_val = 0.1 //To encourage folks to disable the slowdown through the above config instead.
+	config_entry_value = 0
+	min_val = 0
 	integer = FALSE

 //Allows players to set a hexadecimal color of their choice as skin tone, on top of the standard ones.
@@ -290,7 +290,7 @@
 /datum/config_entry/flag/tgstyle_maprotation

 /datum/config_entry/string/map_vote_type
-	config_entry_value = "SCORE"
+	config_entry_value = APPROVAL_VOTING

 /datum/config_entry/number/maprotatechancedelta
 	config_entry_value = 0.75
@@ -327,6 +327,9 @@
 /datum/config_entry/number/notify_new_player_account_age	// how long do we notify admins of a new byond account
 	min_val = 0

+/datum/config_entry/flag/age_verification //are we using the automated age verification which asks users if they're 18+?
+	config_entry_value = TRUE
+
 /datum/config_entry/flag/irc_first_connection_alert	// do we notify the irc channel when somebody is connecting for the first time?

 /datum/config_entry/flag/check_randomizer
@@ -5,4 +5,4 @@
 	var/discord_url = "hfdksjhfa.com"
 	var/discord_password
 	var/announce_watchlist = 0
-	var/announce_adminhelps = 0
+	var/announce_adminhelps = 0
@@ -97,4 +97,4 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe)

 /datum/controller/failsafe/stat_entry(msg)
 	msg = "Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])"
-	return msg
+	return msg
@@ -33,4 +33,4 @@ SUBSYSTEM_DEF(adjacent_air)
 			if(MC_TICK_CHECK)
 				break
 		else
-			CHECK_TICK
+			CHECK_TICK
@@ -37,4 +37,4 @@ SUBSYSTEM_DEF(autotransfer)
 	else
 		SSshuttle.autoEnd()

-#undef NO_MAXVOTES_CAP
+#undef NO_MAXVOTES_CAP
@@ -6,6 +6,12 @@ SUBSYSTEM_DEF(input)
 	priority = FIRE_PRIORITY_INPUT
 	runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY

+	/// KEEP THIS UP TO DATE!
+	var/static/list/all_macrosets = list(
+		SKIN_MACROSET_HOTKEYS,
+		SKIN_MACROSET_CLASSIC_HOTKEYS,
+		SKIN_MACROSET_CLASSIC_INPUT
+	)
 	/// Classic mode input focused macro set. Manually set because we can't define ANY or ANY+UP for classic.
 	var/static/list/macroset_classic_input
 	/// Classic mode map focused macro set. Manually set because it needs to be clientside and go to macroset_classic_input.
@@ -51,11 +57,6 @@ SUBSYSTEM_DEF(input)
 	// let's play the ascii game of A to Z (UPPERCASE)
 	for(var/i in 65 to 90)
 		classic_ctrl_override_keys += ascii2text(i)
-	// let's play the game of clientside bind overrides!
-	classic_ctrl_override_keys -= list("T", "O", "M", "L")
-	macroset_classic_input["Ctrl+T"] = "say"
-	macroset_classic_input["Ctrl+O"] = "ooc"
-	macroset_classic_input["Ctrl+L"] = "looc"
 	// let's play the list iteration game x2
 	for(var/key in classic_ctrl_override_keys)
 		// make sure to double double quote to ensure things are treated as a key combo instead of addition/semicolon logic.
@@ -67,20 +68,6 @@ SUBSYSTEM_DEF(input)

 	// FINALLY, WE CAN DO SOMETHING MORE NORMAL FOR THE SNOWFLAKE-BUT-LESS KEYSET.

-	// HAHA - SIKE. Because of BYOND weirdness (tl;dr not specifically binding this way results in potentially duplicate chatboxes when
-	//  conflicts occur with something like say indicator vs say), we're going to snowflake this anyways
-	var/list/hard_binds = list(
-		"O" = "ooc",
-		"T" = "say",
-		"L" = "looc",
-		"M" = "me"
-		)
-	var/list/hard_bind_anti_collision = list()
-	var/list/anti_collision_modifiers = list("Ctrl", "Alt", "Shift", "Ctrl+Alt", "Ctrl+Shift", "Alt+Shift", "Ctrl+Alt+Shift")
-	for(var/key in hard_binds)
-		for(var/modifier in anti_collision_modifiers)
-			hard_bind_anti_collision["[modifier]+[key]"] = ".NONSENSICAL_VERB_THAT_DOES_NOTHING"
-
 	macroset_classic_hotkey = list(
 	"Any" = "\"KeyDown \[\[*\]\]\"",
 	"Any+UP" = "\"KeyUp \[\[*\]\]\"",
@@ -89,9 +76,6 @@ SUBSYSTEM_DEF(input)
 	"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"",
 	)

-	macroset_classic_hotkey |= hard_binds
-	macroset_classic_hotkey |= hard_bind_anti_collision
-
 	// And finally, the modern set.
 	macroset_hotkey = list(
 	"Any" = "\"KeyDown \[\[*\]\]\"",
@@ -101,16 +85,12 @@ SUBSYSTEM_DEF(input)
 	"Back" = "\".winset \\\"input.text=\\\"\\\"\\\"\"",
 	)

-	macroset_hotkey |= hard_binds
-	macroset_hotkey |= hard_bind_anti_collision
-
 // Badmins just wanna have fun ♪
 /datum/controller/subsystem/input/proc/refresh_client_macro_sets()
 	var/list/clients = GLOB.clients
 	for(var/i in 1 to clients.len)
 		var/client/user = clients[i]
-		user.set_macros()
-		user.update_movement_keys()
+		user.full_macro_assert()

 /datum/controller/subsystem/input/fire()
 	var/list/clients = GLOB.clients // Let's sing the list cache song
@@ -35,4 +35,4 @@ SUBSYSTEM_DEF(minor_mapping)
 		if(locate(/obj/structure/cable) in T)
 			exposed_wires += T

-	return shuffle(exposed_wires)
+	return shuffle(exposed_wires)
@@ -50,17 +50,20 @@ PROCESSING_SUBSYSTEM_DEF(circuit)
 		/obj/item/electronic_assembly/simple,
 		/obj/item/electronic_assembly/hook,
 		/obj/item/electronic_assembly/pda,
+		/obj/item/electronic_assembly/dildo,
 		/obj/item/electronic_assembly/small/default,
 		/obj/item/electronic_assembly/small/cylinder,
 		/obj/item/electronic_assembly/small/scanner,
 		/obj/item/electronic_assembly/small/hook,
 		/obj/item/electronic_assembly/small/box,
+		/obj/item/electronic_assembly/small/dildo,
 		/obj/item/electronic_assembly/medium/default,
 		/obj/item/electronic_assembly/medium/box,
 		/obj/item/electronic_assembly/medium/clam,
 		/obj/item/electronic_assembly/medium/medical,
 		/obj/item/electronic_assembly/medium/gun,
 		/obj/item/electronic_assembly/medium/radio,
+		/obj/item/electronic_assembly/medium/dildo,
 		/obj/item/electronic_assembly/large/default,
 		/obj/item/electronic_assembly/large/scope,
 		/obj/item/electronic_assembly/large/terminal,
@@ -19,4 +19,4 @@ PROCESSING_SUBSYSTEM_DEF(nanites)
 		if(!force && !check_hardware(backup))
 			return
 		if(backup.cloud_id == cloud_id)
-			return backup
+			return backup
@@ -14,4 +14,4 @@ PROCESSING_SUBSYSTEM_DEF(radiation)
 	var/atom/master = contamination.parent
 	SSblackbox.record_feedback("tally", "contaminated", 1, master.type)
 	var/msg = "has become contamintaed with enough radiation to contaminate other objects. || Source: [contamination.source] || Strength: [contamination.strength]"
-	master.investigate_log(msg, INVESTIGATE_RADIATION)
+	master.investigate_log(msg, INVESTIGATE_RADIATION)
@@ -45,22 +45,29 @@ SUBSYSTEM_DEF(statpanels)
 				var/list/vote_arry = list(
 					list("Vote active!", "There is currently a vote running. Question: [SSvote.question]")
 					) //see the MC on how this works.
-				if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING)))
+				if(!(SSvote.vote_system in list(PLURALITY_VOTING, APPROVAL_VOTING, SCHULZE_VOTING, INSTANT_RUNOFF_VOTING)))
 					vote_arry[++vote_arry.len] += list("STATPANEL VOTING DISABLED!", "The current vote system is not supported by statpanel rendering. Please vote manually by opening the vote popup using the action button or chat link.", "disabled")
 					//does not return.
 				else
-					vote_arry[++vote_arry.len] += list("Time Left:", " [round(SSvote.end_time - world.time)] seconds")
+					vote_arry[++vote_arry.len] += list("Time Left:", " [DisplayTimeText(SSvote.end_time - world.time)] seconds")
 					vote_arry[++vote_arry.len] += list("Choices:", "")
 					for(var/choice in SSvote.choice_statclicks)
 						var/choice_id = SSvote.choice_statclicks[choice]
-						var/ivotedforthis = FALSE
 						if(target.ckey)
 							switch(SSvote.vote_system)
-								if(APPROVAL_VOTING)
-									ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[usr.ckey])
-								if(PLURALITY_VOTING)
-									ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id))
-							vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1")
+								if(PLURALITY_VOTING, APPROVAL_VOTING)
+									var/ivotedforthis = FALSE
+									if(SSvote.vote_system == APPROVAL_VOTING)
+										ivotedforthis = SSvote.voted[target.ckey] && (text2num(choice_id) in SSvote.voted[target.ckey])
+									else
+										ivotedforthis = (SSvote.voted[target.ckey] == text2num(choice_id))
+									vote_arry[++vote_arry.len] += list(ivotedforthis ? "\[X\]" : "\[ \]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1")
+								if(SCHULZE_VOTING, INSTANT_RUNOFF_VOTING)
+									var/list/vote = SSvote.voted[target.ckey]
+									var/vote_position = " "
+									if(vote)
+										vote_position = vote.Find(text2num(choice_id))
+									vote_arry[++vote_arry.len] += list("\[[vote_position]\]", choice, "[REF(SSvote)];vote=[choice_id];statpannel=1")
 				var/vote_str = url_encode(json_encode(vote_arry))
 				target << output("[vote_str]", "statbrowser:update_voting")
 			else
@@ -482,18 +482,7 @@ SUBSYSTEM_DEF(ticker)
 		INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate)
 	else
 		var/vote_type = CONFIG_GET(string/map_vote_type)
-		switch(vote_type)
-			if("PLURALITY")
-				SSvote.initiate_vote("map","server", display = SHOW_RESULTS)
-			if("APPROVAL")
-				SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = APPROVAL_VOTING)
-			if("IRV")
-				SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = INSTANT_RUNOFF_VOTING)
-			if("SCORE")
-				SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = MAJORITY_JUDGEMENT_VOTING)
-			else
-				SSvote.initiate_vote("map","server", display = SHOW_RESULTS)
-		// fallback
+		SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type)

 /datum/controller/subsystem/ticker/proc/HasRoundStarted()
 	return current_state >= GAME_STATE_PLAYING
@@ -52,7 +52,7 @@ SUBSYSTEM_DEF(traumas)
 					   "doctors"   = typecacheof(list(/mob/living/simple_animal/bot/medbot)),
 					   "the supernatural"   = typecacheof(list(/mob/living/simple_animal/hostile/construct,
 					   /mob/living/simple_animal/hostile/clockwork, /mob/living/simple_animal/drone/cogscarab,
-					   /mob/living/simple_animal/revenant, /mob/living/simple_animal/shade)),
+					   /mob/living/simple_animal/revenant, /mob/living/simple_animal/hostile/construct/shade)),
 					   "aliens"   = typecacheof(list(/mob/living/carbon/alien, /mob/living/simple_animal/slime)),
 					   "conspiracies" = typecacheof(list(/mob/living/simple_animal/bot/secbot, /mob/living/simple_animal/bot/ed209, /mob/living/simple_animal/drone,
 					   /mob/living/simple_animal/pet/penguin)),
@@ -158,8 +158,8 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/clothing/head/frenchberet, /obj/item/clothing/suit/suspenders, /obj/item/reagent_containers/food/drinks/bottle/bottleofnothing,
 						/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
-						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
-						/obj/item/clothing/under/rank/civilian/mime/sexy, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
+						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret,
+						/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),

 					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
 						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
@@ -25,18 +25,15 @@

 /datum/accent/abductor/modify_speech(list/speech_args, datum/source)
 	var/message = speech_args[SPEECH_MESSAGE]
-	var/mob/living/carbon/human/user = source
+	var/mob/living/carbon/user = source
+	var/obj/item/organ/tongue/abductor/A = user.getorgan(/obj/item/organ/tongue/abductor)
 	var/rendered = "<span class='abductor'><b>[user.name]:</b> [message]</span>"
 	user.log_talk(message, LOG_SAY, tag="abductor")
-	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
-		var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
-		if(!T || T.type != type)
+	for(var/mob/living/carbon/C in GLOB.alive_mob_list)
+		var/obj/item/organ/tongue/abductor/T = C.getorgan(/obj/item/organ/tongue/abductor)
+		if(!T || T.mothership != A.mothership)
 			continue
-		if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor")
-			var/datum/antagonist/abductor/A = user.mind.has_antag_datum(/datum/antagonist/abductor)
-			if(!A || !(H.mind in A.team.members))
-				continue
-		to_chat(H, rendered)
+		to_chat(C, rendered)
 	for(var/mob/M in GLOB.dead_mob_list)
 		var/link = FOLLOW_LINK(M, user)
 		to_chat(M, "[link] [rendered]")
@@ -174,7 +174,7 @@
 	M.ghostize(can_reenter_corpse = TRUE, voluntary = TRUE)

 /datum/action/proc/OnUpdatedIcon()
-	UpdateButtonIcon()
+	addtimer(CALLBACK(src, .proc/UpdateButtonIcon), 1) //Hopefully runs after new icon overlays have been compiled.

 //Presets for item actions
 /datum/action/item_action
@@ -273,6 +273,13 @@
 	if(istype(H))
 		H.toggle_welding_screen(owner)

+/datum/action/item_action/toggle_welding_screen/plasmaman
+
+/datum/action/item_action/toggle_welding_screen/plasmaman/Trigger()
+	var/obj/item/clothing/head/helmet/space/plasmaman/H = target
+	if(istype(H))
+		H.toggle_welding_screen(owner)
+
 /datum/action/item_action/toggle_headphones
 	name = "Toggle Headphones"
 	desc = "UNTZ UNTZ UNTZ"
@@ -263,4 +263,4 @@
 			popleft(speak_dejavu) //Remove the oldest
 			speak_dejavu += speech_args[SPEECH_MESSAGE]
 	else
-		speak_dejavu += speech_args[SPEECH_MESSAGE]
+		speak_dejavu += speech_args[SPEECH_MESSAGE]
@@ -451,4 +451,4 @@
 	if(istype(I, /obj/item/stack/sheet/glass))
 		if(do_after(user,10, target = src))
 			new next_step(user.loc, 1)
-			qdel(src)
+			qdel(src)
@@ -95,4 +95,4 @@
 	name = "Handmade Glasses"
 	desc = "Handmade glasses that have not been polished at all making them useless. Selling them could still be worth a few credits."
 	icon = 'icons/obj/glass_ware.dmi'
-	icon_state = "frames_2"
+	icon_state = "frames_2"
@@ -40,7 +40,7 @@
 /datum/crafting_recipe/floorbot
 	name = "Floorbot"
 	result = /mob/living/simple_animal/bot/floorbot
-	reqs = list(/obj/item/storage/toolbox/mechanical = 1,
+	reqs = list(/obj/item/storage/toolbox = 1,
 				/obj/item/stack/tile/plasteel = 1,
 				/obj/item/assembly/prox_sensor = 1,
 				/obj/item/bodypart/r_arm/robot = 1)
@@ -95,4 +95,4 @@
 	reqs = list(/obj/item/aicard = 1,
 					/obj/item/reagent_containers/food/snacks/grown/pumpkin = 1,
 					/obj/item/stack/cable_coil = 5)
-	category = CAT_ROBOT
+	category = CAT_ROBOT
@@ -248,7 +248,7 @@
 	category = CAT_WEAPONRY
 	subcategory = CAT_WEAPON

-/datum/crafting_recipe/ishotgun // smaller and more versatile gun requires some better materials
+/datum/crafting_recipe/ishotgun 
 	name = "Improvised Shotgun"
 	result = /obj/item/gun/ballistic/revolver/doublebarrel/improvised
 	reqs = list(/obj/item/pipe = 2, // putting a large amount of meaningless timegates by forcing people to turn base resources into upgraded resources kinda sucks
@@ -408,7 +408,7 @@
 /datum/crafting_recipe/rifle_receiver
 	name = "Improvised Rifle Receiver"
 	result = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 15) // you can carry multiple shotguns
+	reqs = list(/obj/item/stack/sheet/metal = 15)
 	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
 	time = 25
 	category = CAT_WEAPONRY
@@ -417,10 +417,9 @@
 /datum/crafting_recipe/shotgun_receiver
 	name = "Improvised Shotgun Receiver"
 	result = /obj/item/weaponcrafting/improvised_parts/shotgun_receiver
-	reqs = list(/obj/item/stack/sheet/metal = 15,
-				/obj/item/stack/sheet/plasteel = 1) // requires access or hacking since shotgun is better
+	reqs = list(/obj/item/stack/sheet/metal = 10) // shotgun does less damage than the rifle and can't 1shot but is more portable
 	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
-	time = 25
+	time = 20
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS

@@ -432,6 +431,6 @@
 	reqs = list(/obj/item/stack/sheet/metal = 3,
 				/obj/item/assembly/igniter = 1)
 	tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
-	time = 25
+	time = 20
 	category = CAT_WEAPONRY
 	subcategory = CAT_PARTS
@@ -67,4 +67,4 @@
 /datum/fantasy_affix/vampiric/apply(datum/component/fantasy/comp, newName)
 	var/obj/item/master = comp.parent
 	comp.appliedComponents += master.AddComponent(/datum/component/lifesteal, comp.quality)
-	return "vampiric [newName]"
+	return "vampiric [newName]"
@@ -36,4 +36,4 @@
 	if(isliving(target))
 		var/mob/living/L = target
 		L.adjust_fire_stacks(fire_stacks)
-		L.IgniteMob()
+		L.IgniteMob()
@@ -41,4 +41,4 @@
 	RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)

 /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M)
-	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
+	UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
@@ -31,4 +31,4 @@
 	UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW)

 /datum/component/magnetic_catch/proc/throw_react(datum/source, list/arguments)
-	return COMPONENT_CANCEL_THROW
+	return COMPONENT_CANCEL_THROW
@@ -55,7 +55,7 @@
 	var/mob/living/shooter

 /datum/component/pellet_cloud/Initialize(projectile_type=/obj/item/shrapnel, magnitude=5)
-	if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent))
+	if(!isammocasing(parent) && !isgrenade(parent) && !islandmine(parent) && !issupplypod(parent))
 		return COMPONENT_INCOMPATIBLE

 	if(magnitude < 1)
@@ -66,7 +66,7 @@

 	if(isammocasing(parent))
 		num_pellets = magnitude
-	else if(isgrenade(parent) || islandmine(parent))
+	else if(isgrenade(parent) || islandmine(parent) || issupplypod(parent))
 		radius = magnitude

 /datum/component/pellet_cloud/Destroy(force, silent)
@@ -86,9 +86,11 @@
 		RegisterSignal(parent, COMSIG_GRENADE_PRIME, .proc/create_blast_pellets)
 	else if(islandmine(parent))
 		RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets)
+	else if(issupplypod(parent))
+		RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets)

 /datum/component/pellet_cloud/UnregisterFromParent()
-	UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED))
+	UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED, COMSIG_SUPPLYPOD_LANDED))

 /**
  * create_casing_pellets() is for directed pellet clouds for ammo casings that have multiple pellets (buckshot and scatter lasers for instance)
@@ -39,4 +39,4 @@
 		if(ishuman(L))
 			var/mob/living/carbon/human/H = L
 			H.physiology.damage_resistance += 100
-	..()
+	..()
@@ -22,4 +22,4 @@
 	grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent
 	sizzling = new(grill_marks)
 	sizzling.alpha = sizzlealpha
-	food.add_overlay(sizzling)
+	food.add_overlay(sizzling)
@@ -53,4 +53,4 @@
 	spawned_mobs += L
 	L.nest = src
 	L.faction = src.faction
-	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
+	P.visible_message("<span class='danger'>[L] [spawn_text] [P].</span>")
@@ -25,7 +25,7 @@
 	RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak)
 	if(ismovable(parent))
 		RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), .proc/play_squeak)
-		RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED, COMSIG_MOVABLE_CROSS), .proc/play_squeak_crossed)
+		RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED), .proc/play_squeak_crossed)
 		RegisterSignal(parent, COMSIG_CROSS_SQUEAKED, .proc/delay_squeak)
 		RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react)
 		if(isitem(parent))
@@ -46,6 +46,21 @@
 	if(isnum(use_delay_override))
 		use_delay = use_delay_override

+/datum/component/squeak/UnregisterFromParent()
+	if(!isatom(parent))
+		return
+	UnregisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY))
+	if(ismovable(parent))
+		UnregisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT,
+			COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED, COMSIG_MOVABLE_CROSS,
+			COMSIG_CROSS_SQUEAKED, COMSIG_MOVABLE_DISPOSING))
+		if(isitem(parent))
+			UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT, COMSIG_ITEM_ATTACK_SELF,
+				COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
+			if(istype(parent, /obj/item/clothing/shoes))
+				UnregisterSignal(parent, COMSIG_SHOES_STEP_ACTION)
+	return ..()
+
 /datum/component/squeak/proc/play_squeak()
 	do_play_squeak()

@@ -68,4 +68,4 @@
 	spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>")

 /datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed)
-	spawned_mobs -= killed
+	spawned_mobs -= killed
@@ -52,4 +52,4 @@
 	var/atom/movable/owner = parent
 	if(is_swarming)
 		animate(owner, pixel_x = owner.pixel_x - offset_x, pixel_y = owner.pixel_y - offset_y, time = 2)
-		is_swarming = FALSE
+		is_swarming = FALSE
@@ -78,4 +78,4 @@

 /datum/component/thermite/proc/attackby_react(datum/source, obj/item/thing, mob/user, params)
 	if(thing.get_temperature())
-		thermite_melt(user)
+		thermite_melt(user)
@@ -46,4 +46,4 @@
 	holder.update_action_buttons_icon()
 	if(recharge_sound)
 		playsound(dashing_item, recharge_sound, 50, 1)
-	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
+	to_chat(holder, "<span class='notice'>[src] now has [current_charges]/[max_charges] charges.</span>")
@@ -151,4 +151,4 @@
 	flags_1 |= SHOCKED_1

 /mob/living/proc/reset_shocked()
-	flags_1 &= ~ SHOCKED_1
+	flags_1 &= ~ SHOCKED_1
@@ -39,4 +39,4 @@
 			symptoms += S

 	name = "Sample #[rand(1,10000)]"
-	..()
+	..()
@@ -47,4 +47,4 @@ BONUS
 	if(!.)
 		return
 	if(A.affected_mob)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_DISFIGURED, DISEASE_TRAIT)
@@ -52,4 +52,4 @@ Bonus
 			to_chat(M, "<span class='userdanger'>A wave of dizziness washes over you!</span>")
 			M.Dizzy(5)
 			if(power >= 2)
-				M.set_drugginess(5)
+				M.set_drugginess(5)
@@ -134,4 +134,4 @@ Bonus
 		M.reagents.add_reagent_list(list(/datum/reagent/toxin/heparin = 2, /datum/reagent/toxin/lipolicide = 2))
 	if(zombie)
 		M.reagents.add_reagent(/datum/reagent/romerol, 1)
-	return 1
+	return 1
@@ -59,4 +59,4 @@ BONUS
 		M.adjustStaminaLoss(25)
 	if(power >= 3 && A.stage >= 5)
 		to_chat(M, "<span class='userdanger'>[pick("Your head hurts!", "You feel a burning knife inside your brain!", "A wave of pain fills your head!")]</span>")
-		M.Stun(35)
+		M.Stun(35)
@@ -53,4 +53,4 @@ BONUS
 		var/can_scratch = scratch && !M.incapacitated() && get_location_accessible(M, picked_bodypart)
 		M.visible_message("[can_scratch ? "<span class='warning'>[M] scratches [M.p_their()] [bodypart.name].</span>" : ""]", "<span class='warning'>Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]</span>")
 		if(can_scratch)
-			bodypart.receive_damage(0.5)
+			bodypart.receive_damage(0.5)
@@ -67,4 +67,4 @@ Bonus
 	if(!..())
 		return
 	if(A.stage >= 4)
-		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
+		REMOVE_TRAIT(A.affected_mob, TRAIT_NOBREATH, DISEASE_TRAIT)
@@ -38,4 +38,4 @@ BONUS
 				M.reagents.add_reagent(color, 5)
 		else
 			if (prob(50)) // spam
-				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
+				M.visible_message("<span class='warning'>[M] looks rather vibrant...</span>", "<span class='notice'>The colors, man, the colors...</span>")
@@ -51,4 +51,4 @@ Bonus
 		else
 			M.emote("sneeze")
 			if(M.CanSpreadAirborneDisease()) //don't spread germs if they covered their mouth
-				A.spread(4 + power)
+				A.spread(4 + power)
@@ -79,4 +79,4 @@
 	return

 /datum/symptom/proc/OnRemove(datum/disease/advance/A)	//But dont forget to remove them too.
-	return
+	return
@@ -50,4 +50,4 @@ Bonus
 		else
 			to_chat(M, "<span class='warning'><i>[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]</i></span>")
 			M.overeatduration = max(M.overeatduration - 100, 0)
-			M.adjust_nutrition(-100)
+			M.adjust_nutrition(-100)
@@ -55,4 +55,4 @@ BONUS
 			if(5)
 				if(H.age > 21)
 					H.age = 21
-					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
+					to_chat(H, "<span class='notice'>You feel like you can take on the world!</span>")
@@ -38,4 +38,4 @@
 													"<span class='userdanger'>You cough up butterflies!</span>")
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
 				new /mob/living/simple_animal/butterfly(affected_mob.loc)
-	return
+	return
@@ -36,4 +36,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-	return
+	return
@@ -50,4 +50,4 @@
 				if(!affected_mob.disease_resistances.Find(/datum/disease/flu))
 					var/datum/disease/Flu = new /datum/disease/flu()
 					affected_mob.ForceContractDisease(Flu, FALSE, TRUE)
-					cure()
+					cure()
--- a/Show More
+++ b/Show More