[MIRROR] even more local defines (#8516)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>

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

code/ATMOSPHERICS/components/unary/heat_source.dm

@@ -160,3 +160,5 @@
 	. = ..()
 	if(panel_open)
 		. += "The maintenance hatch is open."
+
+#undef HEATER_PERF_MULT

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")

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

code/__defines/airlock_control.dm

@@ -0,0 +1 @@
+#define AIRLOCK_CONTROL_RANGE 22

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

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) + ")"

code/__defines/cloning.dm

@@ -0,0 +1 @@
+#define CLONE_BIOMASS 30 //VOREstation Edit

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

code/__defines/holder.dm

@@ -0,0 +1 @@
+#define PROCESS_REACTION_ITER 5 //when processing a reaction, iterate this many times

code/__defines/implant.dm

@@ -0,0 +1,2 @@
+#define MALFUNCTION_TEMPORARY 1
+#define MALFUNCTION_PERMANENT 2

code/__defines/job_controller.dm

@@ -0,0 +1,3 @@
+#define GET_RANDOM_JOB 0
+#define BE_ASSISTANT 1
+#define RETURN_TO_LOBBY 2

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.

code/__defines/life.dm

@@ -0,0 +1,22 @@
+//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.
+
+#define RADIATION_SPEED_COEFFICIENT 0.1  //CHOMPAdd, global here

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

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

code/__defines/paicard.dm

@@ -0,0 +1,3 @@
+#define PP_FUNCTIONAL		0
+#define PP_BROKEN			1
+#define PP_MISSING			2

code/__defines/persistence.dm

@@ -1 +1,7 @@
-#define PERSISTENCE_VARIABLE_TOKEN_LENGTH -1
+#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

code/__defines/planets_vr.dm

@@ -1 +1,47 @@
-#define WEATHER_PARTY				"party"
+#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

code/__defines/preferences.dm

@@ -12,4 +12,6 @@
 #define MULTILINGUAL_DOUBLE_DELIMITER	2
 #define MULTILINGUAL_OFF				3
 
-#define MULTILINGUAL_MODE_MAX			4
+#define MULTILINGUAL_MODE_MAX			4
+
+#define SAVE_RESET -1

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

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 * 15 //chompedit: Reduce health of hivebots by reducing 40 to 15

code/__defines/size.dm

@@ -0,0 +1,3 @@
+
+#define MAX_VOICE_FREQ 70000
+#define MIN_VOICE_FREQ 15000

code/__defines/spells.dm

@@ -0,0 +1,5 @@
+
+#define OFFENSIVE_SPELLS "Offensive"
+#define DEFENSIVE_SPELLS "Defensive"
+#define UTILITY_SPELLS "Utility"
+#define SUPPORT_SPELLS "Support"

code/__defines/traits.dm

@@ -1,3 +1,4 @@
+//CHOMPAdd Start
 /*
 Remember to update _globalvars/traits.dm if you're adding/removing/renaming traits.
 */
@@ -209,3 +210,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define FROGENITE_TRAIT "frogenite"
 #define FERVEATIUM_TRAIT "ferveatium"
 */
+//CHOMPAdd End
+
+#define ORGANICS	1
+#define SYNTHETICS	2

code/__defines/update_icons.dm

