diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm
index 2cd7403096..ed391dec5f 100644
--- a/code/ATMOSPHERICS/components/unary/cold_sink.dm
+++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm
@@ -87,7 +87,7 @@
 /obj/machinery/atmospherics/unary/freezer/tgui_act(action, params)
 	if(..())
 		return TRUE
-	
+
 	. = TRUE
 	switch(action)
 		if("toggleStatus")
@@ -173,3 +173,5 @@
 	. = ..()
 	if(panel_open)
 		. += "The maintenance hatch is open."
+
+#undef FREEZER_PERF_MULT
diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm
index efd3a56d8b..85b0dcb821 100644
--- a/code/ATMOSPHERICS/components/unary/heat_source.dm
+++ b/code/ATMOSPHERICS/components/unary/heat_source.dm
@@ -160,3 +160,5 @@
 	. = ..()
 	if(panel_open)
 		. += "The maintenance hatch is open."
+
+#undef HEATER_PERF_MULT
diff --git a/code/__defines/SDQL_2.dm b/code/__defines/SDQL_2.dm
new file mode 100644
index 0000000000..273d42158e
--- /dev/null
+++ b/code/__defines/SDQL_2.dm
@@ -0,0 +1,2 @@
+#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc")
+#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive")
diff --git a/code/__defines/action.dm b/code/__defines/action.dm
new file mode 100644
index 0000000000..bdbe228777
--- /dev/null
+++ b/code/__defines/action.dm
@@ -0,0 +1,5 @@
+#define AB_CHECK_RESTRAINED 1
+#define AB_CHECK_STUNNED 2
+#define AB_CHECK_LYING 4
+#define AB_CHECK_ALIVE 8
+#define AB_CHECK_INSIDE 16
diff --git a/code/__defines/airlock_control.dm b/code/__defines/airlock_control.dm
new file mode 100644
index 0000000000..51667f18cc
--- /dev/null
+++ b/code/__defines/airlock_control.dm
@@ -0,0 +1 @@
+#define AIRLOCK_CONTROL_RANGE 22
diff --git a/code/__defines/blueprints.dm b/code/__defines/blueprints.dm
new file mode 100644
index 0000000000..e00528d8af
--- /dev/null
+++ b/code/__defines/blueprints.dm
@@ -0,0 +1,5 @@
+//TG blueprints.
+#define AREA_ERRNONE 0
+#define AREA_STATION 1
+#define AREA_SPACE 2
+#define AREA_SPECIAL 3
diff --git a/code/__defines/circuitboard.dm b/code/__defines/circuitboard.dm
new file mode 100644
index 0000000000..ca1227af12
--- /dev/null
+++ b/code/__defines/circuitboard.dm
@@ -0,0 +1,2 @@
+//Define a macro that we can use to assemble all the circuit board names
+#define T_BOARD(name)	"circuit board (" + (name) + ")"
diff --git a/code/__defines/cloning.dm b/code/__defines/cloning.dm
new file mode 100644
index 0000000000..afe478f749
--- /dev/null
+++ b/code/__defines/cloning.dm
@@ -0,0 +1 @@
+#define CLONE_BIOMASS 30 //VOREstation Edit
diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm
index cb1d2ad7e7..ecf85abcd9 100644
--- a/code/__defines/dna.dm
+++ b/code/__defines/dna.dm
@@ -74,3 +74,67 @@ var/HALLUCINATIONBLOCK = 0
 var/NOPRINTSBLOCK      = 0
 var/SHOCKIMMUNITYBLOCK = 0
 var/SMALLSIZEBLOCK     = 0
+
+// Define block bounds (off-low,off-high,on-low,on-high)
+// Used in setupgame.dm
+#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
+#define DNA_HARDER_BOUNDS  list(1,3049,3050,4095)
+#define DNA_HARD_BOUNDS    list(1,3490,3500,4095)
+
+// UI Indices (can change to mutblock style, if desired)
+#define DNA_UI_HAIR_R      1
+#define DNA_UI_HAIR_G      2
+#define DNA_UI_HAIR_B      3
+#define DNA_UI_BEARD_R     4
+#define DNA_UI_BEARD_G     5
+#define DNA_UI_BEARD_B     6
+#define DNA_UI_SKIN_TONE   7
+#define DNA_UI_SKIN_R      8
+#define DNA_UI_SKIN_G      9
+#define DNA_UI_SKIN_B      10
+#define DNA_UI_EYES_R      11
+#define DNA_UI_EYES_G      12
+#define DNA_UI_EYES_B      13
+#define DNA_UI_GENDER      14
+#define DNA_UI_BEARD_STYLE 15
+#define DNA_UI_HAIR_STYLE  16
+#define DNA_UI_EAR_STYLE   17 // VOREStation snippet.
+#define DNA_UI_TAIL_STYLE  18
+#define DNA_UI_PLAYERSCALE 19
+#define DNA_UI_TAIL_R      20
+#define DNA_UI_TAIL_G      21
+#define DNA_UI_TAIL_B      22
+#define DNA_UI_TAIL2_R     23
+#define DNA_UI_TAIL2_G     24
+#define DNA_UI_TAIL2_B     25
+#define DNA_UI_TAIL3_R     26
+#define DNA_UI_TAIL3_G     27
+#define DNA_UI_TAIL3_B     28
+#define DNA_UI_EARS_R      29
+#define DNA_UI_EARS_G      30
+#define DNA_UI_EARS_B      31
+#define DNA_UI_EARS2_R     32
+#define DNA_UI_EARS2_G     33
+#define DNA_UI_EARS2_B     34
+#define DNA_UI_EARS3_R     35
+#define DNA_UI_EARS3_G     36
+#define DNA_UI_EARS3_B     37
+#define DNA_UI_WING_STYLE  38
+#define DNA_UI_WING_R      39
+#define DNA_UI_WING_G      40
+#define DNA_UI_WING_B      41
+#define DNA_UI_WING2_R     42
+#define DNA_UI_WING2_G     43
+#define DNA_UI_WING2_B     44
+#define DNA_UI_WING3_R     45
+#define DNA_UI_WING3_G     46
+#define DNA_UI_WING3_B     47 // VOREStation snippet end.
+#define DNA_UI_LENGTH      47 // VOREStation Edit - Needs to match the highest number above.
+
+#define DNA_SE_LENGTH 49 // VOREStation Edit (original was UI+11)
+
+//DNA modifiers
+// Buffer datatype flags.
+#define DNA2_BUF_UI 1
+#define DNA2_BUF_UE 2
+#define DNA2_BUF_SE 4
diff --git a/code/__defines/holder.dm b/code/__defines/holder.dm
new file mode 100644
index 0000000000..239ef8d290
--- /dev/null
+++ b/code/__defines/holder.dm
@@ -0,0 +1 @@
+#define PROCESS_REACTION_ITER 5 //when processing a reaction, iterate this many times
diff --git a/code/__defines/implant.dm b/code/__defines/implant.dm
new file mode 100644
index 0000000000..5e3ca49741
--- /dev/null
+++ b/code/__defines/implant.dm
@@ -0,0 +1,2 @@
+#define MALFUNCTION_TEMPORARY 1
+#define MALFUNCTION_PERMANENT 2
diff --git a/code/__defines/job_controller.dm b/code/__defines/job_controller.dm
new file mode 100644
index 0000000000..25148c2ce7
--- /dev/null
+++ b/code/__defines/job_controller.dm
@@ -0,0 +1,3 @@
+#define GET_RANDOM_JOB 0
+#define BE_ASSISTANT 1
+#define RETURN_TO_LOBBY 2
diff --git a/code/__defines/jukebox.dm b/code/__defines/jukebox.dm
new file mode 100644
index 0000000000..7cab3de4dd
--- /dev/null
+++ b/code/__defines/jukebox.dm
@@ -0,0 +1,4 @@
+#define JUKEMODE_NEXT        1 // Advance to next song in the track list
+#define JUKEMODE_RANDOM      2 // Not shuffle, randomly picks next each time.
+#define JUKEMODE_REPEAT_SONG 3 // Play the same song over and over
+#define JUKEMODE_PLAY_ONCE   4 // Play, then stop.
diff --git a/code/__defines/life.dm b/code/__defines/life.dm
new file mode 100644
index 0000000000..1f022dec9a
--- /dev/null
+++ b/code/__defines/life.dm
@@ -0,0 +1,20 @@
+//Note that gas heat damage is only applied once every FOUR ticks.
+#define HEAT_GAS_DAMAGE_LEVEL_1 2 //Amount of damage applied when the current breath's temperature just passes the 360.15k safety point
+#define HEAT_GAS_DAMAGE_LEVEL_2 4 //Amount of damage applied when the current breath's temperature passes the 400K point
+#define HEAT_GAS_DAMAGE_LEVEL_3 8 //Amount of damage applied when the current breath's temperature passes the 1000K point
+
+#define COLD_GAS_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
+#define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
+#define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point
+
+#define COLD_ALERT_SEVERITY_LOW         1 // Constants passed to the cold and heat alerts.
+#define COLD_ALERT_SEVERITY_MODERATE    2
+#define COLD_ALERT_SEVERITY_MAX         3
+#define ENVIRONMENT_COMFORT_MARKER_COLD 1
+
+#define HOT_ALERT_SEVERITY_LOW          1
+#define HOT_ALERT_SEVERITY_MODERATE     2
+#define HOT_ALERT_SEVERITY_MAX          3
+#define ENVIRONMENT_COMFORT_MARKER_HOT  2
+
+#define TECHNOMANCER_INSTABILITY_MIN_GLOW			10		// When above this number, the entity starts glowing, affecting others.
diff --git a/code/__defines/mecha.dm b/code/__defines/mecha.dm
new file mode 100644
index 0000000000..5441794f5c
--- /dev/null
+++ b/code/__defines/mecha.dm
@@ -0,0 +1,26 @@
+#define MECHA_INT_FIRE 1
+#define MECHA_INT_TEMP_CONTROL 2
+#define MECHA_INT_SHORT_CIRCUIT 4
+#define MECHA_INT_TANK_BREACH 8
+#define MECHA_INT_CONTROL_LOST 16
+
+#define MECHA_PROC_MOVEMENT 1
+#define MECHA_PROC_DAMAGE   2
+#define MECHA_PROC_INT_TEMP 4
+
+#define MELEE 1
+#define RANGED 2
+
+#define MECH_FACTION_NT "nano"
+#define MECH_FACTION_SYNDI "syndi"
+#define MECH_FACTION_NONE "none"
+
+//Mecha Equipment
+#define EQUIP_HULL		"hull"
+#define EQUIP_WEAPON	"weapon"
+#define EQUIP_UTILITY	"utility"
+#define EQUIP_SPECIAL	"core"
+//VOREStation Addition begin: MICROMECHS
+#define EQUIP_MICRO_UTILITY	"micro_utility"
+#define EQUIP_MICRO_WEAPON	"micro_weapon"
+//VOREStation Addition end: MICROMECHS
diff --git a/code/__defines/mobs_vr.dm b/code/__defines/mobs_vr.dm
index 52e8d86525..183921ecde 100644
--- a/code/__defines/mobs_vr.dm
+++ b/code/__defines/mobs_vr.dm
@@ -54,3 +54,6 @@
 #define MARKING_NONDIGI_ONLY 		(1 << 0)
 #define MARKING_DIGITIGRADE_ONLY 	(1 << 1)
 #define MARKING_ALL_LEGS 			MARKING_NONDIGI_ONLY|MARKING_DIGITIGRADE_ONLY
