From 5020cec4101146fc385c32b50e365f23b9fa4165 Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Thu, 6 Mar 2025 03:24:59 -0500
Subject: [PATCH] Fix define sanity linter failures (#3209)

Fix all of the define sanity failures, either by adding an `#undef`
where needed or moving them to a file in `code/__DEFINES`

![image](https://github.com/user-attachments/assets/abd76dcd-d610-4567-801e-ee7fc477d58c)
---
 code/__DEFINES/~skyrat_defines/DNA.dm         |   8 +
 code/__DEFINES/~skyrat_defines/bsa.dm         |   9 +
 code/__DEFINES/~skyrat_defines/clothing.dm    |   2 +
 code/__DEFINES/~skyrat_defines/colors.dm      |   1 +
 .../~skyrat_defines/customization.dm          |   8 +
 code/__DEFINES/~skyrat_defines/factions.dm    |   3 +
 .../~skyrat_defines/research_categories.dm    |   4 +
 .../__DEFINES/~~bubber_defines/bloodsucker.dm |   4 +
 code/__DEFINES/~~bubber_defines/guns.dm       |  72 +++++++
 code/__DEFINES/~~bubber_defines/loadout.dm    |   8 +
 .../code/modules/client/preferences.dm        |   2 +
 .../preferences/middleware/languages.dm       |   3 +
 .../modules/client/preferences_savefile.dm    |   3 +
 .../modules/clothing/under/shorts_pants.dm    |   2 -
 .../modules/clothing/under/skirts_dresses.dm  |   2 -
 .../code/modules/mob/living/blood.dm          |   2 +
 .../modules/admin/code/localsound.dm          |   5 +
 .../modules/aesthetics/guns/code/guns.dm      |  57 ------
 .../armaments/assaultops_armament_station.dm  |   3 -
 .../code/dynamic_rulsesets_roundstart.dm      |   2 +
 .../assault_operatives/code/interrogator.dm   |   4 +
 .../assault_operatives/code/sunbeam.dm        |   1 +
 .../modules/black_mesa/code/rationpacks.dm    |   2 +
 modular_skyrat/modules/bongs/code/bong.dm     |   1 +
 .../modules/borg_buffs/code/robot.dm          |   5 +
 .../modules/borgs/code/robot_items.dm         |   4 +
 .../modules/bsa_overhaul/code/bsa_cannon.dm   |   9 -
 .../modules/cargo/code/items/AFAD.dm          |   5 +-
 .../modules/cargo/code/items/gbp_punchcard.dm |   2 +
 .../carriers/code/carrier_component.dm        |   3 +-
 .../modules/cellguns/code/medigun_research.dm |   3 +
 .../modules/customization/__DEFINES/DNA.dm    |   7 -
 .../customization/__DEFINES/loadout.dm        |  60 ------
 .../clothing/~donator/donator_clothing.dm     |   2 +
 .../mob/dead/new_player/sprite_accessories.dm |   9 -
 .../modules/surgery/organs/spines.dm          |   2 +
 .../modules/decay_subsystem/code/decaySS.dm   |   8 +
 .../modules/decay_subsystem/code/nests.dm     |   2 -
 .../code/chemicals/twitch.dm                  |   2 +
 .../code/mechfabricator_designs.dm            |   3 +
 .../code/filtersandsetters.dm                 |   1 +
 .../food_replicator/code/replicator.dm        |   4 -
 .../replicator_designs/replicator_medical.dm  |   4 -
 .../modules/goofsec/code/terragov.dm          |   5 +
 .../modules/hev_suit/code/hev_suit.dm         |   4 +
 .../modules/implants/code/augments_brain.dm   |   2 +
 .../kahraman_equipment/code/ore_thumper.dm    |   2 +
 .../modules/layer_shift/code/mob_movement.dm  |   5 +
 .../modules/lowpop/code/lowpop_subsystem.dm   |   4 +-
 .../code/maturity_subsystem.dm                |   6 +
 .../modules/medical/code/wounds/medical.dm    |   3 +
 .../microfusion/code/microfusion_cell.dm      |   3 +
 .../microfusion/code/microfusion_designs.dm   |  10 +
 .../code/microfusion_energy_master.dm         |   2 +
 .../modular_items/code/modular_glasses.dm     |   4 +
 .../modules/modular_items/code/necklace.dm    |   2 +
 .../lewd_arousal/status_effects/climax.dm     |   4 +
 .../romulus_technology/ammo/rifle.dm          |  25 ---
 .../modules/moretraitoritems/code/weapons.dm  |   2 +
 .../code/mounted_machine_gun.dm               |   4 +
 .../modules/mutants/code/mutant_component.dm  |   7 +
 .../modules/novaya_ert/code/suit.dm           |  10 +
 .../modules/novaya_ert/code/surplus_armor.dm  |   5 +
 .../reagent_forging/code/crafting_bench.dm    |   1 +
 .../reagent_forging/code/forge_weapons.dm     |   2 -
 modular_skyrat/modules/salon/code/fur_dyer.dm |   2 +
 .../modules/shotgunrebalance/code/shotgun.dm  |  16 --
 .../code/mechfabricator_designs.dm            |   3 +
 .../title_screen/code/title_screen_html.dm    |   2 +
 .../research/xenoarch/designs_and_tech.dm     |   5 +
 .../game/objects/items/robot/items/hypo.dm    |   2 +
 .../antagonists/bloodsucker/powers/cloak.dm   |   4 +-
 .../bloodsucker/powers/fortitude.dm           |   2 +
 .../bloodsucker/powers/tremere/dominate.dm    |   1 +
 .../bloodsucker/powers/tremere/thaumaturgy.dm |   1 +
 .../bloodsucker/vassal/vassal_datum.dm        |   5 -
 .../code/modules/antagonists/modglue.dm       |   4 +
 .../client/verbs/character_directory.dm       |   2 +
 .../code/modules/debug_tools/physgun.dm       |   3 +
 .../code/modules/loadout/~defines.dm          |   7 -
 modular_zubbers/code/modules/shelves/shelf.dm |   4 +
 .../silicons/borgs/code/robot_defines.dm      | 162 ----------------
 .../silicons/borgs/code/robot_model.dm        | 181 ++++++++++++++++++
 .../code/modules/storyteller/gamemode.dm      |   2 +
 tgstation.dme                                 |   8 +-
 85 files changed, 487 insertions(+), 384 deletions(-)
 create mode 100644 code/__DEFINES/~skyrat_defines/bsa.dm
 create mode 100644 code/__DEFINES/~skyrat_defines/clothing.dm
 create mode 100644 code/__DEFINES/~skyrat_defines/customization.dm
 create mode 100644 code/__DEFINES/~~bubber_defines/bloodsucker.dm
 create mode 100644 code/__DEFINES/~~bubber_defines/guns.dm
 delete mode 100644 modular_skyrat/modules/customization/__DEFINES/DNA.dm
 delete mode 100644 modular_skyrat/modules/customization/__DEFINES/loadout.dm
 delete mode 100644 modular_zubbers/code/modules/loadout/~defines.dm

diff --git a/code/__DEFINES/~skyrat_defines/DNA.dm b/code/__DEFINES/~skyrat_defines/DNA.dm
index 3316661e75e..02153789630 100644
--- a/code/__DEFINES/~skyrat_defines/DNA.dm
+++ b/code/__DEFINES/~skyrat_defines/DNA.dm
@@ -143,3 +143,11 @@
 
 // Leaving this here because it's used for bodyparts, like SPECIES_X are, but since taurs aren't a species... Named it LIMBS instead.
 #define LIMBS_TAUR "taur"
+
+#define DNA_BLOCKS_PER_FEATURE 4
+#define DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE 3
+#define DNA_FEATURE_BLOCKS_TOTAL_SIZE_PER_FEATURE (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE)
+#define DNA_BLOCKS_PER_MARKING 2
+#define DNA_MARKING_COLOR_BLOCKS_PER_MARKING 1
+#define DNA_BLOCKS_PER_MARKING_ZONE (MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1)
+#define DNA_MARKING_BLOCKS_TOTAL_SIZE_PER_MARKING (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_MARKING_COLOR_BLOCKS_PER_MARKING)
diff --git a/code/__DEFINES/~skyrat_defines/bsa.dm b/code/__DEFINES/~skyrat_defines/bsa.dm
new file mode 100644
index 00000000000..f298578ab8e
--- /dev/null
+++ b/code/__DEFINES/~skyrat_defines/bsa.dm
@@ -0,0 +1,9 @@
+#define BSA_SYSTEM_READY "SYSTEM READY"
+#define BSA_SYSTEM_PREFIRE "! SYSTEM PREFIRING !"
+#define BSA_SYSTEM_FIRING "SYSTEM FIRING"
+#define BSA_SYSTEM_RELOADING "SYSTEM RELOADING"
+#define BSA_SYSTEM_LOW_POWER "SYSTEM POWER LOW"
+#define BSA_SYSTEM_CHARGE_CAPACITORS "SYSTEM CHARGING CAPACITORS"
+
+#define BSA_RELOAD_TIME 20 SECONDS
+#define BSA_FIRE_POWER_THRESHOLD 1000000 // 1 MW
diff --git a/code/__DEFINES/~skyrat_defines/clothing.dm b/code/__DEFINES/~skyrat_defines/clothing.dm
new file mode 100644
index 00000000000..5e44197152a
--- /dev/null
+++ b/code/__DEFINES/~skyrat_defines/clothing.dm
@@ -0,0 +1,2 @@
+#define SHORTS_PANTS_SHIRTS_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi'
+#define SKIRTS_DRESSES_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi'
diff --git a/code/__DEFINES/~skyrat_defines/colors.dm b/code/__DEFINES/~skyrat_defines/colors.dm
index 976775be074..a0227b06ea0 100644
--- a/code/__DEFINES/~skyrat_defines/colors.dm
+++ b/code/__DEFINES/~skyrat_defines/colors.dm
@@ -3,6 +3,7 @@
 #define LIGHT_COLOR_YELLOW "#E1E17D"
 #define COLOR_NRI_POLICE_BLUE "#1f3347"
 #define COLOR_NRI_POLICE_SILVER "#c0c0c0"
+#define SOULCATCHER_DEFAULT_COLOR "#75D5E1"
 
 GLOBAL_LIST_INIT(chat_colors_by_mob_name, list(
 	"Unknown" = list("#ffffff", "#d8d8d8"),
diff --git a/code/__DEFINES/~skyrat_defines/customization.dm b/code/__DEFINES/~skyrat_defines/customization.dm
new file mode 100644
index 00000000000..6aa3e22fbb9
--- /dev/null
+++ b/code/__DEFINES/~skyrat_defines/customization.dm
@@ -0,0 +1,8 @@
+/// The flag to show that snouts should use the muzzled sprite.
+#define SPRITE_ACCESSORY_USE_MUZZLED_SPRITE (1<<0)
+/// The flag to show that this tail sprite can wag.
+#define SPRITE_ACCESSORY_WAG_ABLE (1<<1)
+/// The flag that controls whether or not this sprite accessory should force the wearer to hide its shoes.
+#define SPRITE_ACCESSORY_HIDE_SHOES (1<<2)
+/// The flag to that controls whether or not this sprite accessory should force worn facewear to use layers 5 (for glasses) and 4 (for masks and hats).
+#define SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER (1<<3)
diff --git a/code/__DEFINES/~skyrat_defines/factions.dm b/code/__DEFINES/~skyrat_defines/factions.dm
index 55bfd5cc587..3988e127e57 100644
--- a/code/__DEFINES/~skyrat_defines/factions.dm
+++ b/code/__DEFINES/~skyrat_defines/factions.dm
@@ -18,3 +18,6 @@
 
 // Ruin Turret faction
 #define FACTION_MALF_TURRET "malf-turret"
+
+// Decay subsystem nest faction
+#define NEST_FACTION "nest spawned"
diff --git a/code/__DEFINES/~skyrat_defines/research_categories.dm b/code/__DEFINES/~skyrat_defines/research_categories.dm
index d1403619d7c..48eb0bfa0b4 100644
--- a/code/__DEFINES/~skyrat_defines/research_categories.dm
+++ b/code/__DEFINES/~skyrat_defines/research_categories.dm
@@ -1,3 +1,7 @@
 #define RND_SUBCATEGORY_MECHFAB_CYBORG_MODULES_CARGO "/Cargo Cyborgs"
 #define RND_CATEGORY_MECHFAB_SYNTH "/Synth"
 #define RND_SUBCATEGORY_MECHFAB_SYNTH_PARTS "/Bodyparts"
+
+#define RND_CATEGORY_NRI_FOOD "Provision"
+#define RND_CATEGORY_NRI_MEDICAL "Medicine"
+#define RND_CATEGORY_NRI_CLOTHING "Apparel"
diff --git a/code/__DEFINES/~~bubber_defines/bloodsucker.dm b/code/__DEFINES/~~bubber_defines/bloodsucker.dm
new file mode 100644
index 00000000000..896b2301afa
--- /dev/null
+++ b/code/__DEFINES/~~bubber_defines/bloodsucker.dm
@@ -0,0 +1,4 @@
+#define GHOUL_SCAN_MIN_DISTANCE 5
+#define GHOUL_SCAN_MAX_DISTANCE 500
+/// 2s update time.
+#define GHOUL_SCAN_PING_TIME 20
diff --git a/code/__DEFINES/~~bubber_defines/guns.dm b/code/__DEFINES/~~bubber_defines/guns.dm
new file mode 100644
index 00000000000..58e8a3a17cf
--- /dev/null
+++ b/code/__DEFINES/~~bubber_defines/guns.dm
@@ -0,0 +1,72 @@
+// open to suggestions on where to put these overrides
+// hugely not a fan of this but we do what we gotta
+
+/*
+ * gotta redefine EVERY goddamn ammo type irt to new mat costs for the ammobench's sake
+ * previously, SMALL_MATERIAL_AMOUNT was 100 units out of 2000 from a sheet (5%)
+ * so the old cost of SMALL_MATERIAL_AMOUNT * 5 was 500/2000 from a sheet (25%)
+ * experimental material balance PR makes it so that SMALL_MATERIAL_AMOUNT is actually 10 units out of 100 (10%)
+ * which made it so that the old assumed value of SMALL_MATERIAL_AMOUNT * 5 is 50/100 (50% of a sheet for a single bullet) (suboptimal)
+ * these updated, more consistent defines make it so that a single round's total materials should total 20% of a sheet, or 2 SMALL_MATERIAL_AMOUNT
+*/
+
+#define AMMO_MATS_BASIC list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, \
+)
+
+#define AMMO_MATS_AP list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 0.4, \
+)
+
+#define AMMO_MATS_TEMP list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.4, \
+)
+
+#define AMMO_MATS_EMP list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/uranium = SMALL_MATERIAL_AMOUNT * 0.4, \
+)
+
+#define AMMO_MATS_PHASIC list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.4, \
+)
+
+#define AMMO_MATS_TRAC list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
+	/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
+)
+
+#define AMMO_MATS_HOMING list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1, \
+	/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
+	/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
+	/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.2, \
+	/datum/material/diamond = SMALL_MATERIAL_AMOUNT * 0.2, \
+	/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.2, \
+)
+
+// for .35 Sol Ripper
+#define AMMO_MATS_RIPPER list( \
+	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
+	/datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4, \
+)
+
+#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
+
+#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
+									/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
+
+#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
+									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
+									/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
+
+#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
+									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
+									/datum/material/gold = SMALL_MATERIAL_AMOUNT * 1)
+
+#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
+									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)
diff --git a/code/__DEFINES/~~bubber_defines/loadout.dm b/code/__DEFINES/~~bubber_defines/loadout.dm
index ea0cb19105c..d4873f0d065 100644
--- a/code/__DEFINES/~~bubber_defines/loadout.dm
+++ b/code/__DEFINES/~~bubber_defines/loadout.dm
@@ -2,3 +2,11 @@
 // if item count restrictions have been significantly increased. You will end up with massively bloated save sizes otherwise.
 #define LOADOUT_MAX_PRESETS 12
 #define LOADOUT_MAX_NAME_LENGTH 24