@@ -0,0 +1,43 @@
+//CHOMPEDIT Start: edit the file human/update_icons.dm in the modular_chomp folder as well, if you update these (and clothing/clothing.dm line 789, the hardcoded layer there in /obj/item/clothing/suit/make_worn_icon)
+#define MUTATIONS_LAYER			1		//Mutations like fat, and lasereyes
+#define TAIL_LOWER_LAYER		2		//Tail as viewed from the south //CHOMPStation edit - underneath bodyparts
+#define WING_LOWER_LAYER		3		//Wings as viewed from the south //CHOMPStation edit - underneath bodyparts
+#define BODYPARTS_LAYER			4		//Bodyparts layer - CHOMPStation edit
+#define SKIN_LAYER				5		//Skin things added by a call on species
+#define BLOOD_LAYER				6		//Bloodied hands/feet/anything else
+#define MOB_DAM_LAYER			7		//Injury overlay sprites like open wounds
+#define SURGERY_LAYER			8		//Overlays for open surgical sites
+#define UNDERWEAR_LAYER  		9		//Underwear/bras/etc
+#define SHOES_LAYER_ALT			10		//Shoe-slot item (when set to be under uniform via verb)
+#define UNIFORM_LAYER			11		//Uniform-slot item
+#define ID_LAYER				12		//ID-slot item
+#define SHOES_LAYER				13		//Shoe-slot item
+#define GLOVES_LAYER			14		//Glove-slot item
+#define BELT_LAYER				15		//Belt-slot item
+#define SUIT_LAYER				16		//Suit-slot item
+#define TAIL_UPPER_LAYER		17	//Some species have tails to render (As viewed from the N, E, or W)
+#define GLASSES_LAYER			18		//Eye-slot item
+#define BELT_LAYER_ALT			19		//Belt-slot item (when set to be above suit via verb)
+#define SUIT_STORE_LAYER		20		//Suit storage-slot item
+#define BACK_LAYER				21		//Back-slot item
+#define HAIR_LAYER				22		//The human's hair
+#define HAIR_ACCESSORY_LAYER	23		//VOREStation edit. Simply move this up a number if things are added.
+#define EARS_LAYER				24		//Both ear-slot items (combined image)
+#define EYES_LAYER				25		//Mob's eyes (used for glowing eyes)
+#define FACEMASK_LAYER			26		//Mask-slot item
+#define GLASSES_LAYER_ALT		27		//So some glasses can appear on top of hair and things
+#define HEAD_LAYER				28		//Head-slot item
+#define HANDCUFF_LAYER			29		//Handcuffs, if the human is handcuffed, in a secret inv slot
+#define LEGCUFF_LAYER			30		//Same as handcuffs, for legcuffs
+#define L_HAND_LAYER			31		//Left-hand item
+#define R_HAND_LAYER			32		//Right-hand item
+#define WING_LAYER				33		//Wings or protrusions over the suit.
+#define VORE_BELLY_LAYER		34		//CHOMPStation edit - Move this and everything after up if things are added.
+#define VORE_TAIL_LAYER			35		//CHOMPStation edit - Move this and everything after up if things are added.
+#define TAIL_UPPER_LAYER_ALT	36		//Modified tail-sprite layer. Tend to be larger.
+#define MODIFIER_EFFECTS_LAYER	37		//Effects drawn by modifiers
+#define FIRE_LAYER				38		//'Mob on fire' overlay layer
+#define MOB_WATER_LAYER			39		//'Mob submerged' overlay layer
+#define TARGETED_LAYER			40		//'Aimed at' overlay layer
+#define TOTAL_LAYERS			40		//CHOMPStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
+//CHOMPEdit End

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
+	action_type = AB_INNATE
+
+#undef AB_ITEM
+#undef AB_SPELL
+#undef AB_INNATE
+#undef AB_GENERIC

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

code/_onclick/hud/radial.dm

@@ -318,4 +318,7 @@ GLOBAL_LIST_EMPTY(radial_menus)
 	var/answer = menu.selected_choice
 	QDEL_NULL(menu)
 	GLOB.radial_menus -= uniqueid
-	return answer
+	return answer
+
+#undef NEXT_PAGE_ID
+#undef DEFAULT_CHECK_DELAY

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

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)

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".
@@ -512,3 +455,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

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

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

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

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()

code/game/machinery/air_alarm.dm

@@ -877,3 +877,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

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.

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

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

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

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

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

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

code/game/machinery/cryo.dm

@@ -368,3 +368,5 @@
 
 /datum/data/function/proc/display()
 	return
+
+#undef HEAT_CAPACITY_HUMAN

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

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

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

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."

code/game/machinery/embedded_controller/docking_program.dm

@@ -306,4 +306,6 @@
 
 #undef MODE_NONE
 #undef MODE_SERVER
-#undef MODE_CLIENT
+#undef MODE_CLIENT
+
+#undef MESSAGE_RESEND_TIME

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!"

code/game/machinery/nuclear_bomb.dm

@@ -416,6 +416,8 @@ var/bomb_set
 				return
 	return
 
+#undef NUKERANGE
+
 /obj/item/weapon/disk/nuclear/New()
 	..()
 	nuke_disks |= src

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"

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

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 = ""

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()
 

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"

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"
@@ -2917,3 +2900,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

code/game/mecha/micro/mecha_vr.dm