+
+//Grabs
+#define UPGRADE_COOLDOWN	40
diff --git a/code/__defines/paicard.dm b/code/__defines/paicard.dm
new file mode 100644
index 0000000000..448c54d01a
--- /dev/null
+++ b/code/__defines/paicard.dm
@@ -0,0 +1,3 @@
+#define PP_FUNCTIONAL		0
+#define PP_BROKEN			1
+#define PP_MISSING			2
diff --git a/code/__defines/persistence.dm b/code/__defines/persistence.dm
index 1fde05bf22..5d9a0d5082 100644
--- a/code/__defines/persistence.dm
+++ b/code/__defines/persistence.dm
@@ -1 +1,7 @@
-#define PERSISTENCE_VARIABLE_TOKEN_LENGTH -1
\ No newline at end of file
+#define PERSIST_SPAWN		0x01	// Persist spawnpoint based on location of despawn/logout.
+#define PERSIST_WEIGHT		0x02	// Persist mob weight
+#define PERSIST_ORGANS		0x04	// Persist the status (normal/amputated/robotic/etc) and model (for robotic) status of organs
+#define PERSIST_MARKINGS	0x08	// Persist markings
+#define PERSIST_SIZE		0x10	// Persist size
+#define PERSIST_COUNT		5		// Number of valid bits in this bitflag.  Keep this updated!
+#define PERSIST_DEFAULT		PERSIST_SPAWN|PERSIST_ORGANS|PERSIST_MARKINGS|PERSIST_SIZE // Default setting for new folks
diff --git a/code/__defines/planets_vr.dm b/code/__defines/planets_vr.dm
index be6553cd4d..07c9122467 100644
--- a/code/__defines/planets_vr.dm
+++ b/code/__defines/planets_vr.dm
@@ -1 +1,47 @@
-#define WEATHER_PARTY				"party"
\ No newline at end of file
+#define WEATHER_PARTY				"party"
+
+//Atmosphere properties
+#define VIRGO3B_ONE_ATMOSPHERE	82.4 //kPa
+#define VIRGO3B_AVG_TEMP	234 //kelvin
+
+#define VIRGO3B_PER_N2		0.16 //percent
+#define VIRGO3B_PER_O2		0.00
+#define VIRGO3B_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
+#define VIRGO3B_PER_CO2		0.12
+#define VIRGO3B_PER_PHORON	0.72
+
+//Math only beyond this point
+#define VIRGO3B_MOL_PER_TURF	(VIRGO3B_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3B_AVG_TEMP*R_IDEAL_GAS_EQUATION))
+#define VIRGO3B_MOL_N2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2)
+#define VIRGO3B_MOL_O2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_O2)
+#define VIRGO3B_MOL_N2O			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2O)
+#define VIRGO3B_MOL_CO2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_CO2)
+#define VIRGO3B_MOL_PHORON		(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_PHORON)
+
+//Turfmakers
+#define VIRGO3B_SET_ATMOS	nitrogen=VIRGO3B_MOL_N2;oxygen=VIRGO3B_MOL_O2;carbon_dioxide=VIRGO3B_MOL_CO2;phoron=VIRGO3B_MOL_PHORON;temperature=VIRGO3B_AVG_TEMP
+#define VIRGO3B_TURF_CREATE(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP;x/virgo3b/outdoors=TRUE;x/virgo3b/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
+#define VIRGO3B_TURF_CREATE_UN(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP
+
+//Atmosphere properties
+#define VIRGO3BB_ONE_ATMOSPHERE	101.325 //kPa
+#define VIRGO3BB_AVG_TEMP	293.15 //kelvin
+
+#define VIRGO3BB_PER_N2			0.78 //percent
+#define VIRGO3BB_PER_O2			0.21
+#define VIRGO3BB_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
+#define VIRGO3BB_PER_CO2		0.01
+#define VIRGO3BB_PER_PHORON		0.00
+
+//Math only beyond this point
+#define VIRGO3BB_MOL_PER_TURF	(VIRGO3BB_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3BB_AVG_TEMP*R_IDEAL_GAS_EQUATION))
+#define VIRGO3BB_MOL_N2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2)
+#define VIRGO3BB_MOL_O2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_O2)
+#define VIRGO3BB_MOL_N2O			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2O)
+#define VIRGO3BB_MOL_CO2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_CO2)
+#define VIRGO3BB_MOL_PHORON		(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_PHORON)
+
+//Turfmakers
+#define VIRGO3BB_SET_ATMOS	nitrogen=VIRGO3BB_MOL_N2;oxygen=VIRGO3BB_MOL_O2;carbon_dioxide=VIRGO3BB_MOL_CO2;phoron=VIRGO3BB_MOL_PHORON;temperature=VIRGO3BB_AVG_TEMP
+#define VIRGO3BB_TURF_CREATE(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP;x/virgo3b_better/outdoors=TRUE;x/virgo3b_better/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
+#define VIRGO3BB_TURF_CREATE_UN(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP
diff --git a/code/__defines/preferences.dm b/code/__defines/preferences.dm
index 880d9318d8..ba0abca8cf 100644
--- a/code/__defines/preferences.dm
+++ b/code/__defines/preferences.dm
@@ -12,4 +12,6 @@
 #define MULTILINGUAL_DOUBLE_DELIMITER	2
 #define MULTILINGUAL_OFF				3
 
-#define MULTILINGUAL_MODE_MAX			4
\ No newline at end of file
+#define MULTILINGUAL_MODE_MAX			4
+
+#define SAVE_RESET -1
diff --git a/code/__defines/request_console.dm b/code/__defines/request_console.dm
new file mode 100644
index 0000000000..96997f9348
--- /dev/null
+++ b/code/__defines/request_console.dm
@@ -0,0 +1,4 @@
+//Request Console Department Types
+#define RC_ASSIST 1		//Request Assistance
+#define RC_SUPPLY 2		//Request Supplies
+#define RC_INFO   4		//Relay Info
diff --git a/code/__defines/simple_mob.dm b/code/__defines/simple_mob.dm
new file mode 100644
index 0000000000..995f0178f7
--- /dev/null
+++ b/code/__defines/simple_mob.dm
@@ -0,0 +1,8 @@
+// Flags for specifying which states we have vore icon_states for.
+#define SA_ICON_LIVING	0x01
+#define SA_ICON_DEAD	0x02
+#define SA_ICON_REST	0x04
+
+// Hivebots are tuned towards how many default lasers are needed to kill them.
+// As such, if laser damage is ever changed, you should change this define.
+#define LASERS_TO_KILL * 40
diff --git a/code/__defines/size.dm b/code/__defines/size.dm
new file mode 100644
index 0000000000..d9418b700e
--- /dev/null
+++ b/code/__defines/size.dm
@@ -0,0 +1,3 @@
+
+#define MAX_VOICE_FREQ 70000
+#define MIN_VOICE_FREQ 15000
diff --git a/code/__defines/spells.dm b/code/__defines/spells.dm
new file mode 100644
index 0000000000..e349a9c6a9
--- /dev/null
+++ b/code/__defines/spells.dm
@@ -0,0 +1,5 @@
+
+#define OFFENSIVE_SPELLS "Offensive"
+#define DEFENSIVE_SPELLS "Defensive"
+#define UTILITY_SPELLS "Utility"
+#define SUPPORT_SPELLS "Support"
diff --git a/code/__defines/traits.dm b/code/__defines/traits.dm
new file mode 100644
index 0000000000..994f1a3247
--- /dev/null
+++ b/code/__defines/traits.dm
@@ -0,0 +1,2 @@
+#define ORGANICS	1
+#define SYNTHETICS	2
diff --git a/code/__defines/update_icons.dm b/code/__defines/update_icons.dm
new file mode 100644
index 0000000000..4fa21751be
--- /dev/null
+++ b/code/__defines/update_icons.dm
@@ -0,0 +1 @@
+#define MOB_WATER_LAYER			36
diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm
index d725fb8064..288c479922 100644
--- a/code/_onclick/hud/action.dm
+++ b/code/_onclick/hud/action.dm
@@ -3,12 +3,6 @@
 #define AB_INNATE 3
 #define AB_GENERIC 4
 
-#define AB_CHECK_RESTRAINED 1
-#define AB_CHECK_STUNNED 2
-#define AB_CHECK_LYING 4
-#define AB_CHECK_ALIVE 8
-#define AB_CHECK_INSIDE 16
-
 
 /datum/action
 	var/name = "Generic Action"
@@ -226,4 +220,9 @@
 
 
 /datum/action/innate/
-	action_type = AB_INNATE
\ No newline at end of file
+	action_type = AB_INNATE
+
+#undef AB_ITEM
+#undef AB_SPELL
+#undef AB_INNATE
+#undef AB_GENERIC
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index af26526846..8dfcdf9b5b 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -507,3 +507,5 @@ var/list/global_huds = list(
 /datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/weapon/gun/G)
 	var/obj/screen/ammo/ammo_hud = ammo_hud_list[G]
 	ammo_hud?.update_hud(user, G)
+
+#undef MAX_AMMO_HUD_POSSIBLE
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index fa568b8614..32725ec5ae 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -316,4 +316,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	var/answer = menu.selected_choice
 	QDEL_NULL(menu)
 	GLOB.radial_menus -= uniqueid
-	return answer
\ No newline at end of file
+	return answer
+
+#undef NEXT_PAGE_ID
+#undef DEFAULT_CHECK_DELAY
diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm
index 97f3999b7e..fbe3088c91 100644
--- a/code/_onclick/hud/skybox.dm
+++ b/code/_onclick/hud/skybox.dm
@@ -63,5 +63,6 @@
 		client.update_skybox()
 		client.skybox?.scale_to_view(client.view)
 
+#undef SKYBOX_PADDING
 #undef SKYBOX_PIXELS
 #undef SKYBOX_TURFS
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index a370f614d6..2be00fb258 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -254,13 +254,6 @@
 	//	new lighting behaviour with obj lights
 		icon_state = null
 
-
-/*
-#define EQUIP 1
-#define LIGHT 2
-#define ENVIRON 3
-*/
-
 /area/proc/powered(var/chan)		// return true if the area has power to given channel
 
 	if(!requires_power)
@@ -553,4 +546,4 @@ GLOBAL_DATUM(spoiler_obfuscation_image, /image)
 	if(should_obfuscate)
 		add_overlay(GLOB.spoiler_obfuscation_image)
 	else
-		cut_overlay(GLOB.spoiler_obfuscation_image)
\ No newline at end of file
+		cut_overlay(GLOB.spoiler_obfuscation_image)
diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm
index c00ccbd9f2..5e78698f48 100644
--- a/code/game/dna/dna2.dm
+++ b/code/game/dna/dna2.dm
@@ -10,65 +10,8 @@
 #define DNA_ON_LOWERBOUND  3
 #define DNA_ON_UPPERBOUND  4
 
-// Define block bounds (off-low,off-high,on-low,on-high)
-// Used in setupgame.dm
-#define DNA_DEFAULT_BOUNDS list(1,2049,2050,4095)
-#define DNA_HARDER_BOUNDS  list(1,3049,3050,4095)
-#define DNA_HARD_BOUNDS    list(1,3490,3500,4095)
-
-// UI Indices (can change to mutblock style, if desired)
-#define DNA_UI_HAIR_R      1
-#define DNA_UI_HAIR_G      2
-#define DNA_UI_HAIR_B      3
-#define DNA_UI_BEARD_R     4
-#define DNA_UI_BEARD_G     5
-#define DNA_UI_BEARD_B     6
-#define DNA_UI_SKIN_TONE   7
-#define DNA_UI_SKIN_R      8
-#define DNA_UI_SKIN_G      9
-#define DNA_UI_SKIN_B      10
-#define DNA_UI_EYES_R      11
-#define DNA_UI_EYES_G      12
-#define DNA_UI_EYES_B      13
-#define DNA_UI_GENDER      14
-#define DNA_UI_BEARD_STYLE 15
-#define DNA_UI_HAIR_STYLE  16
-#define DNA_UI_EAR_STYLE   17 // VOREStation snippet.
-#define DNA_UI_TAIL_STYLE  18
-#define DNA_UI_PLAYERSCALE 19
-#define DNA_UI_TAIL_R      20
-#define DNA_UI_TAIL_G      21
-#define DNA_UI_TAIL_B      22
-#define DNA_UI_TAIL2_R     23
-#define DNA_UI_TAIL2_G     24
-#define DNA_UI_TAIL2_B     25
-#define DNA_UI_TAIL3_R     26
-#define DNA_UI_TAIL3_G     27
-#define DNA_UI_TAIL3_B     28
-#define DNA_UI_EARS_R      29
-#define DNA_UI_EARS_G      30
-#define DNA_UI_EARS_B      31
-#define DNA_UI_EARS2_R     32
-#define DNA_UI_EARS2_G     33
-#define DNA_UI_EARS2_B     34
-#define DNA_UI_EARS3_R     35
-#define DNA_UI_EARS3_G     36
-#define DNA_UI_EARS3_B     37
-#define DNA_UI_WING_STYLE  38
-#define DNA_UI_WING_R      39
-#define DNA_UI_WING_G      40
-#define DNA_UI_WING_B      41
-#define DNA_UI_WING2_R     42
-#define DNA_UI_WING2_G     43
-#define DNA_UI_WING2_B     44
-#define DNA_UI_WING3_R     45
-#define DNA_UI_WING3_G     46
-#define DNA_UI_WING3_B     47 // VOREStation snippet end.
-#define DNA_UI_LENGTH      47 // VOREStation Edit - Needs to match the highest number above.
-
-#define DNA_SE_LENGTH 49 // VOREStation Edit (original was UI+11)
 // For later:
-//#define DNA_SE_LENGTH 50 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.
+//# define DNA_SE_LENGTH 50 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.
 
 
 // Defines which values mean "on" or "off".
@@ -515,3 +458,8 @@ var/global/list/datum/dna/gene/dna_genes[0]
 
 	unique_enzymes = md5(character.real_name)
 	reg_dna[unique_enzymes] = character.real_name
+
+#undef DNA_OFF_LOWERBOUND
+#undef DNA_OFF_UPPERBOUND
+#undef DNA_ON_LOWERBOUND
+#undef DNA_ON_UPPERBOUND
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index 0e8e0ba43c..572583ef9e 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -1,10 +1,5 @@
 #define DNA_BLOCK_SIZE 3
 
-// Buffer datatype flags.
-#define DNA2_BUF_UI 1
-#define DNA2_BUF_UE 2
-#define DNA2_BUF_SE 4
-
 #define PAGE_UI "ui"
 #define PAGE_SE "se"
 #define PAGE_BUFFER "buffer"
@@ -792,6 +787,7 @@
 		else
 			return FALSE
 
+#undef DNA_BLOCK_SIZE
 
 #undef PAGE_UI
 #undef PAGE_SE
diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm
index a63723ec23..2c4a8c925d 100644
--- a/code/game/gamemodes/technomancer/catalog.dm
+++ b/code/game/gamemodes/technomancer/catalog.dm
@@ -1,8 +1,4 @@
 #define ALL_SPELLS "All"
-#define OFFENSIVE_SPELLS "Offensive"
-#define DEFENSIVE_SPELLS "Defensive"
-#define UTILITY_SPELLS "Utility"
-#define SUPPORT_SPELLS "Support"
 
 var/list/all_technomancer_spells = subtypesof(/datum/technomancer/spell)
 var/list/all_technomancer_equipment = subtypesof(/datum/technomancer/equipment)
@@ -385,3 +381,5 @@ var/list/all_technomancer_assistance = subtypesof(/datum/technomancer/assistance
 				qdel(AM)
 				return
 	to_chat(user, "<span class='warn'>\The [src] is unable to refund \the [AM].</span>")
+
+#undef ALL_SPELLS
diff --git a/code/game/gamemodes/technomancer/instability.dm b/code/game/gamemodes/technomancer/instability.dm
index a7cf71b8f0..c41c2ea8dc 100644
--- a/code/game/gamemodes/technomancer/instability.dm
+++ b/code/game/gamemodes/technomancer/instability.dm
@@ -6,7 +6,6 @@
 // 0.95 is 14 ticks.
 #define TECHNOMANCER_INSTABILITY_MIN_DECAY			0.1 	// Minimum removed every Life() tick, always.
 #define TECHNOMANCER_INSTABILITY_PRECISION			0.1 	// Instability is rounded to this.
-#define TECHNOMANCER_INSTABILITY_MIN_GLOW			10		// When above this number, the entity starts glowing, affecting others.
 
 
 /mob/living
@@ -288,3 +287,6 @@
 			to_chat(src, "<span class='cult'><font size='4'>The purple glow makes you feel strange...</font></span>")
 	adjust_instability(amount)
 
+#undef TECHNOMANCER_INSTABILITY_DECAY
+#undef TECHNOMANCER_INSTABILITY_MIN_DECAY
+#undef TECHNOMANCER_INSTABILITY_PRECISION
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 6091fc0e7b..4ce8780cf4 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -1,9 +1,5 @@
 var/global/datum/controller/occupations/job_master
 
-#define GET_RANDOM_JOB 0
-#define BE_ASSISTANT 1
-#define RETURN_TO_LOBBY 2
-
 /datum/controller/occupations
 		//List of all jobs
 	var/list/occupations = list()
diff --git a/code/game/machinery/air_alarm.dm b/code/game/machinery/air_alarm.dm
index c8da98c9df..0374f9eab8 100644
--- a/code/game/machinery/air_alarm.dm
+++ b/code/game/machinery/air_alarm.dm
@@ -846,3 +846,21 @@
 #undef LOAD_TLV_VALUES
 #undef TEST_TLV_VALUES
 #undef DECLARE_TLV_VALUES
+
+#undef AALARM_MODE_SCRUBBING
+#undef AALARM_MODE_REPLACEMENT
+#undef AALARM_MODE_PANIC
+#undef AALARM_MODE_CYCLE
+#undef AALARM_MODE_FILL
+#undef AALARM_MODE_OFF
+
+#undef AALARM_SCREEN_MAIN
+#undef AALARM_SCREEN_VENT
+#undef AALARM_SCREEN_SCRUB
+#undef AALARM_SCREEN_MODE
+#undef AALARM_SCREEN_SENSORS
+
+#undef AALARM_REPORT_TIMEOUT
+
+#undef MAX_TEMPERATURE
+#undef MIN_TEMPERATURE
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index da958671e7..a536042cc5 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -23,7 +23,6 @@
 			break
 	return selected
 
-#define CLONE_BIOMASS 30 //VOREstation Edit
 #define MINIMUM_HEAL_LEVEL 40
 
 /obj/machinery/clonepod
@@ -479,6 +478,8 @@
 			healthstring = "ERROR"
 		return healthstring
 
+#undef MINIMUM_HEAL_LEVEL
+
 //Disk stuff.
 //The return of data disks?? Just for transferring between genetics machine/cloning machine.
 //TO-DO: Make the genetics machine accept them.
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index dc8375f1e7..9fa837889b 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -310,3 +310,5 @@
 			// Please for the love of all that is holy, someone make surgery steps
 			// have names so I don't have to do this stupid pretty_type shit.
 			. += "[pretty_type(S)]: [english_list(allowed_tools_by_name)]"
+
+#undef OP_COMPUTER_COOLDOWN
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index c54fb1ffb8..8efe7003af 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -510,5 +510,11 @@
 	circuit = /obj/item/weapon/circuitboard/med_data/pcu
 	density = FALSE
 
+#undef MED_DATA_R_LIST
+#undef MED_DATA_MAINT
+#undef MED_DATA_RECORD
+#undef MED_DATA_V_DATA
+#undef MED_DATA_MEDBOT
+
 #undef FIELD
 #undef MED_FIELD
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index 2c6b4c7ced..7716f527a5 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -213,3 +213,7 @@ var/prison_shuttle_timeleft = 0
 		hacked = 1
 		to_chat(user, "<span class='notice'>You disable the lock.</span>")
 		return 1
+
+#undef PRISON_MOVETIME
+#undef PRISON_STATION_AREATYPE
+#undef PRISON_DOCK_AREATYPE
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index e239a6cf06..53cdeec5f7 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -512,4 +512,8 @@
 /obj/machinery/computer/secure_data/detective_computer
 	icon_state = "messyfiles"
 
+#undef SEC_DATA_R_LIST
+#undef SEC_DATA_MAINT
+#undef SEC_DATA_RECORD
+
 #undef FIELD
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index 876a2009d1..d157d964f5 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -385,3 +385,9 @@
 			continue
 
 	..(severity)
+
+#undef GENERAL_RECORD_LIST
+#undef GENERAL_RECORD_MAINT
+#undef GENERAL_RECORD_DATA
+
+#undef FIELD
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index cc8727343c..ac510ee19f 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -329,3 +329,8 @@ var/specops_shuttle_timeleft = 0
 	add_fingerprint(usr)
 	updateUsrDialog()
 	return
+
+#undef SPECOPS_MOVETIME
+#undef SPECOPS_STATION_AREATYPE
+#undef SPECOPS_DOCK_AREATYPE
+#undef SPECOPS_RETURN_DELAY
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 3a394b1973..d431c700d6 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -366,3 +366,5 @@
 
 /datum/data/function/proc/display()
 	return
+
+#undef HEAT_CAPACITY_HUMAN
diff --git a/code/game/machinery/doors/airlock_angled_bay.dm b/code/game/machinery/doors/airlock_angled_bay.dm
index 4d5eac48a4..00741a1fd3 100644
--- a/code/game/machinery/doors/airlock_angled_bay.dm
+++ b/code/game/machinery/doors/airlock_angled_bay.dm
@@ -8,7 +8,7 @@
  * icons being built at runtime to afford the luxury of not needing to pre-bake
  * all the icons like we have in the past, but preventing the overlay thrashing that
  * Bay's seem to encounter. All the heavy lifting is just done once at initialization.
- * 
+ *
  * The input state names from the various Bay files are:
  * preview: Only in base_icon for mapping
  * closed: static, when closed
@@ -16,7 +16,7 @@
  * closing: anim, from open to closed transition
  * opening: anim, from closed to open transition
  * deny: static/anim, when denying a mob access
- * 
+ *
  * The output state names to our system are:
  * door_closed: closed
  * door_locked: closed+bolted lights
@@ -28,7 +28,7 @@
  * o_door_closing: closing+panel
  * door_opening_stat: opening
  * door_closing_stat: closing
- * 
+ *
  * These do not include the door icon and are overlays:
  * panel_open: bare panel overlay
  * welded: bare welded overlay
@@ -114,7 +114,7 @@
 		icon = mine
 		update_icon()
 		return // hooray
-	
+
 	// Base layer - the bare metal - absolutely required sprites
 	var/icon/door_closed = icon(base_icon, "closed")
 	var/icon/door_open = icon(base_icon, "open")
@@ -127,7 +127,7 @@
 	var/icon/door_closing_stat = icon(base_icon, "closing")
 	var/icon/o_door_opening = icon(base_icon, "opening")
 	var/icon/o_door_closing = icon(base_icon, "closing")
-	
+
 	// Optional icons
 	var/icon/panel_open
 	var/icon/welded_closed
@@ -135,26 +135,26 @@
 	var/icon/sparks_damaged
 	var/icon/sparks_open
 	var/icon/sparks_broken
-	
+
 	if(panel_icon)
 		panel_open = icon(panel_icon, "closed")
 	else
 		panel_open = icon('icons/effects/effects.dmi', "nothing")
-	
+
 	if(welded_icon)
 		welded_closed = icon(welded_icon, "closed")
 		welded_open = icon(welded_icon, "open") // only used on firedoors far as I can tell
 	else
 		welded_closed = icon('icons/effects/effects.dmi', "nothing")
 		welded_open = icon('icons/effects/effects.dmi', "nothing")
-	
+
 	if(spark_damaged_icon)
 		sparks_damaged = icon(spark_damaged_icon, "closed")
 		sparks_open = icon(spark_damaged_icon, "open")
 	else
 		sparks_damaged = icon('icons/effects/effects.dmi', "nothing")
 		sparks_open = icon('icons/effects/effects.dmi', "nothing")
-	
+
 	if(spark_broken_icon)
 		sparks_broken = icon(spark_broken_icon, "closed")
 	else
@@ -231,10 +231,10 @@
 		o_door_opening.Blend(icon(lights_green_icon, "opening"), ICON_OVERLAY)
 		door_closing.Blend(icon(lights_green_icon, "closing"), ICON_OVERLAY)
 		o_door_closing.Blend(icon(lights_green_icon, "closing"), ICON_OVERLAY)
-	
+
 	if(lights_deny_icon)
 		door_deny.Blend(icon(lights_deny_icon, "deny"), ICON_OVERLAY)
-	
+
 	if(lights_bolts_icon)
 		door_locked.Blend(icon(lights_bolts_icon, "closed"), ICON_OVERLAY)
 
@@ -462,3 +462,8 @@
 	else
 		bound_width = world.icon_size
 		bound_height = width * world.icon_size
+
+#undef FILL_NONE
+#undef FILL_METAL
+#undef FILL_GLASS
+#undef FILL_COLOR
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 3c91bd7c02..bbc0b5e5ed 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -1,5 +1,3 @@
-#define AIRLOCK_CONTROL_RANGE 22
-
 // This code allows for airlocks to be controlled externally by setting an id_tag and comm frequency (disables ID access)
 /obj/machinery/door/airlock
 	var/id_tag
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index e7e359ca9f..3bf8461081 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -292,3 +292,9 @@
 #undef FONT_COLOR
 #undef FONT_STYLE
 #undef CHARS_PER_LINE
+
+#undef MAX_TIMER
+
+#undef PRESET_SHORT
+#undef PRESET_MEDIUM
+#undef PRESET_LONG
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 3493ec1dc7..bc80533df2 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -1,6 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-#define DOOR_REPAIR_AMOUNT 50	//amount of health regained per stack amount used
-
 /obj/machinery/door
 	name = "Door"
 	desc = "It opens and closes."
diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm
index 7c13792724..78dadca5e9 100644
--- a/code/game/machinery/embedded_controller/docking_program.dm
+++ b/code/game/machinery/embedded_controller/docking_program.dm
@@ -306,4 +306,6 @@
 
 #undef MODE_NONE
 #undef MODE_SERVER
-#undef MODE_CLIENT
\ No newline at end of file
+#undef MODE_CLIENT
+
+#undef MESSAGE_RESEND_TIME
diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm
index 31c7233c7d..caaaaef648 100644
--- a/code/game/machinery/jukebox.dm
+++ b/code/game/machinery/jukebox.dm
@@ -3,11 +3,6 @@
 // Rewritten by Leshana from existing Polaris code, merging in D2K5 and N3X15 work
 //
 
-#define JUKEMODE_NEXT        1 // Advance to next song in the track list
-#define JUKEMODE_RANDOM      2 // Not shuffle, randomly picks next each time.
-#define JUKEMODE_REPEAT_SONG 3 // Play the same song over and over
-#define JUKEMODE_PLAY_ONCE   4 // Play, then stop.
-
 /obj/machinery/media/jukebox
 	name = "space jukebox"
 	desc = "Filled with songs both past and present!"
diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm
index 1784635d59..fc942c4fa9 100644
--- a/code/game/machinery/nuclear_bomb.dm
+++ b/code/game/machinery/nuclear_bomb.dm
@@ -410,6 +410,8 @@ var/bomb_set
 				return
 	return
 
+#undef NUKERANGE
+
 /obj/item/weapon/disk/nuclear/New()
 	..()
 	nuke_disks |= src
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 027de127b2..85b79e233f 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -1,4 +1,4 @@
-//#define AMAP
+//# define AMAP
 /obj/machinery/computer/security/verb/station_map()
 	set name = ".map"
 	set category = "Object"
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 11eb234e26..2738b35918 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -1,11 +1,6 @@
 /******************** Requests Console ********************/
 /** Originally written by errorage, updated by: Carn, needs more work though. I just added some security fixes */
 
-//Request Console Department Types
-#define RC_ASSIST 1		//Request Assistance
-#define RC_SUPPLY 2		//Request Supplies
-#define RC_INFO   4		//Relay Info
-
 //Request Console Screens
 #define RCS_MAINMENU 0	// Main menu
 #define RCS_RQASSIST 1	// Request supplies
@@ -289,3 +284,13 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	announcement.announcer = ""
 	if(mainmenu)
 		screen = RCS_MAINMENU
+
+#undef RCS_MAINMENU
+#undef RCS_RQASSIST
+#undef RCS_RQSUPPLY
+#undef RCS_SENDINFO
+#undef RCS_SENTPASS
+#undef RCS_SENTFAIL
+#undef RCS_VIEWMSGS
+#undef RCS_MESSAUTH
+#undef RCS_ANNOUNCE
diff --git a/code/game/machinery/requests_console_vr.dm b/code/game/machinery/requests_console_vr.dm
index 39f0a8ecb9..b001f21891 100644
--- a/code/game/machinery/requests_console_vr.dm
+++ b/code/game/machinery/requests_console_vr.dm
@@ -2,9 +2,9 @@
 // By using these presets we can rename the departments easily.
 
 //Request Console Department Types
-// #define RC_ASSIST 1		//Request Assistance
-// #define RC_SUPPLY 2		//Request Supplies
-// #define RC_INFO   4		//Relay Info
+// # define RC_ASSIST 1		//Request Assistance
+// # define RC_SUPPLY 2		//Request Supplies
+// # define RC_INFO   4		//Relay Info
 
 /obj/machinery/requests_console/preset
 	name = ""
diff --git a/code/game/magic/archived_book.dm b/code/game/magic/archived_book.dm
index 117279cf65..35df877443 100644
--- a/code/game/magic/archived_book.dm
+++ b/code/game/magic/archived_book.dm
@@ -3,7 +3,6 @@
 #define BOOK_VERSION_MIN	1
 #define BOOK_VERSION_MAX	2
 #define BOOK_PATH			"data/books/"
-#define BOOKS_USE_SQL		0				// no guarentee for this branch to work right with sql
 
 var/global/datum/book_manager/book_mgr = new()
 
diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm
index 80c16c4a65..f7be915eda 100644
--- a/code/game/mecha/equipment/mecha_equipment.dm
+++ b/code/game/mecha/equipment/mecha_equipment.dm
@@ -1,13 +1,5 @@
 //DO NOT ADD MECHA PARTS TO THE GAME WITH THE DEFAULT "SPRITE ME" SPRITE!
 //I'm annoyed I even have to tell you this! SPRITE FIRST, then commit.
-#define EQUIP_HULL		"hull"
-#define EQUIP_WEAPON	"weapon"
-#define EQUIP_UTILITY	"utility"
-#define EQUIP_SPECIAL	"core"
-//VOREStation Addition begin: MICROMECHS
-#define EQUIP_MICRO_UTILITY	"micro_utility"
-#define EQUIP_MICRO_WEAPON	"micro_weapon"
-//VOREStation Addition end: MICROMECHS
 
 /obj/item/mecha_parts/mecha_equipment
 	name = "mecha equipment"
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 1e054279ca..f8275a4d3d 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -1,26 +1,9 @@
-#define MECHA_INT_FIRE 1
-#define MECHA_INT_TEMP_CONTROL 2
-#define MECHA_INT_SHORT_CIRCUIT 4
-#define MECHA_INT_TANK_BREACH 8
-#define MECHA_INT_CONTROL_LOST 16
-
-#define MECHA_PROC_MOVEMENT 1
-#define MECHA_PROC_DAMAGE   2
-#define MECHA_PROC_INT_TEMP 4
-
-#define MELEE 1
-#define RANGED 2
-
 #define MECHA_OPERATING     0
 #define MECHA_BOLTS_SECURED 1
 #define MECHA_PANEL_LOOSE   2
 #define MECHA_CELL_OPEN     3
 #define MECHA_CELL_OUT      4
 
-#define MECH_FACTION_NT "nano"
-#define MECH_FACTION_SYNDI "syndi"
-#define MECH_FACTION_NONE "none"
-
 /obj/mecha
 	name = "Mecha"
 	desc = "Exosuit"
@@ -2911,3 +2894,9 @@
 	playsound(src, 'sound/effects/attackblob.ogg', 50, 1)
 
 	return ..()
+
+#undef MECHA_OPERATING
+#undef MECHA_BOLTS_SECURED
+#undef MECHA_PANEL_LOOSE
+#undef MECHA_CELL_OPEN
+#undef MECHA_CELL_OUT
diff --git a/code/game/mecha/micro/mecha_vr.dm b/code/game/mecha/micro/mecha_vr.dm
index a0dd1b43e9..9a89e98e16 100644
--- a/code/game/mecha/micro/mecha_vr.dm
+++ b/code/game/mecha/micro/mecha_vr.dm
@@ -45,3 +45,5 @@
 /obj/item/weapon/circuitboard/mecha/weasel/main
 		name = T_BOARD_MICRO_MECHA("Weasel central control")
 		icon_state = "mainboard"
+
+#undef T_BOARD_MICRO_MECHA
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index 1e3393c857..50fec106cc 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -251,3 +251,5 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/mucus/mapped/Destroy()
 	virus2.Cut()
 	return ..()
+
+#undef DRYING_TIME
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index 8c8344df2c..3d9e74ca6a 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -1,15 +1,5 @@
 // Stolen en masse from N3X15 of /vg/station with much gratitude.
 
-// The idea is to have 4 bits for coming and 4 for going.
-#define TRACKS_COMING_NORTH 1
-#define TRACKS_COMING_SOUTH 2
-#define TRACKS_COMING_EAST  4
-#define TRACKS_COMING_WEST  8
-#define TRACKS_GOING_NORTH  16
-#define TRACKS_GOING_SOUTH  32
-#define TRACKS_GOING_EAST   64
-#define TRACKS_GOING_WEST   128
-
 // 5 seconds
 #define TRACKS_CRUSTIFY_TIME   50
 
diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm
index 949eb71eaf..31bc2b804d 100644
--- a/code/game/objects/empulse.dm
+++ b/code/game/objects/empulse.dm
@@ -2,7 +2,7 @@
 // If emp_act() takes more than defined deciseconds (1/10 seconds) an admin message and log is created.
 // I do not recommend having this uncommented on main server, it probably causes a bit more lag, espicially with larger EMPs.
 
-// #define EMPDEBUG 10
+// # define EMPDEBUG 10
 
 /proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_range, log=0)
 	if(!epicenter) return