+
+#define ALL_JOBS_SEC JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC
+#define ALL_JOBS_DEPT_GUARDS JOB_CORRECTIONS_OFFICER, JOB_ENGINEERING_GUARD, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_BOUNCER
+#define ALL_JOBS_CENTRAL JOB_NT_REP, JOB_BLUESHIELD
+#define ALL_JOBS_MEDICAL JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER
+#define ALL_JOBS_SCIENCE JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD
+#define ALL_JOBS_CARGO JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER, JOB_BITRUNNER
+#define ALL_JOBS_ENGINEERING JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD
diff --git a/modular_skyrat/master_files/code/modules/client/preferences.dm b/modular_skyrat/master_files/code/modules/client/preferences.dm
index fc391799c97..2dcb71efb94 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences.dm
@@ -178,3 +178,5 @@
 /datum/preferences/safe_transfer_prefs_to(mob/living/carbon/human/character, icon_updates = TRUE, is_antag = FALSE, visuals_only = FALSE)
 	. = ..()
 	GLOB.chat_colors_by_mob_name[character.name] = list(character.chat_color, character.chat_color_darkened) // by now the mob has had its prefs applied to it
+
+#undef MAX_MUTANT_ROWS
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
index f829ad5aa42..1e5e71bc2a3 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
@@ -162,3 +162,6 @@
 	var/language_name = params["language_name"]
 	preferences.languages -= name_to_language[language_name]
 	return TRUE
+
+#undef MAX_LANGUAGES_NORMAL
+#undef MAX_LANGUAGES_LINGUIST
diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
index f0a03f7445f..7df9575766d 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm
@@ -349,3 +349,6 @@
 #undef VERSION_LANGUAGES
 #undef VERSION_LOADOUT_PRESETS
 #undef VERSION_INTERNAL_EXTERNAL_ORGANS
+
+#undef INDEX_UNDERWEAR
+#undef INDEX_BRA
diff --git a/modular_skyrat/master_files/code/modules/clothing/under/shorts_pants.dm b/modular_skyrat/master_files/code/modules/clothing/under/shorts_pants.dm
index 3bc3d7c2a7b..da5983890f6 100644
--- a/modular_skyrat/master_files/code/modules/clothing/under/shorts_pants.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/under/shorts_pants.dm
@@ -1,5 +1,3 @@
-#define SHORTS_PANTS_SHIRTS_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/shorts_pants_shirts_digi.dmi'
-
 /obj/item/clothing/under/pants
 	worn_icon_digi = SHORTS_PANTS_SHIRTS_DIGIFILE
 
diff --git a/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm b/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm
index 4c106704c19..71120a36243 100644
--- a/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm
+++ b/modular_skyrat/master_files/code/modules/clothing/under/skirts_dresses.dm
@@ -1,5 +1,3 @@
-#define SKIRTS_DRESSES_DIGIFILE 'modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses_digi.dmi'
-
 /obj/item/clothing/under/dress
 	body_parts_covered = CHEST|GROIN	//For reference
 	female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY //For reference - We dont want to cut a random hole in dresses
diff --git a/modular_skyrat/master_files/code/modules/mob/living/blood.dm b/modular_skyrat/master_files/code/modules/mob/living/blood.dm
index 6cd5c1d3a0a..d6f1559527d 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/blood.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/blood.dm
@@ -13,3 +13,5 @@
 	. = ..()
 	if(data && mix_data)
 		data[MONKEY_ORIGINS] = data[MONKEY_ORIGINS] || mix_data[MONKEY_ORIGINS]
+
+#undef MONKEY_ORIGINS
diff --git a/modular_skyrat/modules/admin/code/localsound.dm b/modular_skyrat/modules/admin/code/localsound.dm
index 4b28bbd7846..81aca95c6ef 100644
--- a/modular_skyrat/modules/admin/code/localsound.dm
+++ b/modular_skyrat/modules/admin/code/localsound.dm
@@ -130,3 +130,8 @@ ADMIN_VERB(play_localweb_sound, R_SOUND, "Play Local Internet Sound", "Play a gi
 		localweb_sound(usr, web_sound_input, range = number_input)
 	else
 		localweb_sound(usr, null, null, null)
+
+#undef SHELLEO_ERRORLEVEL
+#undef SHELLEO_STDOUT
+#undef SHELLEO_STDERR
+#undef COOLDOWN_LOCAL_INTERNET_SOUND
diff --git a/modular_skyrat/modules/aesthetics/guns/code/guns.dm b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
index e99014f42c7..0cc6e4dd7a0 100644
--- a/modular_skyrat/modules/aesthetics/guns/code/guns.dm
+++ b/modular_skyrat/modules/aesthetics/guns/code/guns.dm
@@ -1,60 +1,3 @@
-// open to suggestions on where to put these overrides
-// hugely not a fan of this but we do what we gotta
-
-/*
- * gotta redefine EVERY goddamn ammo type irt to new mat costs for the ammobench's sake
- * previously, SMALL_MATERIAL_AMOUNT was 100 units out of 2000 from a sheet (5%)
- * so the old cost of SMALL_MATERIAL_AMOUNT * 5 was 500/2000 from a sheet (25%)
- * experimental material balance PR makes it so that SMALL_MATERIAL_AMOUNT is actually 10 units out of 100 (10%)
- * which made it so that the old assumed value of SMALL_MATERIAL_AMOUNT * 5 is 50/100 (50% of a sheet for a single bullet) (suboptimal)
- * these updated, more consistent defines make it so that a single round's total materials should total 20% of a sheet, or 2 SMALL_MATERIAL_AMOUNT
-*/
-
-#define AMMO_MATS_BASIC list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2, \
-)
-
-#define AMMO_MATS_AP list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 0.4, \
-)
-
-#define AMMO_MATS_TEMP list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.4, \
-)
-
-#define AMMO_MATS_EMP list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/uranium = SMALL_MATERIAL_AMOUNT * 0.4, \
-)
-
-#define AMMO_MATS_PHASIC list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.4, \
-)
-
-#define AMMO_MATS_TRAC list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
-	/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
-)
-
-#define AMMO_MATS_HOMING list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1, \
-	/datum/material/silver = SMALL_MATERIAL_AMOUNT * 0.2, \
-	/datum/material/gold = SMALL_MATERIAL_AMOUNT * 0.2, \
-	/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 0.2, \
-	/datum/material/diamond = SMALL_MATERIAL_AMOUNT * 0.2, \
-	/datum/material/bluespace = SMALL_MATERIAL_AMOUNT * 0.2, \
-)
-
-// for .35 Sol Ripper
-#define AMMO_MATS_RIPPER list( \
-	/datum/material/iron = SMALL_MATERIAL_AMOUNT * 1.6, \
-	/datum/material/glass = SMALL_MATERIAL_AMOUNT * 0.4, \
-)
-
 /obj/item/ammo_casing
 	custom_materials = AMMO_MATS_BASIC
 
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
index 6356aa478b4..ad4cd6bf61e 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/assaultops_armament_station.dm
@@ -13,9 +13,6 @@
 
 // ARMAMENT ENTRIES
 