@@ -1,7 +1,7 @@
 /*#ifdef T_BOARD_MICRO_MECHA ////CHOMPedit commented micromech stuff, because fuck this trash
 #error T_BOARD_MICRO_MECHA already defined elsewhere, we can't use it.
 #endif
-#define T_BOARD_MICRO_MECHA(name)	"exosuit module circuit board (" + (name) + ")"
+# define T_BOARD_MICRO_MECHA(name)	"exosuit module circuit board (" + (name) + ")"
 
 /obj/item/weapon/circuitboard/mecha/gopher
 		origin_tech = list(TECH_DATA = 3)
@@ -44,4 +44,5 @@
 
 /obj/item/weapon/circuitboard/mecha/weasel/main
 		name = T_BOARD_MICRO_MECHA("Weasel central control")
-		icon_state = "mainboard" */
+		icon_state = "mainboard"
+# undef T_BOARD_MICRO_MECHA */

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -252,3 +252,5 @@ var/global/list/image/splatter_cache=list()
 /obj/effect/decal/cleanable/mucus/mapped/Destroy()
 	virus2.Cut()
 	return ..()
+
+#undef DRYING_TIME

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
 

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
+	return 1

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

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'

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."

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

code/game/objects/items/uav.dm

@@ -365,4 +365,5 @@
 
 #undef UAV_OFF
 #undef UAV_ON
+#undef UAV_PAIRING
 #undef UAV_PACKED

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'

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'

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"
+	default_material = "durasteel"

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

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

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

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()
+	update_icon()

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

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

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.

code/modules/admin/verbs/buildmode.dm

@@ -878,3 +878,4 @@ CHOMP Remove end */
 #undef BUILDMODE_LIGHTS
 #undef BUILDMODE_AI
 #undef LAST_BUILDMODE
+#undef BUILDMODE_DROP

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

code/modules/admin/verbs/lightning_strike.dm

@@ -96,5 +96,6 @@
 				C.deaf_loop.start() // CHOMPStation Add: Ear Ringing/Deafness
 			to_chat(L, span("danger", "Lightning struck nearby, and the thunderclap is deafening!"))
 
+#undef LIGHTNING_REDIRECT_RANGE
 #undef LIGHTNING_ZAP_RANGE
 #undef LIGHTNING_POWER

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)

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
+	return visible_alarms

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.

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
@@ -387,3 +385,8 @@
 		return TOPIC_REFRESH
 	// CHOMPEdit End
 	return ..();
+
+#undef WEIGHT_MIN
+#undef WEIGHT_MAX
+#undef WEIGHT_CHANGE_MIN
+#undef WEIGHT_CHANGE_MAX

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.

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

code/modules/client/preferences.dm

@@ -1,5 +1,3 @@
-#define SAVE_RESET -1
-
 var/list/preferences_datums = list()
 
 /datum/preferences

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 ""
 */
 
 //*******************************

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

code/modules/mob/living/bot/farmbot.dm

@@ -419,3 +419,8 @@
 
 /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
+
+#undef FARMBOT_COLLECT
+#undef FARMBOT_WATER
+#undef FARMBOT_UPROOT
+#undef FARMBOT_NUTRIMENT

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"

code/modules/mob/living/bot/medbot.dm

@@ -573,3 +573,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

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

code/modules/mob/living/bot/secbot.dm

@@ -481,3 +481,7 @@
 		if(!in_range(src, user) && loc != user)
 			return
 		created_name = t
+
+#undef SECBOT_WAIT_TIME
+#undef SECBOT_THREAT_ARREST
+#undef SECBOT_THREAT_ATTACK

code/modules/mob/living/carbon/human/life.dm

@@ -12,26 +12,7 @@
 #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 RADIATION_SPEED_COEFFICIENT 0.1 //CHOMPRemove
 #define HUMAN_COMBUSTION_TEMP 524 //524k is the sustained combustion temperature of human fat
 
 /mob/living/carbon/human
@@ -2229,3 +2210,14 @@ End Chomp edit */
 
 #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 //CHOMPRemove
+#undef HUMAN_COMBUSTION_TEMP

code/modules/mob/living/carbon/human/update_icons.dm

@@ -62,6 +62,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
 // These are used as the layers for the icons, as well as indexes in a list that holds onto them.
 // Technically the layers used are all -100+layer to make them FLOAT_LAYER overlays.
 //CHOMPEDIT: edit the file human/update_icons.dm in the modular_chomp folder as well, if you update these (and clothing/clothing.dm line 789, the hardcoded layer there in /obj/item/clothing/suit/make_worn_icon)