@@ -71,4 +71,4 @@
 		if((world.timeofday - time) >= EMPDEBUG)
 			log_and_message_admins("EMPDEBUG: [T.name] - [T.type] - took [world.timeofday - time]ds to process emp_act()!")
 		#endif
-	return 1
\ No newline at end of file
+	return 1
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index e8ea1b16c9..b4b842bea2 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -5,10 +5,6 @@
 	icon_state = "blueprints"
 	attack_verb = list("attacked", "bapped", "hit")
 	preserve_item = 1
-	var/const/AREA_ERRNONE = 0
-	var/const/AREA_STATION = 1
-	var/const/AREA_SPACE =   2
-	var/const/AREA_SPECIAL = 3
 
 	var/const/BORDER_ERROR = 0
 	var/const/BORDER_NONE = 1
diff --git a/code/game/objects/items/blueprints_vr.dm b/code/game/objects/items/blueprints_vr.dm
index 93bd466de6..6b924f31ab 100644
--- a/code/game/objects/items/blueprints_vr.dm
+++ b/code/game/objects/items/blueprints_vr.dm
@@ -55,14 +55,6 @@
 /area/submap/casino_event
 	name = "\improper Space Casino"
 
-
-
-//TG blueprints.
-#define AREA_ERRNONE 0
-#define AREA_STATION 1
-#define AREA_SPACE 2
-#define AREA_SPECIAL 3
-
 /obj/item/areaeditor
 	name = "area modification item"
 	icon = 'icons/obj/items.dmi'
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index e299a4d390..5f4891cef1 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -62,6 +62,10 @@
 		user.drop_from_inventory(src)
 		qdel(src)
 
+#undef MODKIT_HELMET
+#undef MODKIT_SUIT
+#undef MODKIT_FULL
+
 /obj/item/device/modkit/examine(mob/user)
 	. = ..()
 	. += "It looks as though it modifies hardsuits to fit [target_species] users."
diff --git a/code/game/objects/items/devices/paicard_vr.dm b/code/game/objects/items/devices/paicard_vr.dm
index 7283966d47..26dcdc7912 100644
--- a/code/game/objects/items/devices/paicard_vr.dm
+++ b/code/game/objects/items/devices/paicard_vr.dm
@@ -1,7 +1,3 @@
-#define PP_FUNCTIONAL		0
-#define PP_BROKEN			1
-#define PP_MISSING			2
-
 var/global/list/paikeys = list()
 
 /obj/item/device/paicard
diff --git a/code/game/objects/items/uav.dm b/code/game/objects/items/uav.dm
index 20bb85d69b..39f95514f6 100644
--- a/code/game/objects/items/uav.dm
+++ b/code/game/objects/items/uav.dm
@@ -365,4 +365,5 @@
 
 #undef UAV_OFF
 #undef UAV_ON
+#undef UAV_PAIRING
 #undef UAV_PACKED
diff --git a/code/game/objects/items/weapons/circuitboards/circuitboard.dm b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
index a083027713..3e806915a4 100644
--- a/code/game/objects/items/weapons/circuitboards/circuitboard.dm
+++ b/code/game/objects/items/weapons/circuitboards/circuitboard.dm
@@ -1,9 +1,3 @@
-//Define a macro that we can use to assemble all the circuit board names
-#ifdef T_BOARD
-#error T_BOARD already defined elsewhere, we can't use it.
-#endif
-#define T_BOARD(name)	"circuit board (" + (name) + ")"
-
 /obj/item/weapon/circuitboard
 	name = "circuit board"
 	icon = 'icons/obj/module.dmi'
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 7ff8063e32..395c51fa19 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -1,7 +1,3 @@
-#define MALFUNCTION_TEMPORARY 1
-#define MALFUNCTION_PERMANENT 2
-
-
 /obj/item/weapon/implant
 	name = "implant"
 	icon = 'icons/obj/device.dmi'