-#define ARMAMENT_CATEGORY_OTHER "Miscellaneous"
-#define ARMAMENT_CATEGORY_OTHER_LIMIT 3
-
 /datum/armament_entry/assault_operatives
 	var/mags_to_spawn = 3
 
diff --git a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm
index d492d249fa0..06c6e7ced78 100644
--- a/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm
+++ b/modular_skyrat/modules/assault_operatives/code/dynamic_rulsesets_roundstart.dm
@@ -57,3 +57,5 @@
 /// Returns the required goldeneye keys for activation. This is to make sure we don't have an impossible to achieve goal. However, there has to be at least one key.
 /datum/dynamic_ruleset/roundstart/assault_operatives/proc/get_goldeneye_key_count()
 	return clamp(LAZYLEN(SSjob.get_all_heads()), 1, GOLDENEYE_REQUIRED_KEYS_MAXIMUM)
+
+#undef ASSAULT_OPERATIVES_COUNT
diff --git a/modular_skyrat/modules/assault_operatives/code/interrogator.dm b/modular_skyrat/modules/assault_operatives/code/interrogator.dm
index 840e5596c3b..58e7836db4c 100644
--- a/modular_skyrat/modules/assault_operatives/code/interrogator.dm
+++ b/modular_skyrat/modules/assault_operatives/code/interrogator.dm
@@ -218,3 +218,7 @@
 	//Pick a turf to spawn at if we can
 	if(length(possible_turfs))
 		return pick(possible_turfs)
+
+#undef STAGE_PROCESS_TIME_LOWER
+#undef STAGE_PROCESS_TIME_UPPER
+#undef ALERT_CREW_TIME
diff --git a/modular_skyrat/modules/assault_operatives/code/sunbeam.dm b/modular_skyrat/modules/assault_operatives/code/sunbeam.dm
index 0ef738b1803..3cd5c79e1e7 100644
--- a/modular_skyrat/modules/assault_operatives/code/sunbeam.dm
+++ b/modular_skyrat/modules/assault_operatives/code/sunbeam.dm
@@ -173,3 +173,4 @@
 #undef SUNBEAM_MOVEMENT_COOLDOWN
 #undef SUNBEAM_DEFAULT_SCALE_X
 #undef SUNBEAM_DEFAULT_SCALE_Y
+#undef SUNBEAM_OVERLAYS
diff --git a/modular_skyrat/modules/black_mesa/code/rationpacks.dm b/modular_skyrat/modules/black_mesa/code/rationpacks.dm
index 9965858d07a..62b1e46b004 100644
--- a/modular_skyrat/modules/black_mesa/code/rationpacks.dm
+++ b/modular_skyrat/modules/black_mesa/code/rationpacks.dm
@@ -131,3 +131,5 @@
 	if(!pizza)
 		var/random_pizza = pick(EDIBLE_PIZZA_LIST)
 		pizza = new random_pizza(src)
+
+#undef EDIBLE_PIZZA_LIST
diff --git a/modular_skyrat/modules/bongs/code/bong.dm b/modular_skyrat/modules/bongs/code/bong.dm
index 36ee6a8c6a4..2aa49d8d939 100644
--- a/modular_skyrat/modules/bongs/code/bong.dm
+++ b/modular_skyrat/modules/bongs/code/bong.dm
@@ -235,6 +235,7 @@
 	update_alpha()
 
 #undef MAX_FAKE_STEAM_STAGES
+#undef STAGE_DOWN_TIME
 
 /datum/crafting_recipe/bong
 	name = "Bong"
diff --git a/modular_skyrat/modules/borg_buffs/code/robot.dm b/modular_skyrat/modules/borg_buffs/code/robot.dm
index 8c34486cb7f..29e775175dd 100644
--- a/modular_skyrat/modules/borg_buffs/code/robot.dm
+++ b/modular_skyrat/modules/borg_buffs/code/robot.dm
@@ -154,3 +154,8 @@
 		var/obj/item/wirebrush/brush = new (cyborg.model)
 		cyborg.model.basic_modules += brush
 		cyborg.model.add_module(brush, FALSE, TRUE)
+
+#undef BASE_SHAKER_JUICE_REAGENTS
+#undef BASE_SHAKER_ALCOHOL_REAGENTS
+#undef BASE_SHAKER_SODA_REAGENTS
+#undef BASE_SHAKER_MISC_REAGENTS
diff --git a/modular_skyrat/modules/borgs/code/robot_items.dm b/modular_skyrat/modules/borgs/code/robot_items.dm
index 3e5093cec80..6812d93a127 100644
--- a/modular_skyrat/modules/borgs/code/robot_items.dm
+++ b/modular_skyrat/modules/borgs/code/robot_items.dm
@@ -881,3 +881,7 @@
 			new /obj/structure/reagent_water_basin(src_turf)
 		if("Crafting Bench")
 			new /obj/structure/reagent_crafting_bench(src_turf)
+
+#undef CYBORG_FONT
+#undef MAX_PAPER_INTEGRATED_CLIPBOARD
+#undef BASE_NINJA_REAGENTS
diff --git a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm
index 96cf0b74db2..c35acd73825 100644
--- a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm
+++ b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm
@@ -4,15 +4,6 @@
 *	Requires high amount of power
 *	Requires high level stock parts
 */