+/*CHOMPRemove Start: Global here!
 //Human Overlays Indexes/////////
 #define MUTATIONS_LAYER			1		//Mutations like fat, and lasereyes
 #define TAIL_LOWER_LAYER		2		//Tail as viewed from the south //CHOMPStation edit - underneath bodyparts
@@ -105,6 +106,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
 #define TARGETED_LAYER			40		//'Aimed at' overlay layer
 #define TOTAL_LAYERS			40		//CHOMPStation edit. <---- KEEP THIS UPDATED, should always equal the highest number here, used to initialize a list.
 //////////////////////////////////
+*///CHOMPRemove End
 
 //These two are only used for gargoyles currently
 #define HUMAN_BODY_LAYERS list(MUTATIONS_LAYER, TAIL_LOWER_LAYER, WING_LOWER_LAYER, BODYPARTS_LAYER, SKIN_LAYER, BLOOD_LAYER, MOB_DAM_LAYER, TAIL_UPPER_LAYER, HAIR_LAYER, HAIR_ACCESSORY_LAYER, EYES_LAYER, WING_LAYER, VORE_BELLY_LAYER, VORE_TAIL_LAYER, TAIL_UPPER_LAYER_ALT)
@@ -1447,37 +1449,43 @@ GLOBAL_LIST_EMPTY(damage_icon_parts) //see UpdateDamageIcon()
 
 //Human Overlays Indexes/////////
 /* CHOMPEdit - why are these undefined??
-#undef MUTATIONS_LAYER
-#undef SKIN_LAYER
-#undef MOB_DAM_LAYER
-#undef SURGERY_LAYER
-#undef UNDERWEAR_LAYER
-#undef SHOES_LAYER_ALT
-#undef UNIFORM_LAYER
-#undef ID_LAYER
-#undef SHOES_LAYER
-#undef GLOVES_LAYER
-#undef BELT_LAYER
-#undef SUIT_LAYER
-#undef TAIL_UPPER_LAYER
-#undef TAIL_LOWER_LAYER
-#undef GLASSES_LAYER
-#undef BELT_LAYER_ALT
-#undef SUIT_STORE_LAYER
-#undef BACK_LAYER
-#undef HAIR_LAYER
-#undef EARS_LAYER
-#undef EYES_LAYER
-#undef FACEMASK_LAYER
-#undef HEAD_LAYER
-#undef HANDCUFF_LAYER
-#undef LEGCUFF_LAYER
-#undef L_HAND_LAYER
-#undef R_HAND_LAYER
-#undef VORE_BELLY_LAYER
-#undef MODIFIER_EFFECTS_LAYER
-#undef FIRE_LAYER
-#undef WATER_LAYER
-#undef TARGETED_LAYER
-#undef TOTAL_LAYERS
+# undef MUTATIONS_LAYER
+# undef SKIN_LAYER
+# undef BLOOD_LAYER
+# undef MOB_DAM_LAYER
+# undef SURGERY_LAYER
+# undef UNDERWEAR_LAYER
+# undef SHOES_LAYER_ALT
+# undef UNIFORM_LAYER
+# undef ID_LAYER
+# undef SHOES_LAYER
+# undef GLOVES_LAYER
+# undef BELT_LAYER
+# 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 VORE_BELLY_LAYER
+# undef WING_LAYER
+# undef TAIL_UPPER_LAYER_ALT
+# undef MODIFIER_EFFECTS_LAYER
+# undef FIRE_LAYER
+# undef WATER_LAYER
+# undef TARGETED_LAYER
+# undef TOTAL_LAYERS
 */

code/modules/mob/living/silicon/robot/robot.dm

@@ -1781,3 +1781,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

code/modules/mob/living/silicon/robot/sprites/fluff.dm

@@ -109,4 +109,6 @@
 	pixel_x = -16
 
 	whitelist_ckey = "lunarfleet"
-	whitelist_charname = "Clea-Nor"
+	whitelist_charname = "Clea-Nor"
+
+#undef CUSTOM_BORGSPRITE

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

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 * 15 //chompedit: Reduce health of hivebots by reducing 40 to 15
-
 /mob/living/simple_mob/mechanical/hivebot
 	name = "hivebot"
 	desc = "A robot. It appears to be somewhat resilient, but lacks a true weapon."