diff --git a/code/game/objects/items/weapons/material/material_armor.dm b/code/game/objects/items/weapons/material/material_armor.dm
index 7f16d57a1c..c9524bf48c 100644
--- a/code/game/objects/items/weapons/material/material_armor.dm
+++ b/code/game/objects/items/weapons/material/material_armor.dm
@@ -163,6 +163,7 @@ Protectiveness | Armor %
 	result = abs(result - 100)
 	return round(result)
 
+#undef MATERIAL_ARMOR_COEFFICENT
 
 /obj/item/clothing/proc/update_armor()
 	if(material)
@@ -410,4 +411,4 @@ Protectiveness | Armor %
 	icon_state = "material_armor_makeshift"
 
 /obj/item/clothing/head/helmet/material/makeshift/durasteel
-	default_material = "durasteel"
\ No newline at end of file
+	default_material = "durasteel"
diff --git a/code/game/objects/items/weapons/picnic_blankets.dm b/code/game/objects/items/weapons/picnic_blankets.dm
index ab76b8efa7..0986c46e6f 100644
--- a/code/game/objects/items/weapons/picnic_blankets.dm
+++ b/code/game/objects/items/weapons/picnic_blankets.dm
@@ -119,3 +119,6 @@
 	unfold()
 	if(unfoldable)
 		verbs -= /obj/structure/picnic_blanket_deployed/verb/fold_up
+
+#undef CENTER
+#undef SIDE
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index c1cb09fecb..880f5f2491 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -669,3 +669,5 @@ var/list/global/tank_gauge_cache = list()
 		unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc)
 	if(isturf(loc))
 		sense_proximity(callback = /atom/proc/HasProximity)
+
+#undef TANK_IDEAL_PRESSURE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index c08a9d1951..b0d9a6bed8 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -39,6 +39,8 @@
 			src.add_fingerprint(user)
 	return
 
+#undef NEST_RESIST_TIME
+
 /obj/structure/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
 	if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
 		return
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 2387293584..e4fd0a5141 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -96,6 +96,7 @@
 	to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
 	update_icon()
 
+#undef TANK_DISPENSER_CAPACITY
 
 /obj/structure/dispenser/tgui_act(action, params)
 	if(..())
@@ -119,4 +120,4 @@
 				oxygentanks--
 			. = TRUE
 			playsound(src, 'sound/items/drop/gascan.ogg', 100, 1, 1)
-	update_icon()
\ No newline at end of file
+	update_icon()
diff --git a/code/game/turfs/unsimulated/planetary_vr.dm b/code/game/turfs/unsimulated/planetary_vr.dm
index 144379a6f6..82fccbdaed 100644
--- a/code/game/turfs/unsimulated/planetary_vr.dm
+++ b/code/game/turfs/unsimulated/planetary_vr.dm
@@ -1,49 +1,3 @@
-//Atmosphere properties
-#define VIRGO3B_ONE_ATMOSPHERE	82.4 //kPa
-#define VIRGO3B_AVG_TEMP	234 //kelvin
-
-#define VIRGO3B_PER_N2		0.16 //percent
-#define VIRGO3B_PER_O2		0.00
-#define VIRGO3B_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
-#define VIRGO3B_PER_CO2		0.12
-#define VIRGO3B_PER_PHORON	0.72
-
-//Math only beyond this point
-#define VIRGO3B_MOL_PER_TURF	(VIRGO3B_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3B_AVG_TEMP*R_IDEAL_GAS_EQUATION))
-#define VIRGO3B_MOL_N2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2)
-#define VIRGO3B_MOL_O2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_O2)
-#define VIRGO3B_MOL_N2O			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_N2O)
-#define VIRGO3B_MOL_CO2			(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_CO2)
-#define VIRGO3B_MOL_PHORON		(VIRGO3B_MOL_PER_TURF * VIRGO3B_PER_PHORON)
-
-//Turfmakers
-#define VIRGO3B_SET_ATMOS	nitrogen=VIRGO3B_MOL_N2;oxygen=VIRGO3B_MOL_O2;carbon_dioxide=VIRGO3B_MOL_CO2;phoron=VIRGO3B_MOL_PHORON;temperature=VIRGO3B_AVG_TEMP
-#define VIRGO3B_TURF_CREATE(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP;x/virgo3b/outdoors=TRUE;x/virgo3b/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
-#define VIRGO3B_TURF_CREATE_UN(x)	x/virgo3b/nitrogen=VIRGO3B_MOL_N2;x/virgo3b/oxygen=VIRGO3B_MOL_O2;x/virgo3b/carbon_dioxide=VIRGO3B_MOL_CO2;x/virgo3b/phoron=VIRGO3B_MOL_PHORON;x/virgo3b/temperature=VIRGO3B_AVG_TEMP
-
-//Atmosphere properties
-#define VIRGO3BB_ONE_ATMOSPHERE	101.325 //kPa
-#define VIRGO3BB_AVG_TEMP	293.15 //kelvin
-
-#define VIRGO3BB_PER_N2			0.78 //percent
-#define VIRGO3BB_PER_O2			0.21
-#define VIRGO3BB_PER_N2O		0.00 //Currently no capacity to 'start' a turf with this. See turf.dm
-#define VIRGO3BB_PER_CO2		0.01
-#define VIRGO3BB_PER_PHORON		0.00
-
-//Math only beyond this point
-#define VIRGO3BB_MOL_PER_TURF	(VIRGO3BB_ONE_ATMOSPHERE*CELL_VOLUME/(VIRGO3BB_AVG_TEMP*R_IDEAL_GAS_EQUATION))
-#define VIRGO3BB_MOL_N2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2)
-#define VIRGO3BB_MOL_O2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_O2)
-#define VIRGO3BB_MOL_N2O			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_N2O)
-#define VIRGO3BB_MOL_CO2			(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_CO2)
-#define VIRGO3BB_MOL_PHORON		(VIRGO3BB_MOL_PER_TURF * VIRGO3BB_PER_PHORON)
-
-//Turfmakers
-#define VIRGO3BB_SET_ATMOS	nitrogen=VIRGO3BB_MOL_N2;oxygen=VIRGO3BB_MOL_O2;carbon_dioxide=VIRGO3BB_MOL_CO2;phoron=VIRGO3BB_MOL_PHORON;temperature=VIRGO3BB_AVG_TEMP
-#define VIRGO3BB_TURF_CREATE(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP;x/virgo3b_better/outdoors=TRUE;x/virgo3b_better/update_graphic(list/graphic_add = null, list/graphic_remove = null) return 0
-#define VIRGO3BB_TURF_CREATE_UN(x)	x/virgo3b_better/nitrogen=VIRGO3BB_MOL_N2;x/virgo3b_better/oxygen=VIRGO3BB_MOL_O2;x/virgo3b_better/carbon_dioxide=VIRGO3BB_MOL_CO2;x/virgo3b_better/phoron=VIRGO3BB_MOL_PHORON;x/virgo3b_better/temperature=VIRGO3BB_AVG_TEMP
-
 // This is a wall you surround the area of your "planet" with, that makes the atmosphere inside stay within bounds, even if canisters
 // are opened or other strange things occur.
 /turf/unsimulated/wall/planetary/virgo3b
diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm
index 65c8afb298..f59a6ad811 100644
--- a/code/modules/admin/admin_investigate.dm
+++ b/code/modules/admin/admin_investigate.dm
@@ -48,3 +48,5 @@
 			else
 				to_chat(src, "<span class='filter_adminlog warning'>Error: admin_investigate: Href Logging is not on.</span>")
 				return
+
+#undef INVESTIGATE_DIR
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index e04b578c95..99628c244a 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -168,9 +168,6 @@ Example: USING PROCCALL = BLOCKING, SELECT = FORCE_NULLS, PRIORITY = HIGH SELECT
 #define SDQL2_STATE_SWITCHING 5
 #define SDQL2_STATE_HALTING 6
 
-#define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc")
-#define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive")
-
 #define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS			(1<<0)
 #define SDQL2_OPTION_BLOCKING_CALLS						(1<<1)
 #define SDQL2_OPTION_HIGH_PRIORITY						(1<<2)		//High priority SDQL query, allow using almost all of the tick.
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index ef5987e4be..ebfdd9b195 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -877,3 +877,4 @@
 #undef BUILDMODE_LIGHTS
 #undef BUILDMODE_AI
 #undef LAST_BUILDMODE
+#undef BUILDMODE_DROP
diff --git a/code/modules/admin/verbs/get_player_status.dm b/code/modules/admin/verbs/get_player_status.dm
index c409deab65..c852c81fd3 100644
--- a/code/modules/admin/verbs/get_player_status.dm
+++ b/code/modules/admin/verbs/get_player_status.dm
@@ -42,3 +42,5 @@
 
 	message += "#### Over all, there are [players] eligible players, of which [inactives] were hidden due to inactivity.  ####"
 	to_chat(usr, SPAN_NOTICE(message))
+
+#undef INACTIVITY_CAP
diff --git a/code/modules/admin/verbs/lightning_strike.dm b/code/modules/admin/verbs/lightning_strike.dm
index d977c39b22..15bf773829 100644
--- a/code/modules/admin/verbs/lightning_strike.dm
+++ b/code/modules/admin/verbs/lightning_strike.dm
@@ -95,5 +95,6 @@
 				C.ear_deaf += 10
 			to_chat(L, span("danger", "Lightning struck nearby, and the thunderclap is deafening!"))
 
+#undef LIGHTNING_REDIRECT_RANGE
 #undef LIGHTNING_ZAP_RANGE
 #undef LIGHTNING_POWER
diff --git a/code/modules/alarm/alarm.dm b/code/modules/alarm/alarm.dm
index 3ad1df433f..89fe38a38f 100644
--- a/code/modules/alarm/alarm.dm
+++ b/code/modules/alarm/alarm.dm
@@ -43,6 +43,8 @@
 			AS.duration = 0
 			AS.end_time = world.time + ALARM_RESET_DELAY
 
+#undef ALARM_RESET_DELAY
+
 /datum/alarm/proc/set_source_data(var/atom/source, var/duration, var/severity, var/hidden)
 	var/datum/alarm_source/AS = sources_assoc[source]
 	if(!AS)
diff --git a/code/modules/alarm/alarm_handler.dm b/code/modules/alarm/alarm_handler.dm
index 4064d700d2..b49402d7ff 100644
--- a/code/modules/alarm/alarm_handler.dm
+++ b/code/modules/alarm/alarm_handler.dm
@@ -75,6 +75,9 @@
 			C.remove_network(category)
 	notify_listeners(alarm, was_raised)
 
+#undef ALARM_RAISED
+#undef ALARM_CLEARED
+
 /datum/alarm_handler/proc/get_alarm_severity_for_origin(var/atom/origin)
 	if(!origin)
 		return
@@ -113,4 +116,4 @@
 		if(A.hidden || (z && !(A.origin?.z in map_levels)))
 			continue
 		visible_alarms.Add(A)
-	return visible_alarms
\ No newline at end of file
+	return visible_alarms
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 4d55533091..82cfe90801 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -5,7 +5,7 @@
 #define MIN_CLIENT_VERSION	0		//Just an ambiguously low version for now, I don't want to suddenly stop people playing.
 									//I would just like the code ready should it ever need to be used.
 