-#define BSA_SYSTEM_READY "SYSTEM READY"
-#define BSA_SYSTEM_PREFIRE "! SYSTEM PREFIRING !"
-#define BSA_SYSTEM_FIRING "SYSTEM FIRING"
-#define BSA_SYSTEM_RELOADING "SYSTEM RELOADING"
-#define BSA_SYSTEM_LOW_POWER "SYSTEM POWER LOW"
-#define BSA_SYSTEM_CHARGE_CAPACITORS "SYSTEM CHARGING CAPACITORS"
-
-#define BSA_RELOAD_TIME 20 SECONDS
-#define BSA_FIRE_POWER_THRESHOLD 1000000 // 1 MW
 
 
 /**
diff --git a/modular_skyrat/modules/cargo/code/items/AFAD.dm b/modular_skyrat/modules/cargo/code/items/AFAD.dm
index 0fabd3497d3..5784bc1d0bf 100644
--- a/modular_skyrat/modules/cargo/code/items/AFAD.dm
+++ b/modular_skyrat/modules/cargo/code/items/AFAD.dm
@@ -9,7 +9,7 @@
 	inhand_icon_state = "chronogun"
 	w_class = WEIGHT_CLASS_NORMAL
 
-	
+
 
 /obj/item/gun/medbeam/afad/on_beam_tick(mob/living/target)
 	if(target.health != target.maxHealth)
@@ -19,3 +19,6 @@
 	target.adjustToxLoss(EXOTIC_DAMAGE_HEALING)
 	target.adjustOxyLoss(EXOTIC_DAMAGE_HEALING)
 	return
+
+#undef PHYSICAL_DAMAGE_HEALING
+#undef EXOTIC_DAMAGE_HEALING
diff --git a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm
index f7b4f88cfbc..88e9cb615bb 100644
--- a/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm
+++ b/modular_skyrat/modules/cargo/code/items/gbp_punchcard.dm
@@ -145,3 +145,5 @@
 		RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_CARGO
 	)
 	departmental_flags = DEPARTMENT_BITFLAG_CARGO
+
+#undef GBP_PUNCH_REWARD
diff --git a/modular_skyrat/modules/carriers/code/carrier_component.dm b/modular_skyrat/modules/carriers/code/carrier_component.dm
index 4a80209126e..ecd2ed7e439 100644
--- a/modular_skyrat/modules/carriers/code/carrier_component.dm
+++ b/modular_skyrat/modules/carriers/code/carrier_component.dm
@@ -1,8 +1,6 @@
 ///Global list containing any and all soulcatchers
 GLOBAL_LIST_EMPTY(soulcatchers)
 
-#define SOULCATCHER_DEFAULT_COLOR "#75D5E1"
-#define SOULCATCHER_WARNING_MESSAGE "You have entered a soulcatcher, do not share any information you have received while a ghost. If you have died within the round, you do not know your identity until your body has been scanned, standard blackout policy also applies."
 
 /**
  * Carrier Component
@@ -405,3 +403,4 @@ GLOBAL_LIST_EMPTY(soulcatchers)
 		remove_mob(occupant)
 
 	return ..()
+
diff --git a/modular_skyrat/modules/cellguns/code/medigun_research.dm b/modular_skyrat/modules/cellguns/code/medigun_research.dm
index 34038a926d9..24edecf4f89 100644
--- a/modular_skyrat/modules/cellguns/code/medigun_research.dm
+++ b/modular_skyrat/modules/cellguns/code/medigun_research.dm
@@ -242,3 +242,6 @@
 		/datum/material/bluespace = SHEET_MATERIAL_AMOUNT * 3,
 	)
 	build_path = /obj/item/weaponcell/medical/utility/relocation
+
+#undef RND_SUBCATEGORY_WEAPONS_MEDICALAMMO
+#undef RND_MEDICALAMMO_UTILITY
diff --git a/modular_skyrat/modules/customization/__DEFINES/DNA.dm b/modular_skyrat/modules/customization/__DEFINES/DNA.dm
deleted file mode 100644
index 3faf17727c4..00000000000
--- a/modular_skyrat/modules/customization/__DEFINES/DNA.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define DNA_BLOCKS_PER_FEATURE 4
-#define DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE 3
-#define DNA_FEATURE_BLOCKS_TOTAL_SIZE_PER_FEATURE (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE)
-#define DNA_BLOCKS_PER_MARKING 2
-#define DNA_MARKING_COLOR_BLOCKS_PER_MARKING 1
-#define DNA_BLOCKS_PER_MARKING_ZONE (MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1)
-#define DNA_MARKING_BLOCKS_TOTAL_SIZE_PER_MARKING (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_MARKING_COLOR_BLOCKS_PER_MARKING)
diff --git a/modular_skyrat/modules/customization/__DEFINES/loadout.dm b/modular_skyrat/modules/customization/__DEFINES/loadout.dm
deleted file mode 100644
index a046ccad8d8..00000000000
--- a/modular_skyrat/modules/customization/__DEFINES/loadout.dm
+++ /dev/null
@@ -1,60 +0,0 @@
-#define LOADOUT_POINTS_MAX 10
-#define LOADOUT_POINTS_MAX_DONATOR 20
-
-#define LOADOUT_CATEGORY_NONE				"ERROR"
-//Those three subcategories are good to apply to any category
-#define LOADOUT_SUBCATEGORY_DONATOR			"Donator"
-#define LOADOUT_SUBCATEGORY_MISC			"Miscellaneous"
-#define LOADOUT_SUBCATEGORY_JOB 			"Job-related"
-
-//In backpack
-#define LOADOUT_CATEGORY_BACKPACK 				"In backpack"
-#define LOADOUT_SUBCATEGORY_BACKPACK_TOYS 		"Toys"
-#define LOADOUT_SUBCATEGORY_BACKPACK_FRAGRANCE "Fragrance"
-#define LOADOUT_SUBCATEGORY_BACKPACK_PLUSHIES 	"Plushies"
-
-//Neck
-#define LOADOUT_CATEGORY_NECK 				"Neck"
-#define LOADOUT_SUBCATEGORY_NECK_TIE 		"Ties"
-#define LOADOUT_SUBCATEGORY_NECK_SCARVES 	"Scarves"
-
-//Mask
-#define LOADOUT_CATEGORY_MASK 				"Mask"
-
-//In hands
-#define LOADOUT_CATEGORY_HANDS 				"In hands"
-
-//Uniform
-#define LOADOUT_CATEGORY_UNIFORM 			"Uniform"
-#define LOADOUT_SUBCATEGORY_UNIFORM_SUITS	"Suits"
-#define LOADOUT_SUBCATEGORY_UNIFORM_SKIRTS	"Skirts"
-#define LOADOUT_SUBCATEGORY_UNIFORM_DRESSES	"Dresses"
-#define LOADOUT_SUBCATEGORY_UNIFORM_SWEATERS	"Sweaters"
-#define LOADOUT_SUBCATEGORY_UNIFORM_PANTS	"Pants"
-#define LOADOUT_SUBCATEGORY_UNIFORM_SHORTS	"Shorts"
-
-//Suit
-#define LOADOUT_CATEGORY_SUIT 				"Suit"
-#define LOADOUT_SUBCATEGORY_SUIT_COATS 		"Coats"
-#define LOADOUT_SUBCATEGORY_SUIT_JACKETS 	"Jackets"
-#define LOADOUT_SUBCATEGORY_SUIT_HOODIES	"Hoodies"
-
-//Head
-#define LOADOUT_CATEGORY_HEAD 				"Head"
-
-//Shoes
-#define LOADOUT_CATEGORY_SHOES 				"Shoes"
-
-//Gloves
-#define LOADOUT_CATEGORY_GLOVES				"Gloves"
-
-//Glasses
-#define LOADOUT_CATEGORY_GLASSES			"Glasses"
-
-//Loadout information types, allowing a user to set more customization to them
-//Doesn't store any extra information a user could set
-#define LOADOUT_INFO_NONE			0
-//Stores a "style", which user can set from a pre-defined list on the loadout datum
-#define LOADOUT_INFO_STYLE			1
-//Stores a single color for use by the loadout datum
-#define LOADOUT_INFO_ONE_COLOR 		2
diff --git a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
index ba998592d8e..ae704436b5b 100644
--- a/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
+++ b/modular_skyrat/modules/customization/modules/clothing/~donator/donator_clothing.dm
@@ -1924,3 +1924,5 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/contraband/korpstech, 32)
 	name = "implant case - 'Toaster'"
 	desc = "A glass case containing a toaster implant. Sweet."
 	imp_type = /obj/item/implant/toaster
+
+#undef TOASTER_IMPLANT_COOLDOWN
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
index 5144349da6d..51c4447c722 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
@@ -1,14 +1,5 @@
 // GLOBAL_LIST_EMPTY(cached_mutant_icon_files)
 
-/// The flag to show that snouts should use the muzzled sprite.
-#define SPRITE_ACCESSORY_USE_MUZZLED_SPRITE (1<<0)
-/// The flag to show that this tail sprite can wag.
-#define SPRITE_ACCESSORY_WAG_ABLE (1<<1)
-/// The flag that controls whether or not this sprite accessory should force the wearer to hide its shoes.
-#define SPRITE_ACCESSORY_HIDE_SHOES (1<<2)
-/// The flag to that controls whether or not this sprite accessory should force worn facewear to use layers 5 (for glasses) and 4 (for masks and hats).
-#define SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER (1<<3)
-
 /datum/sprite_accessory
 	///Unique key of an accessory. All tails should have "tail", ears "ears" etc.
 	var/key = null
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/spines.dm b/modular_skyrat/modules/customization/modules/surgery/organs/spines.dm
index 98cdd9869ee..4eb3bc15caf 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/spines.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/spines.dm
@@ -39,3 +39,5 @@
 		overlay.layer += SPINES_LAYER_OFFSET
 
 	return returned_overlays
+
+#undef SPINES_LAYER_OFFSET
diff --git a/modular_skyrat/modules/decay_subsystem/code/decaySS.dm b/modular_skyrat/modules/decay_subsystem/code/decaySS.dm
index abd4e65316e..5e27bb2b16d 100644
--- a/modular_skyrat/modules/decay_subsystem/code/decaySS.dm
+++ b/modular_skyrat/modules/decay_subsystem/code/decaySS.dm
@@ -146,3 +146,11 @@ SUBSYSTEM_DEF(decay)
 				if(!iterating_floor.Enter(spawned_vomit))
 					qdel(spawned_vomit)
 
+#undef WALL_RUST_PERCENT_CHANCE
+#undef FLOOR_DIRT_PERCENT_CHANCE
+#undef FLOOR_BLOOD_PERCENT_CHANCE
+#undef FLOOR_VOMIT_PERCENT_CHANCE
+#undef FLOOR_OIL_PERCENT_CHANCE
+#undef FLOOR_TILE_MISSING_PERCENT_CHANCE
+#undef FLOOR_COBWEB_PERCENT_CHANCE
+#undef NEST_PERCENT_CHANCE
diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm
index f81afb62db1..a85eab2cbad 100644
--- a/modular_skyrat/modules/decay_subsystem/code/nests.dm
+++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm
@@ -1,5 +1,3 @@
-#define NEST_FACTION "nest spawned"
-
 /obj/structure/mob_spawner
 	name = "nest"
 	desc = "A nasty looking pile of sticks and debris."
diff --git a/modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm b/modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm
index a034d0d3690..75b6a789a95 100644
--- a/modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm
+++ b/modular_skyrat/modules/deforest_medical_items/code/chemicals/twitch.dm
@@ -206,6 +206,8 @@
 /datum/movespeed_modifier/reagent/twitch
 	multiplicative_slowdown = -0.4
 
+#undef CONSTANT_DOSE_SAFE_LIMIT
+
 #undef TWITCH_SCREEN_FILTER
 #undef TWITCH_SCREEN_BLUR
 
diff --git a/modular_skyrat/modules/digitigrade_cybernetics/code/mechfabricator_designs.dm b/modular_skyrat/modules/digitigrade_cybernetics/code/mechfabricator_designs.dm
index 59734073e97..a0aa09457af 100644
--- a/modular_skyrat/modules/digitigrade_cybernetics/code/mechfabricator_designs.dm
+++ b/modular_skyrat/modules/digitigrade_cybernetics/code/mechfabricator_designs.dm
@@ -52,3 +52,6 @@
 	category = list(
 		RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ADVANCED_DIGI
 	)
+
+#undef RND_SUBCATEGORY_MECHFAB_CYBORG_DIGI
+#undef RND_SUBCATEGORY_CYBERNETICS_ADVANCED_DIGI
diff --git a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
index eaaa03fc219..a4c1dfe64c8 100644
--- a/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
+++ b/modular_skyrat/modules/filtersandsetters/code/filtersandsetters.dm
@@ -175,3 +175,4 @@
 	)
 	return ..()
 
+#undef TOOL_ALIEN_BONESET
diff --git a/modular_skyrat/modules/food_replicator/code/replicator.dm b/modular_skyrat/modules/food_replicator/code/replicator.dm
index 9fcef963545..eedd3bbed9f 100644
--- a/modular_skyrat/modules/food_replicator/code/replicator.dm
+++ b/modular_skyrat/modules/food_replicator/code/replicator.dm
@@ -1,7 +1,3 @@
-#define RND_CATEGORY_NRI_FOOD "Provision"
-#define RND_CATEGORY_NRI_MEDICAL "Medicine"
-#define RND_CATEGORY_NRI_CLOTHING "Apparel"
-
 /obj/machinery/biogenerator/food_replicator
 	name = "\improper Type 34 'Colonial Supply Core'"
 	desc = "The Type 34 'Colonial Supply Core,' colloquially known as the 'Gencrate/CSC' is an ancient, boxy design first put in use by the pioneer colonists of what's now known \
diff --git a/modular_skyrat/modules/food_replicator/code/replicator_designs/replicator_medical.dm b/modular_skyrat/modules/food_replicator/code/replicator_designs/replicator_medical.dm
index 85fa2a2ee4f..4edae7f1229 100644
--- a/modular_skyrat/modules/food_replicator/code/replicator_designs/replicator_medical.dm
+++ b/modular_skyrat/modules/food_replicator/code/replicator_designs/replicator_medical.dm
@@ -107,7 +107,3 @@
 		RND_CATEGORY_INITIAL,
 		RND_CATEGORY_NRI_MEDICAL,
 	)
-
-#undef RND_CATEGORY_NRI_FOOD
-#undef RND_CATEGORY_NRI_MEDICAL
-#undef RND_CATEGORY_NRI_CLOTHING
diff --git a/modular_skyrat/modules/goofsec/code/terragov.dm b/modular_skyrat/modules/goofsec/code/terragov.dm
index 1747b2d9c0b..21310ebefc0 100644
--- a/modular_skyrat/modules/goofsec/code/terragov.dm
+++ b/modular_skyrat/modules/goofsec/code/terragov.dm
@@ -835,6 +835,11 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
 	else
 		user.balloon_alert(user, "beam-out cancelled")
 
+#undef TERRAGOV_AMT
+#undef TERRAGOV_VOTES
+#undef TERRAGOV_DECLARED
+#undef TERRAGOV_FINE_AMOUNT
+
 #undef EMERGENCY_RESPONSE_POLICE
 #undef EMERGENCY_RESPONSE_ATMOS
 #undef EMERGENCY_RESPONSE_EMT
diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm
index 2f9640ca75d..cb3a96adc1b 100644
--- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm
+++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm
@@ -860,9 +860,13 @@
 #undef HEV_COOLDOWN_HEAL
 #undef HEV_COOLDOWN_RADS
 #undef HEV_COOLDOWN_ACID
+#undef PCV_COOLDOWN_HEAL
+#undef PCV_COOLDOWN_RADS
+#undef PCV_COOLDOWN_ACID
 #undef HEV_HEAL_AMOUNT
 #undef PCV_HEAL_AMOUNT
 #undef HEV_BLOOD_REPLENISHMENT
+#undef PCV_BLOOD_REPLENISHMENT
 #undef HEV_NOTIFICATION_TEXT_AND_VOICE
 #undef HEV_NOTIFICATION_TEXT
 #undef HEV_NOTIFICATION_VOICE
diff --git a/modular_skyrat/modules/implants/code/augments_brain.dm b/modular_skyrat/modules/implants/code/augments_brain.dm
index 7e9904b056a..2018dc54682 100644
--- a/modular_skyrat/modules/implants/code/augments_brain.dm
+++ b/modular_skyrat/modules/implants/code/augments_brain.dm
@@ -98,3 +98,5 @@
 			if(dead_mob.client)
 				var/link = FOLLOW_LINK(dead_mob, user)
 				to_chat(dead_mob, "[link] [rendered]")
+
+#undef LANGUAGE_IMPLANT
diff --git a/modular_skyrat/modules/kahraman_equipment/code/ore_thumper.dm b/modular_skyrat/modules/kahraman_equipment/code/ore_thumper.dm
index 9bd9591fcb5..6372beb59ac 100644
--- a/modular_skyrat/modules/kahraman_equipment/code/ore_thumper.dm
+++ b/modular_skyrat/modules/kahraman_equipment/code/ore_thumper.dm
@@ -272,3 +272,5 @@
 
 /obj/item/flatpacked_machine/ore_thumper/give_manufacturer_examine()
 	AddElement(/datum/element/manufacturer_examine, COMPANY_KAHRAMAN)
+
+#undef SLAM_JAM_DELAY
diff --git a/modular_skyrat/modules/layer_shift/code/mob_movement.dm b/modular_skyrat/modules/layer_shift/code/mob_movement.dm
index be3ed4764f2..70ae9523f38 100644
--- a/modular_skyrat/modules/layer_shift/code/mob_movement.dm
+++ b/modular_skyrat/modules/layer_shift/code/mob_movement.dm
@@ -74,3 +74,8 @@
 	var/mob/living/layer_shifter = user
 
 	return layer_shifter.shift_layer_down()
+
+#undef MOB_LAYER_SHIFT_INCREMENT
+#undef MOB_LAYER_MULTIPLIER
+#undef MOB_LAYER_SHIFT_MIN
+#undef MOB_LAYER_SHIFT_MAX
diff --git a/modular_skyrat/modules/lowpop/code/lowpop_subsystem.dm b/modular_skyrat/modules/lowpop/code/lowpop_subsystem.dm
index 30886a8659d..d515e09fbe3 100644
--- a/modular_skyrat/modules/lowpop/code/lowpop_subsystem.dm
+++ b/modular_skyrat/modules/lowpop/code/lowpop_subsystem.dm
@@ -1,6 +1,5 @@
 #define LOWPOP_ON_MESSAGE "Due to staffing issues, we have enacted the 'critically low staff' protocol. We will periodically use our high-intensity electron beam to recharge your SMES arrays."
 #define LOWPOP_OFF_MESSAGE "As the staffing issues have been resolved, we have resumed normal staffing protocol. Automatic SMES recharging will no longer occur."
-#define RECHARGE_THRESHOLD 70
 
 // A subsystem for handling lowpop affairs.
 SUBSYSTEM_DEF(lowpop)
@@ -96,3 +95,6 @@ SUBSYSTEM_DEF(lowpop)
 
 	// Let's keep it running quieter
 	// minor_announce("All SMESs on [station_name()] have been recharged via electron beam.", "Power Systems Recharged")
+
+#undef LOWPOP_ON_MESSAGE
+#undef LOWPOP_OFF_MESSAGE
diff --git a/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm b/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm
index 51f02c80785..95410420c7f 100644
--- a/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm
+++ b/modular_skyrat/modules/maturity-prompt/code/maturity_subsystem.dm
@@ -265,3 +265,9 @@ SUBSYSTEM_DEF(maturity_guard)
 	to_chat(user, player_ban_notification)
 
 	qdel(user.client)
+
+#undef AGE_TO_PLAY
+
+#undef AGE_CHECK_INVALID
+#undef AGE_CHECK_UNDERAGE
+#undef AGE_CHECK_PASSED
diff --git a/modular_skyrat/modules/medical/code/wounds/medical.dm b/modular_skyrat/modules/medical/code/wounds/medical.dm
index 9d0e4ba2487..73b4d355e08 100644
--- a/modular_skyrat/modules/medical/code/wounds/medical.dm
+++ b/modular_skyrat/modules/medical/code/wounds/medical.dm
@@ -129,3 +129,6 @@
 
 /obj/item/stack/medical/gauze/improvised
 	splint_prefix = "splint_improv"
+
+#undef SELF_AID_REMOVE_DELAY
+#undef OTHER_AID_REMOVE_DELAY
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm
index c0de490bae9..b4ca3a49eb2 100644
--- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm
+++ b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm
@@ -223,6 +223,9 @@ These are basically advanced cells.
 
 
 #undef MICROFUSION_CELL_DRAIN_FAILURE
+#undef MICROFUSION_CELL_EMP_HEAVY_FAILURE
+#undef MICROFUSION_CELL_EMP_LIGHT_FAILURE
+#undef MICROFUSION_CELL_RADIATION_RANGE_FAILURE
 
 #undef MICROFUSION_CELL_FAILURE_LOWER
 #undef MICROFUSION_CELL_FAILURE_UPPER
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
index 8caa3ee2ba8..b4975b9044f 100644
--- a/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
+++ b/modular_skyrat/modules/microfusion/code/microfusion_designs.dm
@@ -429,3 +429,13 @@
 		/datum/material/bananium = HALF_SHEET_MATERIAL_AMOUNT,
 	)
 	build_path = /obj/item/microfusion_gun_attachment/camo/honk
+
+#undef RND_CATEGORY_MICROFUSION_WEAPONS
+#undef RND_MICROFUSION_CELLS
+#undef RND_MICROFUSION_CELL_ATTACHMENTS
+#undef RND_MICROFUSION_EMITTERS
+#undef RND_MICROFUSION_ATTACHMENT
+#undef RND_MICROFUSION_ATTACHMENT_BARREL
+#undef RND_MICROFUSION_ATTACHMENT_UNDERBARREL
+#undef RND_MICROFUSION_ATTACHMENT_RAIL
+#undef RND_MICROFUSION_ATTACHMENT_UNIQUE
diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
index 5f96ceaca07..4709c04362c 100644
--- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
+++ b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm
@@ -788,3 +788,5 @@
 /// Recalculates the recoil, based on attachment-provided values.
 /obj/item/gun/microfusion/proc/recalculate_recoil()
 	recoil = max(0, attachment_recoil)
+
+#undef DUALWIELD_PENALTY_EXTRA_MULTIPLIER
diff --git a/modular_skyrat/modules/modular_items/code/modular_glasses.dm b/modular_skyrat/modules/modular_items/code/modular_glasses.dm
index 3764d12e6b9..9c7198bf440 100644
--- a/modular_skyrat/modules/modular_items/code/modular_glasses.dm
+++ b/modular_skyrat/modules/modular_items/code/modular_glasses.dm
@@ -282,3 +282,7 @@
 	icon_state = "projector_sci"
 	clothing_traits = list(TRAIT_REAGENT_SCANNER, TRAIT_RESEARCH_SCANNER)
 
+#undef MODE_OFF
+#undef MODE_OFF_FLASH_PROTECTION
+#undef MODE_ON
+#undef MODE_FREEZE_ANIMATION
diff --git a/modular_skyrat/modules/modular_items/code/necklace.dm b/modular_skyrat/modules/modular_items/code/necklace.dm
index 7d994e3640d..a2044bf2bf1 100644
--- a/modular_skyrat/modules/modular_items/code/necklace.dm
+++ b/modular_skyrat/modules/modular_items/code/necklace.dm
@@ -40,3 +40,5 @@
 		to_chat(user, span_boldnotice("You feel the alien mind of the Necropolis lose its interest in you as you remove the necklace. The eye closes, and your mind does as well, losing its grasp of Ashtongue."))
 
 //ASHWALKER TRANSLATOR NECKLACE END//
+
+#undef LANGUAGE_TRANSLATOR
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
index af2102cea3d..6f63604ae37 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/status_effects/climax.dm
@@ -61,3 +61,7 @@
 		balls.aroused = AROUSAL_NONE
 	if(anus)
 		anus.aroused = AROUSAL_NONE
+
+#undef AROUSAL_REMOVAL_AMOUNT
+#undef STAMINA_REMOVAL_AMOUNT_EXTERNAL
+#undef STAMINA_REMOVAL_AMOUNT_SELF
diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
index 53f9a1588f7..a1419f226c7 100644
--- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
+++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm
@@ -1,18 +1,3 @@
-#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
-
-#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
-
-#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
-
-#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
-									/datum/material/titanium = SMALL_MATERIAL_AMOUNT * 1)
-
-#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)
-
-
 /obj/item/ammo_casing/caflechette
 	name = "flechette steel penetrator"
 	desc = "A Romfed standard rifle flechette."
@@ -137,13 +122,3 @@
 		var/mob/living/carbon/M = target
 		M.adjust_fire_stacks(12)
 		M.ignite_mob()
-
-#undef AMMO_MATS_SHOTGUN
-
-#undef AMMO_MATS_SHOTGUN_FLECH
-
-#undef AMMO_MATS_SHOTGUN_HIVE
-
-#undef AMMO_MATS_SHOTGUN_TIDE
-
-#undef AMMO_MATS_SHOTGUN_PLASMA
diff --git a/modular_skyrat/modules/moretraitoritems/code/weapons.dm b/modular_skyrat/modules/moretraitoritems/code/weapons.dm
index ae920d19043..37b6cc2b774 100644
--- a/modular_skyrat/modules/moretraitoritems/code/weapons.dm
+++ b/modular_skyrat/modules/moretraitoritems/code/weapons.dm
@@ -214,3 +214,5 @@
 	force = 15
 	block_chance = 30
 	armour_penetration = 5
+
+#undef CALIBRE_14MM
diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm
index 08f70a707e9..97f60d7e51c 100644
--- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm
+++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm
@@ -466,3 +466,7 @@
 /obj/item/mounted_machine_gun_folded/Initialize(mapload)
 	. = ..()
 	AddComponent(/datum/component/deployable, deploy_time, type_to_deploy)
+
+#undef BARREL_HEAT_THRESHOLD_LOW
+#undef BARREL_HEAT_THRESHOLD_HIGH
+#undef REPAIR_WELDER_COST
diff --git a/modular_skyrat/modules/mutants/code/mutant_component.dm b/modular_skyrat/modules/mutants/code/mutant_component.dm
index 60e6e5a5d3e..130ab1ea524 100644
--- a/modular_skyrat/modules/mutants/code/mutant_component.dm
+++ b/modular_skyrat/modules/mutants/code/mutant_component.dm
@@ -182,3 +182,10 @@
 
 	animate(filter, alpha = 110, time = 1.5 SECONDS, loop = -1)
 	animate(alpha = 40, time = 2.5 SECONDS)
+
+#undef CURE_TIME
+#undef REVIVE_TIME_LOWER
+#undef REVIVE_TIME_UPPER
+#undef IMMUNITY_LOWER
+#undef IMMUNITY_UPPER
+#undef RNA_REFRESH_TIME
diff --git a/modular_skyrat/modules/novaya_ert/code/suit.dm b/modular_skyrat/modules/novaya_ert/code/suit.dm
index 1658aa87e55..35a529f1523 100644
--- a/modular_skyrat/modules/novaya_ert/code/suit.dm
+++ b/modular_skyrat/modules/novaya_ert/code/suit.dm
@@ -93,3 +93,13 @@
 	name = "\improper VOSKHOD-IN powered combat armor"
 	desc = "A hybrid set of space-resistant armor built on a modified Nanotrasen heavy-duty engineering undersuit, polyurea coated lead-lined light plasteel plates hinder mobility as little as possible and offer additional radiation protection while the onboard life support system aids the user in combat. The power cell is what makes the armor work without hassle, a sticker in the power supply unit warns anyone reading to responsibly manage battery levels."
 	icon_state = "nri_engineer"
+
+#undef NRI_POWERUSE_HIT
+#undef NRI_POWERUSE_HEAL
+
+#undef NRI_COOLDOWN_HEAL
+#undef NRI_COOLDOWN_RADS
+#undef NRI_COOLDOWN_ACID
+
+#undef NRI_HEAL_AMOUNT
+#undef NRI_BLOOD_REPLENISHMENT
diff --git a/modular_skyrat/modules/novaya_ert/code/surplus_armor.dm b/modular_skyrat/modules/novaya_ert/code/surplus_armor.dm
index 6bb941c32e6..834c04d9cf5 100644
--- a/modular_skyrat/modules/novaya_ert/code/surplus_armor.dm
+++ b/modular_skyrat/modules/novaya_ert/code/surplus_armor.dm
@@ -270,3 +270,8 @@
 #undef CIN_FOREST_COLORS_COMPLIMENT
 #undef CIN_MARINE_COLORS_COMPLIMENT
 #undef CIN_EVIL_COLORS_COMPLIMENT
+
+#undef HELMET_NO_ACCESSORIES
+#undef HELMET_CHINSTRAP
+#undef HELMET_GLASS_VISOR
+#undef HELMET_BOTH_OF_THE_ABOVE
diff --git a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
index ead688b47c6..5324970274f 100644
--- a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
+++ b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm
@@ -387,3 +387,4 @@
 	return .
 
 #undef WEAPON_COMPLETION_WOOD_AMOUNT
+#undef BAD_HIT_PENALTY
diff --git a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm
index 9bf289428b0..1f974cc0f54 100644
--- a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm
+++ b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm
@@ -304,8 +304,6 @@
 	user.put_in_hands(converted_arrow)
 	qdel(src)
 
-#define INCREASE_BLOCK_CHANGE 2
-
 /obj/item/forging/reagent_weapon/bokken
 	name = "bokken"
 	desc = "A wooden sword that is capable of wielded in two hands. It seems to be made to prevent permanent injuries."
diff --git a/modular_skyrat/modules/salon/code/fur_dyer.dm b/modular_skyrat/modules/salon/code/fur_dyer.dm
index 9eb93c7a65e..3897c79b13c 100644
--- a/modular_skyrat/modules/salon/code/fur_dyer.dm
+++ b/modular_skyrat/modules/salon/code/fur_dyer.dm
@@ -130,3 +130,5 @@
 
 		playsound(src.loc, 'sound/effects/spray2.ogg', 50, TRUE)
 
+#undef COLOR_MODE_SPECIFIC
+#undef COLOR_MODE_GENERAL
diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
index 5f9520b9144..fc921dad2f2 100644
--- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
+++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm
@@ -1,19 +1,3 @@
-#define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet
-
-#define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/glass = SMALL_MATERIAL_AMOUNT * 2)
-
-#define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
-									/datum/material/silver = SMALL_MATERIAL_AMOUNT * 1)
-
-#define AMMO_MATS_SHOTGUN_TIDE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 1,\
-									/datum/material/gold = SMALL_MATERIAL_AMOUNT * 1)
-
-#define AMMO_MATS_SHOTGUN_PLASMA list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\
-									/datum/material/plasma = SMALL_MATERIAL_AMOUNT * 2)
-
 /obj/item/ammo_casing/shotgun
 	icon = 'modular_skyrat/modules/shotgunrebalance/icons/shotshells.dmi'
 	desc = "A 12 gauge iron slug."
diff --git a/modular_skyrat/modules/tesh_augments/code/mechfabricator_designs.dm b/modular_skyrat/modules/tesh_augments/code/mechfabricator_designs.dm
index cdb8c7e632d..496e7511e48 100644
--- a/modular_skyrat/modules/tesh_augments/code/mechfabricator_designs.dm
+++ b/modular_skyrat/modules/tesh_augments/code/mechfabricator_designs.dm
@@ -130,3 +130,6 @@
 	category = list(
 		RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_ADVANCED_RAPTORAL,
 	)
+
+#undef RND_SUBCATEGORY_MECHFAB_CYBORG_RAPTORAL
+#undef RND_SUBCATEGORY_CYBERNETICS_ADVANCED_RAPTORAL
diff --git a/modular_skyrat/modules/title_screen/code/title_screen_html.dm b/modular_skyrat/modules/title_screen/code/title_screen_html.dm
index 855b547bd40..bf530baafdf 100644
--- a/modular_skyrat/modules/title_screen/code/title_screen_html.dm
+++ b/modular_skyrat/modules/title_screen/code/title_screen_html.dm
@@ -181,3 +181,5 @@ GLOBAL_LIST_EMPTY(startup_messages)
 	dat += "</body></html>"
 
 	return dat
+
+#undef MAX_STARTUP_MESSAGES
diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
index a12989d0670..c0cbd7f13ef 100644
--- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
+++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/designs_and_tech.dm
@@ -237,3 +237,8 @@
 		/obj/item/xenoarch/useless_relic = 1,
 		/obj/item/xenoarch/broken_item = 2,
 	)
+
+#undef RND_SUBCATEGORY_MACHINE_XENOARCH
+#undef RND_SUBCATEGORY_EQUIPMENT_XENOARCH
+#undef RND_SUBCATEGORY_TOOLS_XENOARCH
+#undef RND_SUBCATEGORY_TOOLS_XENOARCH_ADVANCED
diff --git a/modular_zubbers/code/game/objects/items/robot/items/hypo.dm b/modular_zubbers/code/game/objects/items/robot/items/hypo.dm
index c6023ef5a07..a12e4d0ce66 100644
--- a/modular_zubbers/code/game/objects/items/robot/items/hypo.dm
+++ b/modular_zubbers/code/game/objects/items/robot/items/hypo.dm
@@ -8,3 +8,5 @@
 	name = "Basic Injector"
 	desc = "Provides basic medical assistance."
 	default_reagent_types = BASE_CENTCOM_REAGENTS
+
+#undef BASE_CENTCOM_REAGENTS
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/cloak.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/cloak.dm
index ec46a3bc824..bdec076138e 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/cloak.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/cloak.dm
@@ -1,4 +1,3 @@
-
 #define USE_SEEN_CLOAK_LEVEL 2
 #define USE_RUN_CLOAK_LEVEL 4
 
@@ -82,3 +81,6 @@
 	if(level_current < USE_RUN_CLOAK_LEVEL && was_running && user.move_intent == MOVE_INTENT_WALK)
 		user.toggle_move_intent()
 	user.balloon_alert(user, "cloak turned off.")
+
+#undef USE_SEEN_CLOAK_LEVEL
+#undef USE_RUN_CLOAK_LEVEL
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm
index aac1c8afbdb..7cacd74efba 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/fortitude.dm
@@ -104,3 +104,5 @@
 	fortitude_resist = 1
 	UnregisterSignal(owner, list(COMSIG_LIVING_ADJUST_BRUTE_DAMAGE, COMSIG_LIVING_ADJUST_BURN_DAMAGE))
 	return ..()
+
+#undef FORTITUDE_STUN_IMMUNITY_LEVEL
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm
index 8001ef2a11a..963562ce558 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/dominate.dm
@@ -214,3 +214,4 @@
 
 #undef TEMP_GHOULIZE_COST
 #undef DOMINATE_XRAY_LEVEL
+#undef DOMINATE_NON_MUTE_GHOULIZE_LEVEL
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm
index c46eb4c1dad..4913dc2171b 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/powers/tremere/thaumaturgy.dm
@@ -286,3 +286,4 @@
 #undef THAUMATURGY_SHIELD_LEVEL
 #undef THAUMATURGY_DOOR_BREAK_LEVEL
 #undef THAUMATURGY_BLOOD_STEAL_LEVEL
+#undef THAUMATURGY_EXTRA_DAMAGE_LEVEL
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm
index 25c2a07e7e8..40e5af31e13 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/vassal/vassal_datum.dm
@@ -1,8 +1,3 @@
-#define GHOUL_SCAN_MIN_DISTANCE 5
-#define GHOUL_SCAN_MAX_DISTANCE 500
-/// 2s update time.
-#define GHOUL_SCAN_PING_TIME 20
-
 /datum/antagonist/ghoul
 	name = "\improper Ghoul"
 	roundend_category = "ghouls"
diff --git a/modular_zubbers/code/modules/antagonists/modglue.dm b/modular_zubbers/code/modules/antagonists/modglue.dm
index 93fa29a0218..836718a36c8 100644
--- a/modular_zubbers/code/modules/antagonists/modglue.dm
+++ b/modular_zubbers/code/modules/antagonists/modglue.dm
@@ -108,3 +108,7 @@
 	thing.screen_loc = null
 	if(thing.maptext)
 		thing.maptext = ""
+
+#undef PULL_SUIT
+#undef IGNORE_SUIT
+#undef DUMP_CONTENTS
diff --git a/modular_zubbers/code/modules/client/verbs/character_directory.dm b/modular_zubbers/code/modules/client/verbs/character_directory.dm
index bbae72f6561..b5e55104673 100644
--- a/modular_zubbers/code/modules/client/verbs/character_directory.dm
+++ b/modular_zubbers/code/modules/client/verbs/character_directory.dm
@@ -307,3 +307,5 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
 				panel = typed_target.tgui
 				panel.holder = typed_target
 			panel.ui_interact(user)
+
+#undef READ_PREFS
diff --git a/modular_zubbers/code/modules/debug_tools/physgun.dm b/modular_zubbers/code/modules/debug_tools/physgun.dm
index 0b58e6ed103..5a2af1aa4e6 100644
--- a/modular_zubbers/code/modules/debug_tools/physgun.dm
+++ b/modular_zubbers/code/modules/debug_tools/physgun.dm
@@ -337,3 +337,6 @@
 /datum/status_effect/physgun_pause/admin
 	id = "physgun_pause_admin"
 	force = TRUE
+
+#undef TRAIT_PHYSGUN_PAUSE
+#undef PHYSGUN_EFFECTS
diff --git a/modular_zubbers/code/modules/loadout/~defines.dm b/modular_zubbers/code/modules/loadout/~defines.dm
deleted file mode 100644
index 37d675d0c00..00000000000
--- a/modular_zubbers/code/modules/loadout/~defines.dm
+++ /dev/null
@@ -1,7 +0,0 @@
-#define ALL_JOBS_SEC JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER, JOB_SECURITY_MEDIC
-#define ALL_JOBS_DEPT_GUARDS JOB_CORRECTIONS_OFFICER, JOB_ENGINEERING_GUARD, JOB_ORDERLY, JOB_SCIENCE_GUARD, JOB_CUSTOMS_AGENT, JOB_BOUNCER
-#define ALL_JOBS_CENTRAL JOB_NT_REP, JOB_BLUESHIELD
-#define ALL_JOBS_MEDICAL JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CHEMIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER
-#define ALL_JOBS_SCIENCE JOB_SCIENTIST, JOB_ROBOTICIST, JOB_GENETICIST, JOB_RESEARCH_DIRECTOR, JOB_CHEMIST, JOB_SCIENCE_GUARD
-#define ALL_JOBS_CARGO JOB_QUARTERMASTER, JOB_CARGO_TECHNICIAN, JOB_CUSTOMS_AGENT, JOB_SHAFT_MINER, JOB_BITRUNNER
-#define ALL_JOBS_ENGINEERING JOB_CHIEF_ENGINEER, JOB_STATION_ENGINEER, JOB_ATMOSPHERIC_TECHNICIAN, JOB_ENGINEERING_GUARD
diff --git a/modular_zubbers/code/modules/shelves/shelf.dm b/modular_zubbers/code/modules/shelves/shelf.dm
index 22fe9fc1c72..e2e98454d55 100644
--- a/modular_zubbers/code/modules/shelves/shelf.dm
+++ b/modular_zubbers/code/modules/shelves/shelf.dm
@@ -233,3 +233,7 @@
 	var/obj/item/rack_parts/shelf/newparts = new(loc)
 	transfer_fingerprints_to(newparts)
 	qdel(src)
+
+#undef DEFAULT_SHELF_CAPACITY
+#undef DEFAULT_SHELF_USE_DELAY
+#undef DEFAULT_SHELF_VERTICAL_OFFSET
diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm
index 58d105e8cc8..fecc9397435 100644
--- a/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm
+++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_defines.dm
@@ -1,165 +1,3 @@
-// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
-
-/************************************************************
-			CYBORG ICON DEFINES AND TYPES GO BELOW
-*************************************************************/
-
-//CENTCOM BORG ICON DEFINES
-#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cc.dmi'
-#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cc.dmi'
-
-
-//CLOWN BORG ICON DEFINES
-#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_clown.dmi'
-#define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_clown.dmi'
-
-
-//MEDICAL BORG ICON DEFINES
-#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_med.dmi'
-#define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_med.dmi'
-#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_med.dmi'
-#define CYBORG_ICON_MED_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_med.dmi'
-
-
-//CARGO BORG ICON DEFINES
-#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cargo.dmi'
-#define CYBORG_ICON_CARGO_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_cargo.dmi'
-#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cargo.dmi'
-
-
-//SECURITY BORG ICON DEFINES
-#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sec.dmi'
-#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sec.dmi'
-#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sec.dmi'
-
-
-//ENGI BORG ICON DEFINES
-#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_eng.dmi'
-#define CYBORG_ICON_ENG_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_eng.dmi'
-#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_eng.dmi'
-#define CYBORG_ICON_ENG_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_eng.dmi'
-
-
-//PEACEKEEPER BORG ICON DEFINES
-#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_pk.dmi'
-#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_pk.dmi'
-#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_pk.dmi'
-#define CYBORG_ICON_PEACEKEEPER_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_pk.dmi'
-
-
-//SERVICE BORG ICON DEFINES
-#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_serv.dmi'
-#define CYBORG_ICON_SERVICE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_serv.dmi'
-#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_serv.dmi'
-#define CYBORG_ICON_SERVICE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_serv.dmi'
-#define CYBORG_ICON_SERVICE_BUNDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_bun.dmi'
-
-
-//MINING BORG ICON DEFINES
-#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_mine.dmi'
-#define CYBORG_ICON_MINING_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_mine.dmi'
-#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_mine.dmi'
-#define CYBORG_ICON_MINING_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_mine.dmi'
-
-
-//JANI BORG ICON DEFINES
-#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_jani.dmi'
-#define CYBORG_ICON_JANI_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_jani.dmi'
-#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_jani.dmi'
-#define CYBORG_ICON_JANI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_jani.dmi'
-
-
-//SYNDICATE BORG ICON DEFINES
-#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_syndie.dmi'
-#define CYBORG_ICON_SYNDIE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_syndie.dmi'
-#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_syndie.dmi'
-#define CYBORG_ICON_SYNDIE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_syndie.dmi'
-
-
-//NINJA BORG ICON DEFINES
-#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_ninja.dmi'
-#define CYBORG_ICON_NINJA_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_ninja.dmi'
-#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_ninja.dmi'
-
-
-//SCIENCE BORG ICON DEFINES
-#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sci.dmi'
-#define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sci.dmi'
-#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sci.dmi'
-#define CYBORG_ICON_SCI 'modular_zubbers/code/modules/silicons/borgs/sprites/robot_sci.dmi'
-#define CYBORG_ICON_SCI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_sci.dmi'
-
-// RAPTOR BORG ICON TYPE DEFINE
-#define CYBORG_ICON_TYPE_RAPTOR "raptor"
-
-
-//	SMOLRAPTOR BORG DEFINES BELOW
-
-#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
-
-#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi'
-#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi'
-#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_eng.dmi'
-#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_med.dmi'
-#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi'
-#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi'
-#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi'
-#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi'
-#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi'
-#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi'
-#define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi'
-#define CYBORG_ICON_NIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi'
-
-
-// F3-LINE BORG DEFINES BELOW
-
-#define CYBORG_ICON_ALL_FELI 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi'
-
-#define CYBORG_ICON_TYPE_GEN_FELI "FELI-Standard"
-#define CYBORG_ICON_TYPE_SCI_FELI "FELI-Research"
-#define CYBORG_ICON_TYPE_ENG_FELI "FELI-Engineer"
-#define CYBORG_ICON_TYPE_MED_FELI "FELI-Medical"
-#define CYBORG_ICON_TYPE_CAR_FELI "FELI-Cargo"
-#define CYBORG_ICON_TYPE_SERV_FELI "FELI-Service"
-#define CYBORG_ICON_TYPE_PK_FELI "FELI-Pk"
-#define CYBORG_ICON_TYPE_JANI_FELI "FELI-Janitor"
-#define CYBORG_ICON_TYPE_MINE_FELI "FELI-Mining"
-#define CYBORG_ICON_TYPE_SEC_FELI "FELI-Security"
-#define CYBORG_ICON_TYPE_SYNDI_FELI "FELI-Combat"
-#define CYBORG_ICON_TYPE_NINJA_FELI "FELI-Ninja"
-
-
-// KITTY BORG DEFINES BELOW
-
-#define CYBORG_ICON_SCI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sci.dmi'
-#define CYBORG_ICON_ENG_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_engi.dmi'
-#define CYBORG_ICON_MED_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_medicat.dmi'
-#define CYBORG_ICON_SEC_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sec.dmi'
-#define CYBORG_ICON_SERV_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_service.dmi'
-#define CYBORG_ICON_JANI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_jani.dmi'
-#define CYBORG_ICON_MINE_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_mine.dmi'
-
-// CAT BORG DEFINES BELOW
-
-#define CYBORG_ICON_SCI_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi'
-#define CYBORG_ICON_ENG_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi'
-#define CYBORG_ICON_MED_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi'
-#define CYBORG_ICON_SEC_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi'
-#define CYBORG_ICON_SERV_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi'
-#define CYBORG_ICON_MINE_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi'
-
-/mob/living/silicon/robot/model/centcom
-	icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
-	icon_state = "valecc"
-	faction = list(ROLE_DEATHSQUAD)
-	req_access = list(ACCESS_CENT_GENERAL)
-	lawupdate = FALSE
-	scrambledcodes = TRUE // These are not station borgs.
-	ionpulse = TRUE
-	var/playstyle_string = "<span class='big bold'>You are a Central Command cyborg!</span><br>"
-	set_model = /obj/item/robot_model/centcom
-	cell = /obj/item/stock_parts/power_store/cell/bluespace
-
 /mob/living/silicon/robot/model/centcom/Initialize(mapload)
 	laws = new /datum/ai_laws/central_override()
 	laws.associate(src)