-//#define TOPIC_DEBUGGING 1
+//# define TOPIC_DEBUGGING 1
 
 	/*
 	When somebody clicks a link in game, this Topic is called first.
diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm
index 530706c0e2..599424723c 100644
--- a/code/modules/client/preference_setup/vore/02_size.dm
+++ b/code/modules/client/preference_setup/vore/02_size.dm
@@ -3,8 +3,6 @@
 #define WEIGHT_MAX 500
 #define WEIGHT_CHANGE_MIN 0
 #define WEIGHT_CHANGE_MAX 100
-#define MAX_VOICE_FREQ 70000
-#define MIN_VOICE_FREQ 15000
 
 // Define a place to save in character setup
 /datum/preferences
@@ -252,3 +250,8 @@
 			SEND_SOUND(user, S)
 
 	return ..();
+
+#undef WEIGHT_MIN
+#undef WEIGHT_MAX
+#undef WEIGHT_CHANGE_MIN
+#undef WEIGHT_CHANGE_MAX
diff --git a/code/modules/client/preference_setup/vore/05_persistence.dm b/code/modules/client/preference_setup/vore/05_persistence.dm
index 2d8846a3dd..330a21a73b 100644
--- a/code/modules/client/preference_setup/vore/05_persistence.dm
+++ b/code/modules/client/preference_setup/vore/05_persistence.dm
@@ -1,11 +1,3 @@
-#define PERSIST_SPAWN		0x01	// Persist spawnpoint based on location of despawn/logout.
-#define PERSIST_WEIGHT		0x02	// Persist mob weight
-#define PERSIST_ORGANS		0x04	// Persist the status (normal/amputated/robotic/etc) and model (for robotic) status of organs
-#define PERSIST_MARKINGS	0x08	// Persist markings
-#define PERSIST_SIZE		0x10	// Persist size
-#define PERSIST_COUNT		5		// Number of valid bits in this bitflag.  Keep this updated!
-#define PERSIST_DEFAULT		PERSIST_SPAWN|PERSIST_ORGANS|PERSIST_MARKINGS|PERSIST_SIZE // Default setting for new folks
-
 // Define a place to save in character setup
 /datum/preferences
 	var/persistence_settings = PERSIST_DEFAULT	// Control what if anything is persisted for this character between rounds.
diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index 644bc955dc..96255f095e 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -2,9 +2,6 @@
 #define NEUTRAL_MODE 2
 #define NEGATIVE_MODE 3
 
-#define ORGANICS	1
-#define SYNTHETICS	2
-
 var/global/list/valid_bloodreagents = list("default","iron","copper","phoron","silver","gold","slimejelly")	//allowlist-based so people don't make their blood restored by alcohol or something really silly. use reagent IDs!
 
 /datum/preferences
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 70a93c819b..f4681dd1e8 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1,5 +1,3 @@
-#define SAVE_RESET -1
-
 var/list/preferences_datums = list()
 
 /datum/preferences
diff --git a/code/modules/library/lib_readme.dm b/code/modules/library/lib_readme.dm
index 0150ed6ba8..85a8fc1a08 100644
--- a/code/modules/library/lib_readme.dm
+++ b/code/modules/library/lib_readme.dm
@@ -6,11 +6,11 @@
 
 // Deprecated! See global.dm for new SQL config vars -- TLE
 /*
-#define SQL_ADDRESS ""
-#define SQL_DB ""
-#define SQL_PORT "3306"
-#define SQL_LOGIN ""
-#define SQL_PASS ""
+# define SQL_ADDRESS ""
+# define SQL_DB ""
+# define SQL_PORT "3306"
+# define SQL_LOGIN ""
+# define SQL_PASS ""
 */
 
 //*******************************
diff --git a/code/modules/mob/freelook/visualnet.dm b/code/modules/mob/freelook/visualnet.dm
index 271572abe8..2af7ffacd6 100644
--- a/code/modules/mob/freelook/visualnet.dm
+++ b/code/modules/mob/freelook/visualnet.dm
@@ -159,3 +159,5 @@
 		var/datum/chunk/chunk = cameranet.getCameraChunk(x, y, z)
 		usr.client.debug_variables(chunk)
 */
+
+#undef CHUNK_SIZE
diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm
index 938ed1d8e0..396c42fb43 100644
--- a/code/modules/mob/living/bot/farmbot.dm
+++ b/code/modules/mob/living/bot/farmbot.dm
@@ -419,4 +419,9 @@
 		created_name = t
 
 /obj/item/weapon/farmbot_arm_assembly/attack_hand(mob/user as mob)
-	return //it's a converted watertank, no you cannot pick it up and put it in your backpack
\ No newline at end of file
+	return //it's a converted watertank, no you cannot pick it up and put it in your backpack
+
+#undef FARMBOT_COLLECT
+#undef FARMBOT_WATER
+#undef FARMBOT_UPROOT
+#undef FARMBOT_NUTRIMENT
diff --git a/code/modules/mob/living/bot/floorbot.dm b/code/modules/mob/living/bot/floorbot.dm
index 22584ae359..e281609cdb 100644
--- a/code/modules/mob/living/bot/floorbot.dm
+++ b/code/modules/mob/living/bot/floorbot.dm
@@ -2,7 +2,7 @@
 // This can be a problem if it tries to pave over space or shuttles.  That should be fixed but...
 // If it can see space outside windows, it can be laggy since it keeps wondering if it should fix them.
 // Therefore that functionality is disabled for now.  But it can be turned on by uncommenting this.
-// #define FLOORBOT_PATCHES_HOLES 1
+// # define FLOORBOT_PATCHES_HOLES 1
 
 /mob/living/bot/floorbot
 	name = "Floorbot"
diff --git a/code/modules/mob/living/bot/medbot.dm b/code/modules/mob/living/bot/medbot.dm
index 22cd01b4fe..9596a2024d 100644
--- a/code/modules/mob/living/bot/medbot.dm
+++ b/code/modules/mob/living/bot/medbot.dm
@@ -572,3 +572,8 @@
 #undef MEDBOT_PANIC_FUCK
 #undef MEDBOT_PANIC_ENDING
 #undef MEDBOT_PANIC_END
+
+#undef MEDBOT_MIN_INJECTION
+#undef MEDBOT_MAX_INJECTION
+#undef MEDBOT_MIN_HEAL
+#undef MEDBOT_MAX_HEAL
diff --git a/code/modules/mob/living/bot/mulebot.dm b/code/modules/mob/living/bot/mulebot.dm
index 02638226bf..cb8e2acb13 100644
--- a/code/modules/mob/living/bot/mulebot.dm
+++ b/code/modules/mob/living/bot/mulebot.dm
@@ -331,3 +331,11 @@
 		AM.layer = initial(AM.layer)
 		AM.pixel_y = initial(AM.pixel_y)
 	busy = 0
+
+#undef MULE_IDLE
+#undef MULE_MOVING
+#undef MULE_UNLOAD
+#undef MULE_LOST
+#undef MULE_CALC_MIN
+#undef MULE_CALC_MAX
+#undef MULE_PATH_DONE
diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm
index 0d32705542..31e0854d00 100644
--- a/code/modules/mob/living/bot/secbot.dm
+++ b/code/modules/mob/living/bot/secbot.dm
@@ -479,3 +479,7 @@
 		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+
+#undef SECBOT_WAIT_TIME
+#undef SECBOT_THREAT_ARREST
+#undef SECBOT_THREAT_ATTACK
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 3f884c362c..53e5e240d6 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -12,25 +12,6 @@
 #define COLD_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when your body temperature passes the 200K point
 #define COLD_DAMAGE_LEVEL_3 3 //Amount of damage applied when your body temperature passes the 120K point
 
-//Note that gas heat damage is only applied once every FOUR ticks.
-#define HEAT_GAS_DAMAGE_LEVEL_1 2 //Amount of damage applied when the current breath's temperature just passes the 360.15k safety point
-#define HEAT_GAS_DAMAGE_LEVEL_2 4 //Amount of damage applied when the current breath's temperature passes the 400K point
-#define HEAT_GAS_DAMAGE_LEVEL_3 8 //Amount of damage applied when the current breath's temperature passes the 1000K point
-
-#define COLD_GAS_DAMAGE_LEVEL_1 0.5 //Amount of damage applied when the current breath's temperature just passes the 260.15k safety point
-#define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point
-#define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point
-
-#define COLD_ALERT_SEVERITY_LOW         1 // Constants passed to the cold and heat alerts.
-#define COLD_ALERT_SEVERITY_MODERATE    2
-#define COLD_ALERT_SEVERITY_MAX         3
-#define ENVIRONMENT_COMFORT_MARKER_COLD 1
-
-#define HOT_ALERT_SEVERITY_LOW          1
-#define HOT_ALERT_SEVERITY_MODERATE     2
-#define HOT_ALERT_SEVERITY_MAX          3
-#define ENVIRONMENT_COMFORT_MARKER_HOT  2
-
 #define RADIATION_SPEED_COEFFICIENT 0.1
 #define HUMAN_COMBUSTION_TEMP 524 //524k is the sustained combustion temperature of human fat
 
@@ -2147,3 +2128,14 @@
 
 #undef HUMAN_MAX_OXYLOSS
 #undef HUMAN_CRIT_MAX_OXYLOSS
+
+#undef HEAT_DAMAGE_LEVEL_1
+#undef HEAT_DAMAGE_LEVEL_2
+#undef HEAT_DAMAGE_LEVEL_3
+
+#undef COLD_DAMAGE_LEVEL_1
+#undef COLD_DAMAGE_LEVEL_2
+#undef COLD_DAMAGE_LEVEL_3
+
+#undef RADIATION_SPEED_COEFFICIENT
+#undef HUMAN_COMBUSTION_TEMP
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 5dc3b6e48a..804d9ad78b 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -95,7 +95,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 #define TAIL_UPPER_LAYER_ALT	33		//Modified tail-sprite layer. Tend to be larger.
 #define MODIFIER_EFFECTS_LAYER	34		//Effects drawn by modifiers
 #define FIRE_LAYER				35		//'Mob on fire' overlay layer
-#define MOB_WATER_LAYER			36		//'Mob submerged' overlay layer
+// # define MOB_WATER_LAYER			36		//'Mob submerged' overlay layer // Moved to global defines
 #define TARGETED_LAYER			37		//'Aimed at' overlay layer
 #define TOTAL_LAYERS			37		//VOREStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
 //////////////////////////////////
@@ -1396,6 +1396,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 //Human Overlays Indexes/////////
 #undef MUTATIONS_LAYER
 #undef SKIN_LAYER
+#undef BLOOD_LAYER
 #undef MOB_DAM_LAYER
 #undef SURGERY_LAYER
 #undef UNDERWEAR_LAYER
@@ -1408,19 +1409,24 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
 #undef SUIT_LAYER
 #undef TAIL_UPPER_LAYER
 #undef TAIL_LOWER_LAYER
+#undef WING_LOWER_LAYER
 #undef GLASSES_LAYER
 #undef BELT_LAYER_ALT
 #undef SUIT_STORE_LAYER
 #undef BACK_LAYER
 #undef HAIR_LAYER
+#undef HAIR_ACCESSORY_LAYER
 #undef EARS_LAYER
 #undef EYES_LAYER
 #undef FACEMASK_LAYER
+#undef GLASSES_LAYER_ALT
 #undef HEAD_LAYER
 #undef HANDCUFF_LAYER
 #undef LEGCUFF_LAYER
 #undef L_HAND_LAYER
 #undef R_HAND_LAYER
+#undef WING_LAYER
+#undef TAIL_UPPER_LAYER_ALT
 #undef MODIFIER_EFFECTS_LAYER
 #undef FIRE_LAYER
 #undef WATER_LAYER
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d53aef5f71..695a3dd631 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1704,3 +1704,5 @@
 
 /mob/living/silicon/robot/proc/has_upgrade(var/given_type)
 	return (has_basic_upgrade(given_type) || has_advanced_upgrade(given_type) || has_restricted_upgrade(given_type) || has_no_prod_upgrade(given_type))
+
+#undef CYBORG_POWER_USAGE_MULTIPLIER
diff --git a/code/modules/mob/living/silicon/robot/sprites/fluff.dm b/code/modules/mob/living/silicon/robot/sprites/fluff.dm
index cc91b97e07..becbde2deb 100644
--- a/code/modules/mob/living/silicon/robot/sprites/fluff.dm
+++ b/code/modules/mob/living/silicon/robot/sprites/fluff.dm
@@ -109,4 +109,6 @@
 	pixel_x = -16
 
 	whitelist_ckey = "lunarfleet"
-	whitelist_charname = "Clea-Nor"
\ No newline at end of file
+	whitelist_charname = "Clea-Nor"
+
+#undef CUSTOM_BORGSPRITE
diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
index 69c0ed52d8..77dbac0c06 100644
--- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm
+++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm
@@ -1,8 +1,3 @@
-// Flags for specifying which states we have vore icon_states for.
-#define SA_ICON_LIVING	0x01
-#define SA_ICON_DEAD	0x02
-#define SA_ICON_REST	0x04
-
 /mob/living/simple_mob
 	melee_attack_delay = 1
 	base_attack_cooldown = 10
diff --git a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
index b1494bc268..7c5f3a6cf7 100644
--- a/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/hivebot.dm
@@ -1,7 +1,3 @@
-// Hivebots are tuned towards how many default lasers are needed to kill them.
-// As such, if laser damage is ever changed, you should change this define.
-#define LASERS_TO_KILL * 40
-
 /mob/living/simple_mob/mechanical/hivebot
 	name = "hivebot"
 	desc = "A robot. It appears to be somewhat resilient, but lacks a true weapon."
@@ -57,4 +53,4 @@
 	can_flee = FALSE // Fearless dumb machines.
 
 /decl/mob_organ_names/hivebot
-	hit_zones = list("central chassis", "positioning servo", "head", "sensor suite", "manipulator arm", "shoulder weapon mount", "weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
\ No newline at end of file
+	hit_zones = list("central chassis", "positioning servo", "head", "sensor suite", "manipulator arm", "shoulder weapon mount", "weapons array", "front right leg", "front left leg", "rear left leg", "rear right leg")
diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm
index 514b2087b6..f6c65b9ed3 100644
--- a/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/occult/unknown.dm
@@ -344,4 +344,12 @@
 	pointblank = TRUE
 	intelligence_level = AI_SMART
 	vision_range = 9
-	closest_distance = 4
\ No newline at end of file
+	closest_distance = 4
+
+#undef GA_ADS
+#undef GA_CALLDOWN
+#undef GA_SPEEDUP
+#undef GA_ILLUSION
+#undef GA_BULLETHELL
+#undef GA_LINES
+#undef GA_CONFUSION
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
index 6d3d58f40a..8dae71b3bf 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm
@@ -376,3 +376,5 @@
 		prey_body.forceMove(parent_morph.vore_selected)
 		log_and_message_admins("[key_name_admin(prey_body)] and [key_name_admin(parent_morph)] have been returned to their original bodies. [get_area(src)] - [COORD(src)].")
 	qdel(src)
+
+#undef MORPH_COOLDOWN
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
index c1102a6050..8fe1626976 100644
--- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm
@@ -15,8 +15,6 @@ List of things solar grubs should be able to do:
 	Therefore, if you see the grubs, kill them while they're small, or things might escalate." // TODO: PORT SOLAR MOTHS - Rykka
 	value = CATALOGUER_REWARD_EASY
 
-#define SINK_POWER 1
-
 /mob/living/simple_mob/vore/solargrub
 	name = "juvenile solargrub"
 	desc = "A young sparkling solargrub"
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index c7c5929e96..fd3c63ede7 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -1,4 +1,3 @@
-#define UPGRADE_COOLDOWN	40
 #define UPGRADE_KILL_TIMER	100
 
 ///Process_Grab()
@@ -415,3 +414,5 @@
 	qdel(hud)
 	hud = null
 	return ..()
+
+#undef UPGRADE_KILL_TIMER
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index 1956139fce..32e609ad90 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -254,6 +254,7 @@
 	to_chat(user,message)
 	to_chat(user, "<span class='danger'>^ This message was NOT SENT ^ -- It was [length] characters, and the limit is [MAX_MESSAGE_LEN]. It would fit in [posts] separate messages.</span>")
 #undef MAX_HUGE_MESSAGE_LEN
+#undef POST_DELIMITER_STR
 
 ///// PSAY /////
 
diff --git a/code/modules/nifsoft/software/13_soulcatcher.dm b/code/modules/nifsoft/software/13_soulcatcher.dm
index 5c0bad4294..a6e91a9efb 100644
--- a/code/modules/nifsoft/software/13_soulcatcher.dm
+++ b/code/modules/nifsoft/software/13_soulcatcher.dm
@@ -610,3 +610,10 @@
 	if(message)
 		var/sane_message = sanitize(message)
 		soulcatcher.emote_into(sane_message,src,null)
+
+#undef NIF_SC_CATCHING_ME
+#undef NIF_SC_CATCHING_OTHERS
+#undef NIF_SC_ALLOW_EARS
+#undef NIF_SC_ALLOW_EYES
+#undef NIF_SC_BACKUPS
+#undef NIF_SC_PROJECTING
diff --git a/code/modules/overmap/ships/ship.dm b/code/modules/overmap/ships/ship.dm
index 9252358757..35208c7285 100644
--- a/code/modules/overmap/ships/ship.dm
+++ b/code/modules/overmap/ships/ship.dm
@@ -44,7 +44,7 @@
 	var/last_sound = 0 //The last time a ship sound was played		//VOREStation add
 	var/sound_cooldown = 10 SECONDS		//VOREStation add
 
-	/// Vis contents overlay holding the ship's vector when in motion	
+	/// Vis contents overlay holding the ship's vector when in motion
 	var/obj/effect/overlay/vis/vector
 
 /obj/effect/overmap/visitable/ship/Initialize()
@@ -72,18 +72,18 @@
 
 /obj/effect/overmap/visitable/ship/get_scan_data(mob/user)
 	. = ..()
-	
+
 	if(!is_still())
 		. += {"\n\[i\]Heading\[/i\]: [get_heading_degrees()]\n\[i\]Velocity\[/i\]: [get_speed() * 1000]"}
 	else
 		. += {"\n\[i\]Vessel was stationary at time of scan.\[/i\]\n"}
-	
+
 	var/life = 0
-	
+
 	for(var/mob/living/L in living_mob_list)
 		if(L.z in map_z) //Things inside things we'll consider shielded, otherwise we'd want to use get_z(L)
 			life++
-	
+
 	. += {"\[i\]Life Signs\[/i\]: [life ? life : "None"]"}
 
 //Projected acceleration based on information from engines
@@ -301,6 +301,7 @@
 	var/y_to_use = T?.y || "UNK"
 	return "\[X:[x_to_use], Y:[y_to_use], VEL:[get_speed() * 1000], HDG:[get_heading_degrees()]\]"
 
+#undef SHIP_MOVE_RESOLUTION
 #undef MOVING
 #undef SANITIZE_SPEED
-#undef CHANGE_SPEED_BY
\ No newline at end of file
+#undef CHANGE_SPEED_BY
diff --git a/code/modules/reagents/holder/holder.dm b/code/modules/reagents/holder/holder.dm
index 28f133c840..96bd9a6e05 100644
--- a/code/modules/reagents/holder/holder.dm
+++ b/code/modules/reagents/holder/holder.dm
@@ -1,5 +1,3 @@
-#define PROCESS_REACTION_ITER 5 //when processing a reaction, iterate this many times
-
 /datum/reagents
 	var/list/datum/reagent/reagent_list = list()
 	var/total_volume = 0
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 74434dd9cc..45dcf88de2 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -5,11 +5,14 @@
 #define SYRINGE_INJECT 1
 #define SYRINGE_BROKEN 2
 
+#define SYRINGE_CAPPED 10
+
+
 /obj/item/weapon/reagent_containers/syringe
 	name = "syringe"
 	desc = "A syringe."
 	description_fluff = "This could be used to engrave messages on suitable surfaces if you really put your mind to it! Alt-click a floor or wall to engrave with it." //This way it's not a completely hidden, arcane art to engrave.
-	icon = 'icons/obj/syringe.dmi'
+	icon = 'icons/goonstation/objects/syringe_vr.dmi'
 	item_state = "syringe_0"
 	icon_state = "0"
 	center_of_mass = list("x" = 16,"y" = 14)
@@ -21,14 +24,34 @@
 	slot_flags = SLOT_EARS
 	sharp = TRUE
 	unacidable = TRUE //glass
-	var/mode = SYRINGE_DRAW
+	var/mode = SYRINGE_CAPPED
 	var/image/filling //holds a reference to the current filling overlay
 	var/visible_name = "a syringe"
 	var/time = 30
 	var/drawing = 0
+	var/used = FALSE
+	var/dirtiness = 0
+	var/list/targets
+	var/list/datum/disease2/disease/viruses
 	drop_sound = 'sound/items/drop/glass.ogg'
 	pickup_sound = 'sound/items/pickup/glass.ogg'
 
+
+/obj/item/weapon/reagent_containers/syringe/Initialize()
+	. = ..()
+	update_icon()
+
+/obj/item/weapon/reagent_containers/syringe/Destroy()
+	QDEL_LIST_NULL(viruses)
+	LAZYCLEARLIST(targets)
+	return ..()
+
+/obj/item/weapon/reagent_containers/syringe/process()
+	dirtiness = min(dirtiness + targets.len,75)
+	if(dirtiness >= 75)
+		STOP_PROCESSING(SSobj, src)
+	return 1
+
 /obj/item/weapon/reagent_containers/syringe/on_reagent_change()
 	update_icon()
 
@@ -42,6 +65,9 @@
 
 /obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob)
 	switch(mode)
+		if(SYRINGE_CAPPED)
+			mode = SYRINGE_DRAW
+			to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
 		if(SYRINGE_DRAW)
 			mode = SYRINGE_INJECT
 		if(SYRINGE_INJECT)
@@ -229,36 +255,8 @@
 				to_chat(user, "<span class='notice'>The syringe is empty.</span>")
 
 //		dirty(target,affected) //VOREStation Add -- Removed by Request
-
 	return
-/* VOREStation Edit - See syringes_vr.dm
-/obj/item/weapon/reagent_containers/syringe/update_icon()
-	cut_overlays()
 
-	if(mode == SYRINGE_BROKEN)
-		icon_state = "broken"
-		return
-
-	var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
-	if(ismob(loc))
-		var/injoverlay
-		switch(mode)
-			if (SYRINGE_DRAW)
-				injoverlay = "draw"
-			if (SYRINGE_INJECT)
-				injoverlay = "inject"
-		add_overlay(injoverlay)
-	icon_state = "[rounded_vol]"
-	item_state = "syringe_[rounded_vol]"
-
-	if(reagents.total_volume)
-		filling = image('icons/obj/reagentfillings.dmi', src, "syringe10")
-
-		filling.icon_state = "syringe[rounded_vol]"
-
-		filling.color = reagents.get_color()
-		add_overlay(filling)
-*/
 /obj/item/weapon/reagent_containers/syringe/proc/syringestab(mob/living/carbon/target as mob, mob/living/carbon/user as mob)
 	if(istype(target, /mob/living/carbon/human))
 
@@ -390,3 +388,93 @@
 	..()
 	//reagents.add_reagent("adrenaline",5) //VOREStation Edit - No thanks.
 	reagents.add_reagent("hyperzine",10)