diff --git a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
index 75e301cf25c..25ff8291107 100644
--- a/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
+++ b/modular_zubbers/code/modules/silicons/borgs/code/robot_model.dm
@@ -1,3 +1,165 @@
+// Bubberstation custom borg sprites, add new defines in line with code\__DEFINES\~skyrat_defines\robot_defines.dm format
+
+/************************************************************
+			CYBORG ICON DEFINES AND TYPES GO BELOW
+*************************************************************/
+
+//CENTCOM BORG ICON DEFINES
+#define CYBORG_ICON_CENTCOM_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cc.dmi'
+#define CYBORG_ICON_CENTCOM_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cc.dmi'
+
+
+//CLOWN BORG ICON DEFINES
+#define CYBORG_ICON_CLOWN_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_clown.dmi'
+#define CYBORG_ICON_CLOWN_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_clown.dmi'
+
+
+//MEDICAL BORG ICON DEFINES
+#define CYBORG_ICON_MED_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_med.dmi'
+#define CYBORG_ICON_MED_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_med.dmi'
+#define CYBORG_ICON_MED_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_med.dmi'
+#define CYBORG_ICON_MED_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_med.dmi'
+
+
+//CARGO BORG ICON DEFINES
+#define CYBORG_ICON_CARGO_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_cargo.dmi'
+#define CYBORG_ICON_CARGO_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_cargo.dmi'
+#define CYBORG_ICON_CARGO_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_cargo.dmi'
+
+
+//SECURITY BORG ICON DEFINES
+#define CYBORG_ICON_SEC_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sec.dmi'
+#define CYBORG_ICON_SEC_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sec.dmi'
+#define CYBORG_ICON_SEC_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sec.dmi'
+
+
+//ENGI BORG ICON DEFINES
+#define CYBORG_ICON_ENG_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_eng.dmi'
+#define CYBORG_ICON_ENG_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_eng.dmi'
+#define CYBORG_ICON_ENG_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_eng.dmi'
+#define CYBORG_ICON_ENG_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_eng.dmi'
+
+
+//PEACEKEEPER BORG ICON DEFINES
+#define CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_pk.dmi'
+#define CYBORG_ICON_PEACEKEEPER_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_pk.dmi'
+
+
+//SERVICE BORG ICON DEFINES
+#define CYBORG_ICON_SERVICE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_serv.dmi'
+#define CYBORG_ICON_SERVICE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_serv.dmi'
+#define CYBORG_ICON_SERVICE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_serv.dmi'
+#define CYBORG_ICON_SERVICE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_serv.dmi'
+#define CYBORG_ICON_SERVICE_BUNDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_bun.dmi'
+
+
+//MINING BORG ICON DEFINES
+#define CYBORG_ICON_MINING_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_mine.dmi'
+#define CYBORG_ICON_MINING_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_mine.dmi'
+#define CYBORG_ICON_MINING_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_mine.dmi'
+#define CYBORG_ICON_MINING_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_mine.dmi'
+
+
+//JANI BORG ICON DEFINES
+#define CYBORG_ICON_JANI_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_jani.dmi'
+#define CYBORG_ICON_JANI_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_jani.dmi'
+#define CYBORG_ICON_JANI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_jani.dmi'
+#define CYBORG_ICON_JANI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_jani.dmi'
+
+
+//SYNDICATE BORG ICON DEFINES
+#define CYBORG_ICON_SYNDIE_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_syndie.dmi'
+#define CYBORG_ICON_SYNDIE_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_syndie.dmi'
+#define CYBORG_ICON_SYNDIE_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_syndie.dmi'
+#define CYBORG_ICON_SYNDIE_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_syndie.dmi'
+
+
+//NINJA BORG ICON DEFINES
+#define CYBORG_ICON_NINJA_WIDE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_ninja.dmi'
+#define CYBORG_ICON_NINJA_TALL_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_ninja.dmi'
+#define CYBORG_ICON_NINJA_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_ninja.dmi'
+
+
+//SCIENCE BORG ICON DEFINES
+#define CYBORG_ICON_SCI_WIDE 'modular_zubbers/code/modules/silicons/borgs/sprites/widerobot_sci.dmi'
+#define CYBORG_ICON_SCI_TALL 'modular_zubbers/code/modules/silicons/borgs/sprites/tallrobot_sci.dmi'
+#define CYBORG_ICON_SCI_LARGE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/largerobot_sci.dmi'
+#define CYBORG_ICON_SCI 'modular_zubbers/code/modules/silicons/borgs/sprites/robot_sci.dmi'
+#define CYBORG_ICON_SCI_HAYDEE_BUBBER 'modular_zubbers/code/modules/silicons/borgs/sprites/curverobot_sci.dmi'
+
+// RAPTOR BORG ICON TYPE DEFINE
+#define CYBORG_ICON_TYPE_RAPTOR "raptor"
+
+
+//	SMOLRAPTOR BORG DEFINES BELOW
+
+#define CYBORG_ICON_TYPE_SMOLRAPTOR "smolraptor"
+
+#define CYBORG_ICON_GEN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_gen.dmi'
+#define CYBORG_ICON_SCI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_sci.dmi'
+#define CYBORG_ICON_ENG_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_eng.dmi'
+#define CYBORG_ICON_MED_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_med.dmi'
+#define CYBORG_ICON_CAR_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_car.dmi'
+#define CYBORG_ICON_SERV_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_serv.dmi'
+#define CYBORG_ICON_PK_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_pk.dmi'
+#define CYBORG_ICON_JANI_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_jani.dmi'
+#define CYBORG_ICON_MIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_min.dmi'
+#define CYBORG_ICON_CC_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_cc.dmi'
+#define CYBORG_ICON_SYN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_syndie.dmi'
+#define CYBORG_ICON_NIN_SMOLRAPTOR 'modular_zubbers/code/modules/silicons/borgs/sprites/smallraptors/smolraptor_ninja.dmi'
+
+
+// F3-LINE BORG DEFINES BELOW
+
+#define CYBORG_ICON_ALL_FELI 'modular_zubbers/code/modules/silicons/borgs/sprites/felibot_all.dmi'
+
+#define CYBORG_ICON_TYPE_GEN_FELI "FELI-Standard"
+#define CYBORG_ICON_TYPE_SCI_FELI "FELI-Research"
+#define CYBORG_ICON_TYPE_ENG_FELI "FELI-Engineer"
+#define CYBORG_ICON_TYPE_MED_FELI "FELI-Medical"
+#define CYBORG_ICON_TYPE_CAR_FELI "FELI-Cargo"
+#define CYBORG_ICON_TYPE_SERV_FELI "FELI-Service"
+#define CYBORG_ICON_TYPE_PK_FELI "FELI-Pk"
+#define CYBORG_ICON_TYPE_JANI_FELI "FELI-Janitor"
+#define CYBORG_ICON_TYPE_MINE_FELI "FELI-Mining"
+#define CYBORG_ICON_TYPE_SEC_FELI "FELI-Security"
+#define CYBORG_ICON_TYPE_SYNDI_FELI "FELI-Combat"
+#define CYBORG_ICON_TYPE_NINJA_FELI "FELI-Ninja"
+
+
+// KITTY BORG DEFINES BELOW
+
+#define CYBORG_ICON_SCI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sci.dmi'
+#define CYBORG_ICON_ENG_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_engi.dmi'
+#define CYBORG_ICON_MED_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_medicat.dmi'
+#define CYBORG_ICON_SEC_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_sec.dmi'
+#define CYBORG_ICON_SERV_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_service.dmi'
+#define CYBORG_ICON_JANI_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_jani.dmi'
+#define CYBORG_ICON_MINE_KITTYBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/kittyborg/kittyborg_mine.dmi'
+
+// CAT BORG DEFINES BELOW
+
+#define CYBORG_ICON_SCI_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_science.dmi'
+#define CYBORG_ICON_ENG_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_engineering.dmi'
+#define CYBORG_ICON_MED_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_medical.dmi'
+#define CYBORG_ICON_SEC_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_security.dmi'
+#define CYBORG_ICON_SERV_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_service.dmi'
+#define CYBORG_ICON_MINE_CATBORG 'modular_zubbers/code/modules/silicons/borgs/sprites/kittycatborgs/catborgs/catborg_mining.dmi'
+
+/mob/living/silicon/robot/model/centcom
+	icon = CYBORG_ICON_CENTCOM_WIDE_BUBBER
+	icon_state = "valecc"
+	faction = list(ROLE_DEATHSQUAD)
+	req_access = list(ACCESS_CENT_GENERAL)
+	lawupdate = FALSE
+	scrambledcodes = TRUE // These are not station borgs.
+	ionpulse = TRUE
+	var/playstyle_string = "<span class='big bold'>You are a Central Command cyborg!</span><br>"
+	set_model = /obj/item/robot_model/centcom
+	cell = /obj/item/stock_parts/power_store/cell/bluespace
+
 // The actual code to work these in
 
 /******************************************************
@@ -1011,29 +1173,45 @@
 #undef CYBORG_ICON_CENTCOM_WIDE_BUBBER
 #undef CYBORG_ICON_CENTCOM_LARGE_BUBBER
 #undef CYBORG_ICON_CLOWN_WIDE_BUBBER
+#undef CYBORG_ICON_CLOWN_TALL_BUBBER
 #undef CYBORG_ICON_MED_WIDE_BUBBER
+#undef CYBORG_ICON_MED_TALL_BUBBER
 #undef CYBORG_ICON_MED_LARGE_BUBBER
 #undef CYBORG_ICON_CARGO_WIDE_BUBBER
+#undef CYBORG_ICON_CARGO_TALL_BUBBER
 #undef CYBORG_ICON_CARGO_LARGE_BUBBER
 #undef CYBORG_ICON_SEC_WIDE_BUBBER
+#undef CYBORG_ICON_SEC_TALL_BUBBER
 #undef CYBORG_ICON_SEC_LARGE_BUBBER
 #undef CYBORG_ICON_ENG_WIDE_BUBBER
+#undef CYBORG_ICON_ENG_TALL_BUBBER
 #undef CYBORG_ICON_ENG_LARGE_BUBBER
 #undef CYBORG_ICON_PEACEKEEPER_WIDE_BUBBER
 #undef CYBORG_ICON_PEACEKEEPER_TALL_BUBBER
 #undef CYBORG_ICON_PEACEKEEPER_LARGE_BUBBER
 #undef CYBORG_ICON_SERVICE_WIDE_BUBBER
+#undef CYBORG_ICON_SERVICE_TALL_BUBBER
 #undef CYBORG_ICON_SERVICE_LARGE_BUBBER
 #undef CYBORG_ICON_MINING_WIDE_BUBBER
+#undef CYBORG_ICON_MINING_TALL_BUBBER
 #undef CYBORG_ICON_MINING_LARGE_BUBBER
 #undef CYBORG_ICON_JANI_WIDE_BUBBER
+#undef CYBORG_ICON_JANI_TALL_BUBBER
 #undef CYBORG_ICON_JANI_LARGE_BUBBER
 #undef CYBORG_ICON_SYNDIE_WIDE_BUBBER
+#undef CYBORG_ICON_SYNDIE_TALL_BUBBER
 #undef CYBORG_ICON_SYNDIE_LARGE_BUBBER
 #undef CYBORG_ICON_NINJA_WIDE_BUBBER
+#undef CYBORG_ICON_NINJA_TALL_BUBBER
 #undef CYBORG_ICON_NINJA_LARGE_BUBBER
 #undef CYBORG_ICON_TYPE_RAPTOR
 
+#undef CYBORG_ICON_SCI_WIDE
+#undef CYBORG_ICON_SCI_TALL
+#undef CYBORG_ICON_SCI_LARGE_BUBBER
+#undef CYBORG_ICON_SCI
+#undef CYBORG_ICON_SCI_HAYDEE_BUBBER
+
 //small raptors
 #undef CYBORG_ICON_TYPE_SMOLRAPTOR
 #undef CYBORG_ICON_GEN_SMOLRAPTOR
@@ -1046,6 +1224,8 @@
 #undef CYBORG_ICON_JANI_SMOLRAPTOR
 #undef CYBORG_ICON_MIN_SMOLRAPTOR
 #undef CYBORG_ICON_CC_SMOLRAPTOR
+#undef CYBORG_ICON_SYN_SMOLRAPTOR
+#undef CYBORG_ICON_NIN_SMOLRAPTOR
 
 //F3-LINE
 #undef CYBORG_ICON_ALL_FELI
@@ -1053,6 +1233,7 @@
 #undef CYBORG_ICON_TYPE_SCI_FELI
 #undef CYBORG_ICON_TYPE_ENG_FELI
 #undef CYBORG_ICON_TYPE_MED_FELI
+#undef CYBORG_ICON_TYPE_CAR_FELI
 #undef CYBORG_ICON_TYPE_SERV_FELI
 #undef CYBORG_ICON_TYPE_PK_FELI
 #undef CYBORG_ICON_TYPE_JANI_FELI
diff --git a/modular_zubbers/code/modules/storyteller/gamemode.dm b/modular_zubbers/code/modules/storyteller/gamemode.dm
index aa2d578ca55..5e5fa11ee9e 100644
--- a/modular_zubbers/code/modules/storyteller/gamemode.dm
+++ b/modular_zubbers/code/modules/storyteller/gamemode.dm
@@ -790,3 +790,5 @@ SUBSYSTEM_DEF(gamemode)
 	for(var/datum/round_event_control/event as anything in track_events)
 		if(event.type == text2path(type))
 			return event
+
+#undef INIT_ORDER_GAMEMODE
diff --git a/tgstation.dme b/tgstation.dme
index bec96833a71..adc08648ee6 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -419,15 +419,18 @@
 #include "code\__DEFINES\~skyrat_defines\banning.dm"
 #include "code\__DEFINES\~skyrat_defines\barsigns.dm"
 #include "code\__DEFINES\~skyrat_defines\baton_upgrades.dm"
+#include "code\__DEFINES\~skyrat_defines\bsa.dm"
 #include "code\__DEFINES\~skyrat_defines\cargo_import_companies.dm"
 #include "code\__DEFINES\~skyrat_defines\cells.dm"
 #include "code\__DEFINES\~skyrat_defines\chat.dm"
 #include "code\__DEFINES\~skyrat_defines\clock_cult.dm"
+#include "code\__DEFINES\~skyrat_defines\clothing.dm"
 #include "code\__DEFINES\~skyrat_defines\colony_fabricator_misc.dm"
 #include "code\__DEFINES\~skyrat_defines\colors.dm"
 #include "code\__DEFINES\~skyrat_defines\combat.dm"
 #include "code\__DEFINES\~skyrat_defines\computers.dm"
 #include "code\__DEFINES\~skyrat_defines\construction.dm"
+#include "code\__DEFINES\~skyrat_defines\customization.dm"
 #include "code\__DEFINES\~skyrat_defines\DNA.dm"
 #include "code\__DEFINES\~skyrat_defines\economy.dm"
 #include "code\__DEFINES\~skyrat_defines\events.dm"
@@ -498,6 +501,7 @@
 #include "code\__DEFINES\~skyrat_defines\signals\signals_human.dm"
 #include "code\__DEFINES\~skyrat_defines\traits\declarations.dm"
 #include "code\__DEFINES\~~bubber_defines\access.dm"
+#include "code\__DEFINES\~~bubber_defines\bloodsucker.dm"
 #include "code\__DEFINES\~~bubber_defines\cameranets.dm"
 #include "code\__DEFINES\~~bubber_defines\changeling_zombie.dm"
 #include "code\__DEFINES\~~bubber_defines\chat.dm"
@@ -506,6 +510,7 @@
 #include "code\__DEFINES\~~bubber_defines\economy.dm"
 #include "code\__DEFINES\~~bubber_defines\experisci.dm"
 #include "code\__DEFINES\~~bubber_defines\footsteps.dm"
+#include "code\__DEFINES\~~bubber_defines\guns.dm"
 #include "code\__DEFINES\~~bubber_defines\item.dm"
 #include "code\__DEFINES\~~bubber_defines\jobs.dm"
 #include "code\__DEFINES\~~bubber_defines\loadout.dm"
@@ -7536,9 +7541,7 @@
 #include "modular_skyrat\modules\cryosleep\code\mood.dm"
 #include "modular_skyrat\modules\curatorbundle\Mushy.dm"
 #include "modular_skyrat\modules\curatorbundle\Ronin.dm"
-#include "modular_skyrat\modules\customization\__DEFINES\DNA.dm"
 #include "modular_skyrat\modules\customization\__DEFINES\lists.dm"
-#include "modular_skyrat\modules\customization\__DEFINES\loadout.dm"
 #include "modular_skyrat\modules\customization\__HELPERS\DNA.dm"
 #include "modular_skyrat\modules\customization\__HELPERS\global_lists.dm"
 #include "modular_skyrat\modules\customization\__HELPERS\mobs.dm"
@@ -9209,7 +9212,6 @@
 #include "modular_zubbers\code\modules\lewd_machinery\sex_barrier.dm"
 #include "modular_zubbers\code\modules\limbgrowncorpses\limbgrowerblanks.dm"
 #include "modular_zubbers\code\modules\liquids\height_floors.dm"
-#include "modular_zubbers\code\modules\loadout\~defines.dm"
 #include "modular_zubbers\code\modules\loadout\categories\accessories.dm"
 #include "modular_zubbers\code\modules\loadout\categories\ears.dm"
 #include "modular_zubbers\code\modules\loadout\categories\glasses.dm"