+
+/obj/item/weapon/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
+	if(!ishuman(loc))
+		return //Avoid borg syringe problems.
+	LAZYINITLIST(targets)
+
+	//We can't keep a mob reference, that's a bad idea, so instead name+ref should suffice.
+	var/name_to_use = ismob(target) ? target.real_name : target.name
+	var/hash = md5(name_to_use + "\ref[target]")
+
+	//Just once!
+	targets |= hash
+
+	//Grab any viruses they have
+	if(iscarbon(target) && LAZYLEN(target.virus2.len))
+		LAZYINITLIST(viruses)
+		var/datum/disease2/disease/virus = pick(target.virus2.len)
+		viruses[hash] = virus.getcopy()
+
+	//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
+	//This gives the last one a 30% chance of infection.
+	var/infect_chance = dirtiness        //Start with dirtiness
+	if(infect_chance <= 10 && (hash in targets)) //Extra fast uses on target is free
+		infect_chance = 0
+	infect_chance += (targets.len-1)*10    //Extra 10% per extra target
+	if(prob(infect_chance))
+		log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].")
+		infect_limb(eo)
+
+	//75% chance to spread a virus if we have one
+	if(LAZYLEN(viruses) && prob(75))
+		var/old_hash = pick(viruses)
+		if(hash != old_hash) //Same virus you already had?
+			var/datum/disease2/disease/virus = viruses[old_hash]
+			infect_virus2(target,virus.getcopy())
+
+	if(!used)
+		START_PROCESSING(SSobj, src)
+
+/obj/item/weapon/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo)
+	src = null
+	var/datum/weakref/limb_ref = WEAKREF(eo)
+	spawn(rand(5 MINUTES,10 MINUTES))
+		var/obj/item/organ/external/found_limb = limb_ref.resolve()
+		if(istype(found_limb))
+			eo.germ_level += INFECTION_LEVEL_ONE+30
+
+//Allow for capped syringe mode
+
+//Allow for capped syringes
+/obj/item/weapon/reagent_containers/syringe/update_icon()
+	cut_overlays()
+
+	var/matrix/tf = matrix()
+	if(isstorage(loc))
+		tf.Turn(-90) //Vertical for storing compact-ly
+		tf.Translate(-3,0) //Could do this with pixel_x but let's just update the appearance once.
+	transform = tf
+
+	if(mode == SYRINGE_BROKEN)
+		icon_state = "broken"
+		return
+
+	if(mode == SYRINGE_CAPPED)
+		icon_state = "capped"
+		return
+
+	var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
+	if(reagents.total_volume)
+		filling = image(icon, src, "filler[rounded_vol]")
+		filling.color = reagents.get_color()
+		add_overlay(filling)
+
+	if(ismob(loc))
+		var/injoverlay
+		switch(mode)
+			if (SYRINGE_DRAW)
+				injoverlay = "draw"
+			if (SYRINGE_INJECT)
+				injoverlay = "inject"
+		add_overlay(injoverlay)
+
+	icon_state = "[rounded_vol]"
+	item_state = "syringe_[rounded_vol]"
+
+#undef SYRINGE_DRAW
+#undef SYRINGE_INJECT
+#undef SYRINGE_BROKEN
+
+#undef SYRINGE_CAPPED
diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm
deleted file mode 100644
index 1e69c63322..0000000000
--- a/code/modules/reagents/reagent_containers/syringes_vr.dm
+++ /dev/null
@@ -1,122 +0,0 @@
-#define SYRINGE_CAPPED 10
-
-/obj/item/weapon/reagent_containers/syringe
-	icon = 'icons/goonstation/objects/syringe_vr.dmi'
-	mode = SYRINGE_CAPPED //Override
-	var/used = FALSE
-	var/dirtiness = 0
-	var/list/targets
-	var/list/datum/disease2/disease/viruses
-
-/obj/item/weapon/reagent_containers/syringe/Initialize()
-	. = ..()
-	update_icon()
-
-/obj/item/weapon/reagent_containers/syringe/Destroy()
-	QDEL_LIST_NULL(viruses)
-	LAZYCLEARLIST(targets)
-	return ..()
-
-/obj/item/weapon/reagent_containers/syringe/process()
-	dirtiness = min(dirtiness + targets.len,75)
-	if(dirtiness >= 75)
-		STOP_PROCESSING(SSobj, src)
-	return 1
-
-/obj/item/weapon/reagent_containers/syringe/proc/dirty(var/mob/living/carbon/human/target, var/obj/item/organ/external/eo)
-	if(!ishuman(loc))
-		return //Avoid borg syringe problems.
-	LAZYINITLIST(targets)
-
-	//We can't keep a mob reference, that's a bad idea, so instead name+ref should suffice.
-	var/name_to_use = ismob(target) ? target.real_name : target.name
-	var/hash = md5(name_to_use + "\ref[target]")
-
-	//Just once!
-	targets |= hash
-
-	//Grab any viruses they have
-	if(iscarbon(target) && LAZYLEN(target.virus2.len))
-		LAZYINITLIST(viruses)
-		var/datum/disease2/disease/virus = pick(target.virus2.len)
-		viruses[hash] = virus.getcopy()
-
-	//Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though,
-	//This gives the last one a 30% chance of infection.
-	var/infect_chance = dirtiness        //Start with dirtiness
-	if(infect_chance <= 10 && (hash in targets)) //Extra fast uses on target is free
-		infect_chance = 0
-	infect_chance += (targets.len-1)*10    //Extra 10% per extra target
-	if(prob(infect_chance))
-		log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].")
-		infect_limb(eo)
-
-	//75% chance to spread a virus if we have one
-	if(LAZYLEN(viruses) && prob(75))
-		var/old_hash = pick(viruses)
-		if(hash != old_hash) //Same virus you already had?
-			var/datum/disease2/disease/virus = viruses[old_hash]
-			infect_virus2(target,virus.getcopy())
-
-	if(!used)
-		START_PROCESSING(SSobj, src)
-
-/obj/item/weapon/reagent_containers/syringe/proc/infect_limb(var/obj/item/organ/external/eo)
-	src = null
-	var/datum/weakref/limb_ref = WEAKREF(eo)
-	spawn(rand(5 MINUTES,10 MINUTES))
-		var/obj/item/organ/external/found_limb = limb_ref.resolve()
-		if(istype(found_limb))
-			eo.germ_level += INFECTION_LEVEL_ONE+30
-
-//Allow for capped syringe mode
-/obj/item/weapon/reagent_containers/syringe/attack_self(mob/user as mob)
-	switch(mode)
-		if(SYRINGE_CAPPED)
-			mode = SYRINGE_DRAW
-			to_chat(user,"<span class='notice'>You uncap the syringe.</span>")
-		if(SYRINGE_DRAW)
-			mode = SYRINGE_INJECT
-		if(SYRINGE_INJECT)
-			mode = SYRINGE_DRAW
-		if(SYRINGE_BROKEN)
-			return
-	update_icon()
-
-//Allow for capped syringes
-/obj/item/weapon/reagent_containers/syringe/update_icon()
-	cut_overlays()
-
-	var/matrix/tf = matrix()
-	if(isstorage(loc))
-		tf.Turn(-90) //Vertical for storing compact-ly
-		tf.Translate(-3,0) //Could do this with pixel_x but let's just update the appearance once.
-	transform = tf
-
-	if(mode == SYRINGE_BROKEN)
-		icon_state = "broken"
-		return
-
-	if(mode == SYRINGE_CAPPED)
-		icon_state = "capped"
-		return
-
-	var/rounded_vol = round(reagents.total_volume, round(reagents.maximum_volume / 3))
-	if(reagents.total_volume)
-		filling = image(icon, src, "filler[rounded_vol]")
-		filling.color = reagents.get_color()
-		add_overlay(filling)
-
-	if(ismob(loc))
-		var/injoverlay
-		switch(mode)
-			if (SYRINGE_DRAW)
-				injoverlay = "draw"
-			if (SYRINGE_INJECT)
-				injoverlay = "inject"
-		add_overlay(injoverlay)
-
-	icon_state = "[rounded_vol]"
-	item_state = "syringe_[rounded_vol]"
-
-#undef SYRINGE_CAPPED
diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm
index 6a1234950f..f9ee437f52 100644
--- a/code/modules/reagents/reagents/core.dm
+++ b/code/modules/reagents/reagents/core.dm
@@ -156,6 +156,7 @@
 	..()
 
 #define WATER_LATENT_HEAT 19000 // How much heat is removed when applied to a hot turf, in J/unit (19000 makes 120 u of water roughly equivalent to 4L)
+
 /datum/reagent/water
 	name = "Water"
 	id = "water"
@@ -250,6 +251,8 @@
 	..()
 */  //VOREStation Edit End.
 
+#undef WATER_LATENT_HEAT
+
 /datum/reagent/fuel
 	name = "Welding fuel"
 	id = "fuel"
diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm
index 690775232f..b597fd5733 100644
--- a/code/modules/resleeving/designer.dm
+++ b/code/modules/resleeving/designer.dm
@@ -454,3 +454,9 @@
 		new /obj/item/weapon/disk/body_record(src)
 
 #undef MOB_HEX_COLOR
+
+#undef MENU_MAIN
+#undef MENU_BODYRECORDS
+#undef MENU_STOCKRECORDS
+#undef MENU_SPECIFICRECORD
+#undef MENU_OOCNOTES
diff --git a/vorestation.dme b/vorestation.dme
index 3b05b189c9..db678227af 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -29,18 +29,23 @@
 #include "code\__defines\_planes+layers_vr.dm"
 #include "code\__defines\_protect.dm"
 #include "code\__defines\_tick.dm"
+#include "code\__defines\action.dm"
 #include "code\__defines\admin.dm"
 #include "code\__defines\admin_vr.dm"
+#include "code\__defines\airlock_control.dm"
 #include "code\__defines\ammunition.dm"
 #include "code\__defines\appearance.dm"
 #include "code\__defines\assemblies.dm"
 #include "code\__defines\atmos.dm"
 #include "code\__defines\atoms_movable.dm"
 #include "code\__defines\belly_modes_vr.dm"
+#include "code\__defines\blueprints.dm"
 #include "code\__defines\callbacks.dm"
 #include "code\__defines\chat.dm"
 #include "code\__defines\chemistry.dm"
 #include "code\__defines\chemistry_vr.dm"
+#include "code\__defines\circuitboard.dm"
+#include "code\__defines\cloning.dm"
 #include "code\__defines\color.dm"
 #include "code\__defines\color_priority.dm"
 #include "code\__defines\construction_datum.dm"
@@ -55,14 +60,19 @@
 #include "code\__defines\exosuit_fab.dm"
 #include "code\__defines\flags.dm"
 #include "code\__defines\gamemode.dm"
+#include "code\__defines\holder.dm"
 #include "code\__defines\holomap.dm"
 #include "code\__defines\hoses.dm"
+#include "code\__defines\implant.dm"
 #include "code\__defines\input.dm"
 #include "code\__defines\instruments.dm"
 #include "code\__defines\integrated_circuits.dm"
 #include "code\__defines\inventory_sizes.dm"
 #include "code\__defines\is_helpers.dm"
 #include "code\__defines\items_clothing.dm"
+#include "code\__defines\job_controller.dm"
+#include "code\__defines\jukebox.dm"
+#include "code\__defines\life.dm"
 #include "code\__defines\lighting.dm"
 #include "code\__defines\lighting_vr.dm"
 #include "code\__defines\logging.dm"
@@ -73,6 +83,7 @@
 #include "code\__defines\math.dm"
 #include "code\__defines\math_physics.dm"
 #include "code\__defines\MC.dm"
+#include "code\__defines\mecha.dm"
 #include "code\__defines\misc.dm"
 #include "code\__defines\misc_vr.dm"
 #include "code\__defines\mobs.dm"
@@ -82,6 +93,8 @@
 #include "code\__defines\nifsoft.dm"
 #include "code\__defines\objects.dm"
 #include "code\__defines\overmap.dm"
+#include "code\__defines\paicard.dm"
+#include "code\__defines\persistence.dm"
 #include "code\__defines\power.dm"
 #include "code\__defines\pda.dm"
 #include "code\__defines\planets.dm"
@@ -94,17 +107,22 @@
 #include "code\__defines\projectiles.dm"
 #include "code\__defines\qdel.dm"
 #include "code\__defines\recipe.dm"
+#include "code\__defines\request_console.dm"
 #include "code\__defines\robot.dm"
 #include "code\__defines\research.dm"
 #include "code\__defines\roguemining_vr.dm"
 #include "code\__defines\rust_g.dm"
+#include "code\__defines\SDQL_2.dm"
 #include "code\__defines\shadekin.dm"
 #include "code\__defines\shields.dm"
 #include "code\__defines\shuttle.dm"
+#include "code\__defines\simple_mob.dm"
+#include "code\__defines\size.dm"
 #include "code\__defines\sound.dm"
 #include "code\__defines\span_vr.dm"
 #include "code\__defines\species_languages.dm"
 #include "code\__defines\species_languages_vr.dm"
+#include "code\__defines\spells.dm"
 #include "code\__defines\sprite_sheets.dm"
 #include "code\__defines\sqlite_defines.dm"
 #include "code\__defines\stat_tracking.dm"
@@ -117,9 +135,11 @@
 #include "code\__defines\tgui.dm"
 #include "code\__defines\time.dm"
 #include "code\__defines\tools.dm"
+#include "code\__defines\traits.dm"
 #include "code\__defines\turfs.dm"
 #include "code\__defines\typeids.dm"
 #include "code\__defines\unit_tests.dm"
+#include "code\__defines\update_icons.dm"
 #include "code\__defines\vore.dm"
 #include "code\__defines\vote.dm"
 #include "code\__defines\vv.dm"
@@ -3822,7 +3842,6 @@
 #include "code\modules\reagents\reagent_containers\spray.dm"
 #include "code\modules\reagents\reagent_containers\spray_vr.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
-#include "code\modules\reagents\reagent_containers\syringes_vr.dm"
 #include "code\modules\reagents\reagent_containers\unidentified_hypospray.dm"
 #include "code\modules\reagents\reagents\_helpers.dm"
 #include "code\modules\reagents\reagents\_reagents.dm"