[MIRROR] Undefines local defines and moves global to __define (#8502)

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

code/__defines/ammunition.dm

@@ -0,0 +1,4 @@
+//Gun loading types
+#define SINGLE_CASING 	1	//The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
+#define SPEEDLOADER 	2	//Transfers casings from the mag to the gun when used.
+#define MAGAZINE 		4	//The magazine item itself goes inside the gun

code/__defines/assemblies.dm

@@ -0,0 +1,2 @@
+#define IC_COMPONENTS_BASE		20
+#define IC_COMPLEXITY_BASE		60

code/__defines/construction_datum.dm

@@ -0,0 +1,2 @@
+#define FORWARD -1
+#define BACKWARD 1

code/__defines/economy_misc.dm

@@ -0,0 +1,24 @@
+
+#define RIOTS 1
+#define WILD_ANIMAL_ATTACK 2
+#define INDUSTRIAL_ACCIDENT 3
+#define BIOHAZARD_OUTBREAK 4
+#define PIRATES 6
+#define CORPORATE_ATTACK 7
+#define ALIEN_RAIDERS 8
+#define AI_LIBERATION 9
+#define MOURNING 10
+#define CULT_CELL_REVEALED 11
+#define SECURITY_BREACH 12
+#define ANIMAL_RIGHTS_RAID 13
+#define FESTIVAL 14
+
+#define SECURITY 1
+#define FOOD 2
+#define ANIMALS 3
+#define MINERALS 4
+#define EMERGENCY 5
+#define GASEOUS 6
+#define MAINTENANCE 7
+#define ROBOTICS 8
+#define BIOMEDICAL 9

code/__defines/equipment_vendor.dm

@@ -0,0 +1,2 @@
+
+#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p)

code/__defines/lighting_vr.dm

@@ -6,3 +6,8 @@
 //Fake ambient occlusion filter
 #undef AMBIENT_OCCLUSION
 #define AMBIENT_OCCLUSION filter(type="drop_shadow", x=0, y=-1, size=2, offset=2, color="#04080F55") //VOREStation Edit for prettier visuals.
+
+#define LIGHT_OK 0
+#define LIGHT_EMPTY 1
+#define LIGHT_BROKEN 2
+#define LIGHT_BURNED 3

code/__defines/map.dm

@@ -14,3 +14,5 @@
 
 // Misc map defines.
 #define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge.	//VOREStation Edit
+
+#define CELL_ALIVE(VAL) (VAL == cell_live_value)

code/__defines/objects.dm

@@ -49,3 +49,5 @@
 #define MECH_ARMOR		"Plating"
 #define MECH_GAS		"Life Support"
 #define MECH_ELECTRIC	"Firmware"
+
+#define DRINK_ICON_FILE 'icons/pdrink.dmi'

code/__defines/observer.dm

@@ -0,0 +1 @@
+#define OBSERVER_EVENT_DESTROY "OnDestroy"

code/__defines/organ_internal.dm

@@ -0,0 +1 @@
+#define PROCESS_ACCURACY 10

code/__defines/power.dm

@@ -0,0 +1,2 @@
+#define I_SINGULO "singulo"
+#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators

code/__defines/projectile.dm

@@ -0,0 +1,3 @@
+#define HOLD_CASINGS	0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour
+#define EJECT_CASINGS	1 //drop spent casings on the ground after firing
+#define CYCLE_CASINGS 	2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns

code/__defines/recipe.dm

@@ -0,0 +1,9 @@
+// Recipe type defines. Used to determine what machine makes them.
+#define MICROWAVE			0x1
+#define FRYER				0x2
+#define OVEN				0x4
+#define GRILL				0x8
+#define CANDYMAKER			0x10
+#define CEREALMAKER			0x20
+
+#define RECIPE_REAGENT_REPLACE		0 //Reagents in the ingredients are discarded.

code/__defines/robot.dm

@@ -0,0 +1 @@
+#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen"

code/controllers/master_controller.dm

@@ -43,9 +43,9 @@ var/global/pipe_processing_killed = 0
 	admin_notice("<span class='danger'>Initializations complete.</span>", R_DEBUG)
 
 // #if UNIT_TEST
-// #define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
+// # define CHECK_SLEEP_MASTER // For unit tests we don't care about a smooth lobby screen experience. We care about speed.
 // #else
-// #define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
+// # define CHECK_SLEEP_MASTER if(++initialized_objects > 500) { initialized_objects=0;sleep(world.tick_lag); }
 // #endif
 
 /datum/controller/game_controller/proc/setup_objects()

code/controllers/observer_listener/atom/observer.dm

@@ -1,5 +1,3 @@
-#define OBSERVER_EVENT_DESTROY "OnDestroy"
-
 /atom
 	var/list/observer_events
 

code/controllers/subsystems/plants.dm

@@ -162,3 +162,5 @@ SUBSYSTEM_DEF(plants)
 
 	for(var/mask in SSplants.gene_tag_masks)
 		to_chat(usr, "[mask]: [SSplants.gene_tag_masks[mask]]")
+
+#undef PLANT_TICK_TIME

code/controllers/subsystems/robot_sprites.dm

@@ -1,5 +1,3 @@
-#define DEFAULT_ROBOT_SPRITE_NAME "M-USE NanoTrasen"
-
 SUBSYSTEM_DEF(robot_sprites)
 	name = "Robot Sprites"
 	init_order = INIT_ORDER_ROBOT_SPRITES

code/controllers/subsystems/throwing.dm

@@ -209,3 +209,6 @@ SUBSYSTEM_DEF(throwing)
 	if(hit_thing)
 		finalize(hit=TRUE, t_target=hit_thing)
 		return TRUE
+
+#undef MAX_THROWING_DIST
+#undef MAX_TICKS_TO_MAKE_UP

code/datums/components/crafting/recipes.dm

@@ -1,7 +1,7 @@
 ///If the machine is used/deleted in the crafting process
-#define CRAFTING_MACHINERY_CONSUME 1
+//# define CRAFTING_MACHINERY_CONSUME 1 Unused
 ///If the machine is only "used" i.e. it checks to see if it's nearby and allows crafting, but doesn't delete it
-#define CRAFTING_MACHINERY_USE 0
+//# define CRAFTING_MACHINERY_USE 0  Unused
 
 /datum/crafting_recipe
 	var/name = "" //in-game display name

code/datums/helper_datums/construction_datum.dm

@@ -1,7 +1,3 @@
-#define FORWARD -1
-#define BACKWARD 1
-
-
 // As of August 4th, 2018, these datums are only used in Mech construction.
 /datum/construction
 	var/list/steps

code/datums/looping_sounds/sequence.dm

@@ -173,3 +173,4 @@
 
 #undef MORSE_DOT
 #undef MORSE_DASH
+#undef MORSE_BASE_DELAY

code/datums/wires/mines.dm

@@ -79,6 +79,8 @@
 
 	..()
 
+#undef WIRE_TRAP
+
 /datum/wires/mines/interactable(mob/user)
 	var/obj/effect/mine/M = holder
 	return M.panel_open

code/defines/procs/radio.dm

@@ -61,6 +61,11 @@
 			return TELECOMMS_RECEPTION_RECEIVER
 	return TELECOMMS_RECEPTION_NONE
 
+#undef TELECOMMS_RECEPTION_NONE
+#undef TELECOMMS_RECEPTION_SENDER
+#undef TELECOMMS_RECEPTION_RECEIVER
+#undef TELECOMMS_RECEPTION_BOTH
+
 /proc/get_reception(var/atom/sender, var/receiver, var/message = "", var/do_sleep = 1)
 	var/datum/reception/reception = new
 

code/game/objects/items/devices/lightreplacer.dm

@@ -32,12 +32,6 @@
 //
 // The explosion cannot insta-kill anyone with 30% or more health.
 
-#define LIGHT_OK 0
-#define LIGHT_EMPTY 1
-#define LIGHT_BROKEN 2
-#define LIGHT_BURNED 3
-
-
 /obj/item/device/lightreplacer
 
 	name = "light replacer"
@@ -223,8 +217,3 @@
 		return 1
 	else
 		return 0
-
-#undef LIGHT_OK
-#undef LIGHT_EMPTY
-#undef LIGHT_BROKEN
-#undef LIGHT_BURNED

code/modules/ai/ai_holder.dm

@@ -524,3 +524,8 @@
 #undef AI_NO_PROCESS
 #undef AI_PROCESSING
 #undef AI_FASTPROCESSING
+
+#undef START_AIPROCESSING
+#undef STOP_AIPROCESSING
+#undef START_AIFASTPROCESSING
+#undef STOP_AIFASTPROCESSING

code/modules/ai/ai_holder_subtypes/simple_mob_ai_vr.dm

@@ -2,3 +2,5 @@
 
 VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/melee/evasive)
 VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/ranged/kiting/threatening)
+
+#undef VIRGO_AI_NORETURN_CREATE

code/modules/busy_space_vr/air_traffic.dm

@@ -461,3 +461,6 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
 	msg(full_closure,"[prefix] [shipname]")
 	return
 */
+
+#undef MIN_MSG_DELAY
+#undef MAX_MSG_DELAY

code/modules/casino/casino_prize_vendor.dm

@@ -410,3 +410,5 @@
 /obj/machinery/casino_prize_dispenser/process() //Might not need this, but just to be safe for now
 	if(stat & (BROKEN|NOPOWER))
 		return
+
+#undef CASINO_PRIZE

code/modules/clothing/suits/miscellaneous.dm

@@ -46,6 +46,8 @@
 	desc = "Replica armor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)."
 	icon_state = "redtag2"
 
+#undef LASER_TAG_HEALTH
+
 /*
  * 80s
  */

code/modules/economy/ATM.dm

@@ -480,3 +480,8 @@ log transactions
 		human_user.put_in_hands(E)
 	E.worth = sum
 	E.owner_name = authenticated_account.owner_name
+
+#undef NO_SCREEN
+#undef CHANGE_SECURITY_LEVEL
+#undef TRANSFER_FUNDS
+#undef VIEW_TRANSACTION_LOGS

code/modules/economy/economy_misc.dm

@@ -1,29 +1,3 @@
-
-#define RIOTS 1
-#define WILD_ANIMAL_ATTACK 2
-#define INDUSTRIAL_ACCIDENT 3
-#define BIOHAZARD_OUTBREAK 4
-#define PIRATES 6
-#define CORPORATE_ATTACK 7
-#define ALIEN_RAIDERS 8
-#define AI_LIBERATION 9
-#define MOURNING 10
-#define CULT_CELL_REVEALED 11
-#define SECURITY_BREACH 12
-#define ANIMAL_RIGHTS_RAID 13
-#define FESTIVAL 14
-
-#define SECURITY 1
-#define FOOD 2
-#define ANIMALS 3
-#define MINERALS 4
-#define EMERGENCY 5
-#define GASEOUS 6
-#define MAINTENANCE 7
-#define ROBOTICS 8
-#define BIOMEDICAL 9
-
-
 //---- The following corporations are friendly with NanoTrasen and loosely enable trade and travel:
 //Corporation NanoTrasen - Generalised / high tech research and phoron exploitation.
 //Corporation Vessel Contracting - Ship and station construction, materials research.

code/modules/examine/examine.dm

@@ -5,7 +5,7 @@
 	This means that this file can be unchecked, along with the other examine files, and can be removed entirely with no effort.
 */
 
-// #define EXAMINE_PANEL_PADDING "               " //CHOMPRemove
+// # define EXAMINE_PANEL_PADDING "               " //CHOMPRemove
 
 /atom/
 	var/description_info = null //Helpful blue text.
@@ -198,3 +198,5 @@
 		results = list("You were unable to examine that. Tell a developer!")
 	to_chat(src, jointext(results, "<br>"))
 	update_examine_panel(B)
+
+// # undef EXAMINE_PANEL_PADDING //CHOMPRemove

code/modules/fireworks/firework_stars.dm

@@ -146,3 +146,5 @@
 		return "You see a [pick(firework_adjectives)] explosion of [current_color] sparks in the sky!"
 	else
 		return "You see a [pick(firework_adjectives)] explosion of [current_color] sparks in the sky, forming into shape of [current_shape]!"
+
+#undef T_FIREWORK_WEATHER_STAR

code/modules/food/drinkingglass/drinkingglass.dm

@@ -1,5 +1,3 @@
-#define DRINK_ICON_FILE 'icons/pdrink.dmi'
-
 /var/const/DRINK_FIZZ = "fizz"
 /var/const/DRINK_ICE = "ice"
 /var/const/DRINK_ICON_DEFAULT = ""

code/modules/food/recipe.dm

@@ -30,14 +30,6 @@
  *
  * */
 
-// Recipe type defines. Used to determine what machine makes them.
-#define MICROWAVE			0x1
-#define FRYER				0x2
-#define OVEN				0x4
-#define GRILL				0x8
-#define CANDYMAKER			0x10
-#define CEREALMAKER			0x20
-
 /datum/recipe
 	var/list/reagents		// Example: = list("berryjuice" = 5) // do not list same reagent twice
 	var/list/items			// Example: = list(/obj/item/weapon/tool/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo
@@ -51,7 +43,6 @@
 	var/result_quantity = 1 // Number of instances of result that are created.
 	var/time = 100			// 1/10 part of second
 
-	#define RECIPE_REAGENT_REPLACE		0 //Reagents in the ingredients are discarded.
 	//Only the reagents present in the result at compiletime are used
 	#define RECIPE_REAGENT_MAX	1 //The result will contain the maximum of each reagent present between the two pools. Compiletime result, and sum of ingredients
 	#define RECIPE_REAGENT_MIN 2 //As above, but the minimum, ignoring zero values.
@@ -332,3 +323,7 @@
 
 
 /datum/recipe/proc/after_cook(obj/container) // Called When the Microwave is finished.
+
+#undef RECIPE_REAGENT_MAX
+#undef RECIPE_REAGENT_MIN
+#undef RECIPE_REAGENT_SUM

code/modules/hydroponics/spreading/spreading.dm

@@ -324,3 +324,6 @@
 
 /obj/effect/plant/proc/is_mature()
 	return (health >= (max_health/3) && world.time > mature_time)
+
+#undef DEFAULT_SEED
+#undef VINE_GROWTH_STAGES

code/modules/integrated_electronics/core/assemblies.dm

@@ -1,6 +1,3 @@
-#define IC_COMPONENTS_BASE		20
-#define IC_COMPLEXITY_BASE		60
-
 // Here is where the base definition lives.
 // Specific subtypes are in their own folder.
 

code/modules/maps/writer.dm

@@ -172,3 +172,10 @@ dmm_suite{
 			}
 		}
 	}
+
+#undef DMM_IGNORE_AREAS
+#undef DMM_IGNORE_TURFS
+#undef DMM_IGNORE_OBJS
+#undef DMM_IGNORE_NPCS
+#undef DMM_IGNORE_PLAYERS
+#undef DMM_IGNORE_MOBS

code/modules/media/mediamanager.dm

@@ -179,3 +179,9 @@
 		targetVolume = M.volume
 		//MP_DEBUG("Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.")
 	push_music(targetURL, targetStartTime, targetVolume)
+
+
+#ifdef DEBUG_MEDIAPLAYER
+#undef DEBUG_MEDIAPLAYER
+#undef MP_DEBUG
+#endif

code/modules/mining/ore_redemption_machine/equipment_vendor.dm

@@ -2,8 +2,6 @@
 // * n — The proper name of the purchasable
 // * o — The object type path of the purchasable to spawn
 // * p — The price of the purchasable in mining points
-#define EQUIPMENT(n, o, p) n = new /datum/data/mining_equipment(n, o, p)
-
 /**********************Mining Equipment Locker**************************/
 
 /obj/machinery/mineral/equipment_vendor

code/modules/modular_computers/file_system/programs/command/comm.dm

@@ -1,8 +1,3 @@
-#define STATE_DEFAULT	1
-#define STATE_MESSAGELIST	2
-#define STATE_VIEWMESSAGE	3
-#define STATE_STATUSDISPLAY	4
-#define STATE_ALERT_LEVEL	5
 /datum/computer_file/program/comm
 	filename = "comm"
 	filedesc = "Command and Communications Program"

code/modules/multiz/stairs.dm

@@ -1,5 +1,3 @@
-#define STAIR_MOVE_DELAY 10 // Animation delay for non-living objects moving up/down stairs
-
 /obj/structure/stairs
 	name = "Stairs"
 	desc = "Stairs leading to another deck.  Not too useful if the gravity goes out."

code/modules/organs/blood.dm

@@ -431,3 +431,5 @@ var/const/CE_STABLE_THRESHOLD = 0.5
 	B.fluorescent  = 0
 	B.invisibility = 0
 	return B
+
+#undef BLOOD_MINIMUM_STOP_PROCESS

code/modules/organs/internal/_organ_internal.dm

@@ -1,5 +1,3 @@
-#define PROCESS_ACCURACY 10
-
 /****************************************************
 				INTERNAL ORGANS DEFINES
 ****************************************************/
@@ -61,4 +59,3 @@
 	if(. >= 3 && antibiotics < ANTIBIO_OD)	//INFECTION_LEVEL_THREE
 		if (prob(50))
 			take_damage(1,silent=prob(15))
-

code/modules/organs/organ_external.dm

@@ -1433,3 +1433,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 			var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
 			if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts))
 				return 1
+
+#undef DROPLIMB_THRESHOLD_EDGE
+#undef DROPLIMB_THRESHOLD_TEAROFF
+#undef DROPLIMB_THRESHOLD_DESTROY

code/modules/organs/organ_internal.dm

@@ -1,5 +1,3 @@
-#define PROCESS_ACCURACY 10
-
 /****************************************************
 				INTERNAL ORGANS DEFINES
 ****************************************************/

code/modules/planet/virgo3c_vr.dm

@@ -726,3 +726,23 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors)
 
 /turf/simulated/floor/outdoors/grass/forest/virgo3c/notrees
 	tree_chance = 0
+
+#undef VIRGO3C_ONE_ATMOSPHERE
+#undef VIRGO3C_AVG_TEMP
+
+#undef VIRGO3C_PER_N2
+#undef VIRGO3C_PER_O2
+#undef VIRGO3C_PER_N2O
+#undef VIRGO3C_PER_CO2
+#undef VIRGO3C_PER_PHORON
+
+#undef VIRGO3C_MOL_PER_TURF
+#undef VIRGO3C_MOL_N2
+#undef VIRGO3C_MOL_O2
+#undef VIRGO3C_MOL_N2O
+#undef VIRGO3C_MOL_CO2
+#undef VIRGO3C_MOL_PHORON
+
+#undef VIRGO3C_SET_ATMOS
+#undef VIRGO3C_TURF_CREATE
+#undef VIRGO3C_TURF_CREATE_UN

code/modules/power/antimatter/computer.dm

@@ -93,3 +93,6 @@
 	user << browse(dat, "window=communications;size=400x500")
 	onclose(user, "communications")
 
+#undef STATE_DEFAULT
+#undef STATE_INJECTOR
+#undef STATE_ENGINE

code/modules/power/apc.dm

@@ -1382,6 +1382,32 @@ GLOBAL_LIST_EMPTY(apcs)
 /obj/machinery/power/apc/get_cell()
 	return cell
 
+#undef CRITICAL_APC_EMP_PROTECTION
+
+#undef UPDATE_CELL_IN
+#undef UPDATE_OPENED1
+#undef UPDATE_OPENED2
+#undef UPDATE_MAINT
+#undef UPDATE_BROKE
+#undef UPDATE_BLUESCREEN
+#undef UPDATE_WIREEXP
+#undef UPDATE_ALLGOOD
+
+#undef APC_UPOVERLAY_CHARGEING0
+#undef APC_UPOVERLAY_CHARGEING1
+#undef APC_UPOVERLAY_CHARGEING2
+#undef APC_UPOVERLAY_EQUIPMENT0
+#undef APC_UPOVERLAY_EQUIPMENT1
+#undef APC_UPOVERLAY_EQUIPMENT2
+#undef APC_UPOVERLAY_LIGHTING0
+#undef APC_UPOVERLAY_LIGHTING1
+#undef APC_UPOVERLAY_LIGHTING2
+#undef APC_UPOVERLAY_ENVIRON0
+#undef APC_UPOVERLAY_ENVIRON1
+#undef APC_UPOVERLAY_ENVIRON2
+#undef APC_UPOVERLAY_LOCKED
+#undef APC_UPOVERLAY_OPERATING
+
 #undef APC_UPDATE_ICON_COOLDOWN
 
 #undef APC_EXTERNAL_POWER_NOTCONNECTED
@@ -1391,3 +1417,12 @@ GLOBAL_LIST_EMPTY(apcs)
 #undef APC_HAS_ELECTRONICS_NONE
 #undef APC_HAS_ELECTRONICS_WIRED
 #undef APC_HAS_ELECTRONICS_SECURED
+
+#undef POWERCHAN_OFF
+#undef POWERCHAN_OFF_AUTO
+#undef POWERCHAN_ON
+#undef POWERCHAN_ON_AUTO
+
+#undef NIGHTSHIFT_AUTO
+#undef NIGHTSHIFT_NEVER
+#undef NIGHTSHIFT_ALWAYS

code/modules/power/batteryrack.dm

@@ -320,3 +320,10 @@
 			RefreshParts()
 			update_maxcharge()
 			return TRUE
+
+#undef PSU_OFFLINE
+#undef PSU_OUTPUT
+#undef PSU_INPUT
+#undef PSU_AUTO
+
+#undef PSU_MAXCELLS

code/modules/power/cable.dm

@@ -998,3 +998,5 @@ var/list/possible_cable_coil_colours = list(
 	else
 		..()
 	return
+
+#undef MAXCOIL

code/modules/power/fusion/core/core_field.dm

@@ -684,5 +684,6 @@
 	return
 
 #undef FUSION_HEAT_CAP
+#undef FUSION_ENERGY_PER_K
 #undef FUSION_MAX_ENVIRO_HEAT
 #undef PLASMA_TEMP_RADIATION_DIVISIOR

code/modules/power/fusion/magpower.dm

@@ -71,3 +71,6 @@
 		if (FF.plasma_temperature <= MINIMUM_PLASMA_TEMPERATURE)
 			icon_state = "mag_trap0"
 	return
+
+#undef ENERGY_PER_K
+#undef MINIMUM_PLASMA_TEMPERATURE

code/modules/power/lighting.dm

@@ -4,10 +4,6 @@
 
 
 // status values shared between lighting fixtures and items
-#define LIGHT_OK 0
-#define LIGHT_EMPTY 1
-#define LIGHT_BROKEN 2
-#define LIGHT_BURNED 3
 #define LIGHT_BULB_TEMPERATURE 400 //K - used value for a 60W bulb
 #define LIGHTING_POWER_FACTOR 2		//5W per luminosity * range		//VOREStation Edit: why the fuck are lights eating so much power, 2W per thing
 #define LIGHT_EMERGENCY_POWER_USE 0.2 //How much power emergency lights will consume per tick
@@ -1198,3 +1194,7 @@ var/global/list/light_type_cache = list()
 	icon = 'icons/obj/lighting.dmi'
 	icon_state = "lampshade"
 	w_class = ITEMSIZE_TINY
+
+#undef LIGHT_BULB_TEMPERATURE
+#undef LIGHTING_POWER_FACTOR
+#undef LIGHT_EMERGENCY_POWER_USE

code/modules/power/port_gen.dm

@@ -417,3 +417,7 @@
 	//no special effects, but the explosion is pretty big (same as a supermatter shard).
 	explosion(src.loc, 3, 6, 12, 16, 1)
 	qdel(src)
+
+
+#undef TEMPERATURE_DIVISOR
+#undef TEMPERATURE_CHANGE_MAX

code/modules/power/singularity/act.dm

@@ -1,5 +1,3 @@
-#define I_SINGULO "singulo"
-
 /atom/proc/singularity_act()
 	return
 

code/modules/power/singularity/emitter.dm

@@ -1,5 +1,3 @@
-#define EMITTER_DAMAGE_POWER_TRANSFER 450 //used to transfer power to containment field generators
-
 /obj/machinery/power/emitter
 	name = "emitter"
 	desc = "It is a heavy duty industrial laser."

code/modules/power/singularity/particle_accelerator/particle_smasher.dm

@@ -417,3 +417,6 @@
 	required_atmos_temp_min = 400
 	required_atmos_temp_max = 20000
 	probability = 20
+
+#undef PS_RESULT_STACK
+#undef PS_RESULT_ITEM

code/modules/power/smes.dm

@@ -3,8 +3,8 @@
 
 GLOBAL_LIST_EMPTY(smeses)
 
-#define SMESMAXCHARGELEVEL 250000
-#define SMESMAXOUTPUT 250000
+//# define SMESMAXCHARGELEVEL 250000 Unused
+//# define SMESMAXOUTPUT 250000 Unused
 
 /obj/machinery/power/smes
 	name = "power storage unit"

code/modules/power/solar.dm

@@ -1,4 +1,4 @@
-//#define SOLAR_MAX_DIST 40		//VOREStation Removal
+//# define SOLAR_MAX_DIST 40		//VOREStation Removal
 #define SOLAR_AUTO_START_NO     0 // Will never start itself.
 #define SOLAR_AUTO_START_YES    1 // Will always start itself.
 #define SOLAR_AUTO_START_CONFIG 2 // Will start itself if config allows it (default is no).
@@ -552,3 +552,7 @@ GLOBAL_LIST_EMPTY(solars_list)
 /obj/item/weapon/paper/solar
 	name = "paper- 'Going green! Setup your own solar array instructions.'"
 	info = "<h1>Welcome</h1><p>At greencorps we love the environment, and space. With this package you are able to help mother nature and produce energy without any usage of fossil fuel or phoron! Singularity energy is dangerous while solar energy is safe, which is why it's better. Now here is how you setup your own solar array.</p><p>You can make a solar panel by wrenching the solar assembly onto a cable node. Adding a glass panel, reinforced or regular glass will do, will finish the construction of your solar panel. It is that easy!</p><p>Now after setting up 19 more of these solar panels you will want to create a solar tracker to keep track of our mother nature's gift, the SSsun.sun. These are the same steps as before except you insert the tracker equipment circuit into the assembly before performing the final step of adding the glass. You now have a tracker! Now the last step is to add a computer to calculate the SSsun.sun's movements and to send commands to the solar panels to change direction with the SSsun.sun. Setting up the solar computer is the same as setting up any computer, so you should have no trouble in doing that. You do need to put a wire node under the computer, and the wire needs to be connected to the tracker.</p><p>Congratulations, you should have a working solar array. If you are having trouble, here are some tips. Make sure all solar equipment are on a cable node, even the computer. You can always deconstruct your creations if you make a mistake.</p><p>That's all to it, be safe, be green!</p>"
+
+#undef SOLAR_AUTO_START_NO
+#undef SOLAR_AUTO_START_YES
+#undef SOLAR_AUTO_START_CONFIG

code/modules/power/supermatter/supermatter.dm

@@ -665,6 +665,12 @@
 			candidate_alarm.critwarn = FALSE // Tell the fire alarm we're done, too. Yes this is janky, someone will come along and fix it later:tm:
 // CHOMPEdit End
 
+#undef POWER_FACTOR
+#undef DECAY_FACTOR
+#undef CRITICAL_TEMPERATURE
+#undef CHARGING_FACTOR
+#undef DAMAGE_RATE_LIMIT
+
 #undef NITROGEN_RETARDATION_FACTOR
 #undef THERMAL_RELEASE_MODIFIER
 #undef PHORON_RELEASE_MODIFIER

code/modules/power/tesla/energy_ball.dm

@@ -314,3 +314,6 @@
 		if (EB.energy > 0)
 			EB.energy -= min(EB.energy, max(10, round(EB.energy * 0.05)))
 	// VOREStation Edit End
+
+#undef TESLA_DEFAULT_POWER
+#undef TESLA_MINI_POWER

code/modules/projectiles/ammunition.dm

@@ -93,11 +93,6 @@
 	if (!BB)
 		. += "This one is spent."
 
-//Gun loading types
-#define SINGLE_CASING 	1	//The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
-#define SPEEDLOADER 	2	//Transfers casings from the mag to the gun when used.
-#define MAGAZINE 		4	//The magazine item itself goes inside the gun
-
 //An item that holds casings and can be used to put them inside guns
 /obj/item/ammo_magazine
 	name = "magazine"

code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm

@@ -30,6 +30,10 @@
 	if(environment.temperature > HEATMODE_TEMP - 30)
 		. = TRUE
 
+#undef LAVALAND_EQUIPMENT_EFFECT_PRESSURE
+#undef HEATMODE_ATMOSPHERE
+#undef HEATMODE_TEMP
+
 /proc/offsite_environment_check(turf/simulated/T)
 	. = TRUE
 	if(!istype(T))
@@ -343,7 +347,6 @@
 	var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf)
 	K.color = color
 
-
 //Modkits
 /obj/item/borg/upgrade/modkit
 	name = "kinetic accelerator modification kit"
@@ -726,3 +729,7 @@
 
 /obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user)
 	bolt_color = input(user,"","Choose Color",bolt_color) as color|null
+
+#undef KA_ENVIRO_TYPE_COLD
+#undef KA_ENVIRO_TYPE_HOT
+#undef KA_ENVIRO_TYPE_OFFSITE

code/modules/projectiles/guns/magnetic/bore.dm

@@ -270,3 +270,8 @@
 /obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded
 	cell = /obj/item/weapon/cell/apc
 	capacitor = /obj/item/weapon/stock_parts/capacitor
+
+#undef GEN_STARTING
+#undef GEN_OFF
+#undef GEN_IDLE
+#undef GEN_ACTIVE

code/modules/projectiles/guns/projectile.dm

@@ -1,7 +1,3 @@
-#define HOLD_CASINGS	0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour
-#define EJECT_CASINGS	1 //drop spent casings on the ground after firing
-#define CYCLE_CASINGS 	2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns
-
 /obj/item/weapon/gun/projectile
 	name = "gun"
 	desc = "A gun that fires bullets."

code/modules/projectiles/projectile.dm

@@ -864,3 +864,6 @@
 		if(silenced)
 			volume = 5
 		playsound(A, hitsound_wall, volume, 1, -1)
+
+#undef MOVES_HITSCAN
+#undef MUZZLE_EFFECT_PIXEL_INCREMENT

code/modules/random_map/automata/automata.dm

@@ -1,4 +1,3 @@
-#define CELL_ALIVE(VAL) (VAL == cell_live_value)
 #define KILL_CELL(CELL, NEXT_MAP) NEXT_MAP[CELL] = cell_dead_value;
 #define REVIVE_CELL(CELL, NEXT_MAP) NEXT_MAP[CELL] = cell_live_value;
 

code/modules/random_map/drop/droppod.dm

@@ -226,3 +226,9 @@
 		return
 
 	new /datum/random_map/droppod(null, usr.x-1, usr.y-1, usr.z, supplied_drops = spawned_mobs, automated = automatic_pod)
+
+#undef SD_FLOOR_TILE
+#undef SD_WALL_TILE
+#undef SD_DOOR_TILE
+#undef SD_EMPTY_TILE
+#undef SD_SUPPLY_TILE

code/modules/reagents/machinery/dispenser/_defines.dm

@@ -4,4 +4,4 @@
 
 // Chemistry dispenser starts with 21
 // ERT dispenser starts with 28
-// #define DISPENSER_MAX_CARTRIDGES 30 //CHOMPRemove
+// #define DISPENSER_MAX_CARTRIDGES 30 //changed to var

code/modules/reagents/machinery/dispenser/dispenser2.dm

@@ -29,7 +29,7 @@
 
 /obj/machinery/chemical_dispenser/examine(mob/user)
 	. = ..()
-	. += "It has [cartridges.len] cartridges installed, and has space for [max_catriges - cartridges.len] more." //CHOMPEdit
+	. += "It has [cartridges.len] cartridges installed, and has space for [max_catriges - cartridges.len] more."
 
 /obj/machinery/chemical_dispenser/verb/rotate_clockwise()
 	set name = "Rotate Dispenser Clockwise"
@@ -48,7 +48,7 @@
 			to_chat(user, "<span class='warning'>\The [C] will not fit in \the [src]!</span>")
 		return
 
-	if(cartridges.len >= max_catriges) //CHOMPEdit
+	if(cartridges.len >= max_catriges)
 		if(user)
 			to_chat(user, "<span class='warning'>\The [src] does not have any slots open for \the [C] to fit into!</span>")
 		return

code/modules/recycling/conveyor2.dm

@@ -196,6 +196,10 @@
 	if((. = ..()))
 		update()
 
+#undef OFF
+#undef FORWARDS
+#undef BACKWARDS
+
 // the conveyor control switch
 //
 //

code/modules/recycling/disposal.dm

@@ -1671,3 +1671,7 @@
 		dirs = alldirs.Copy()
 
 	src.streak(dirs)
+
+#undef SEND_PRESSURE
+#undef PRESSURE_TANK_VOLUME
+#undef PUMP_MAX_FLOW_RATE

code/modules/scripting/Interpreter/Interpreter.dm

@@ -307,3 +307,6 @@ S     - The scope the variable resides in. If it is null, a scope with the varia
 	//TODO: check for invalid name
 	S.variables["[name]"] = value
 
+#undef RETURNING
+#undef BREAKING
+#undef CONTINUING

code/modules/scripting/Parser/Expressions.dm

@@ -308,3 +308,8 @@ See Also:
 */
 /n_Parser/nS_Parser/proc/ParseParamExpression()
 	return ParseExpression(list(",", ")"))
+
+#undef OPERATOR
+#undef VALUE
+#undef SHIFT
+#undef REDUCE

code/modules/scripting/Scanner/Scanner.dm

@@ -271,3 +271,4 @@ Reads a comment and outputs the type of comment
 		if(comm == 2)
 			errors+=new/scriptError/UnterminatedComment()
 
+#undef COL

code/modules/stockmarket/events.dm

@@ -231,3 +231,5 @@
 		article += "[tname] has a prior history of similar misdeeds and we're confident the charges will stand. For investors, now would be an ideal time to %sell%"
 	A.article = A.detokenize(article, company.industry.tokens)
 	return A
+
+#undef TIME_MULTIPLIER

code/modules/tgui/modules/admin/player_notes.dm

@@ -329,3 +329,5 @@
 			if("filter")
 				PlayerNotesFilterLegacy()
 		return
+
+#undef PLAYER_NOTES_ENTRIES_PER_PAGE

code/modules/tgui/modules/communications.dm

@@ -489,3 +489,14 @@
 		if(M.stat == 0)
 			return 1
 	return 0
+
+#undef COMM_SCREEN_MAIN
+#undef COMM_SCREEN_STAT
+#undef COMM_SCREEN_MESSAGES
+
+#undef COMM_AUTHENTICATION_NONE
+#undef COMM_AUTHENTICATION_MIN
+#undef COMM_AUTHENTICATION_MAX
+
+#undef COMM_MSGLEN_MINIMUM
+#undef COMM_CCMSGLEN_MINIMUM

code/modules/tgui/modules/rcon.dm

@@ -140,3 +140,5 @@
 /datum/tgui_module/rcon/robot
 /datum/tgui_module/rcon/robot/tgui_state(mob/user)
 	return GLOB.tgui_self_state
+
+#undef SMES_PER_PAGE

code/modules/xenobio2/mob/slime/slime life.dm

@@ -53,3 +53,6 @@ Slime specific life events go here.
 		return 0 //Everything worked okay
 
 	return 	//xeno/Life() returned 0.
+
+#undef HAPPYLEVEL
+#undef ANGRYLEVEL

code/modules/xenobio2/mob/slime/slime procs.dm

@@ -126,3 +126,7 @@ Slime specific procs go here.
 		GenerateChild()
 	else
 		GenerateAdult()
+
+#undef SHINYOVERLAY
+#undef LIGHTOVERLAY
+#undef MAXOVERLAY

vorestation.dme

@@ -33,8 +33,10 @@
 #include "code\__defines\admin.dm"
 #include "code\__defines\admin_ch.dm"
 #include "code\__defines\admin_vr.dm"
+#include "code\__defines\ammunition.dm"
 #include "code\__defines\appearance.dm"
 #include "code\__defines\assert.dm"
+#include "code\__defines\assemblies.dm"
 #include "code\__defines\atmos.dm"
 #include "code\__defines\atoms_movable.dm"
 #include "code\__defines\belly_modes_ch.dm"
@@ -46,12 +48,16 @@
 #include "code\__defines\color.dm"
 #include "code\__defines\color_priority.dm"
 #include "code\__defines\configuration_ch.dm"
+#include "code\__defines\construction_datum.dm"
 #include "code\__defines\construction.dm"
 #include "code\__defines\cooldowns.dm"
 #include "code\__defines\crafting.dm"
+#include "code\__defines\events.dm"
+#include "code\__defines\equipment_vendor.dm"
 #include "code\__defines\damage_organs.dm"
 #include "code\__defines\database.dm"
 #include "code\__defines\dna.dm"
+#include "code\__defines\economy_misc.dm"
 #include "code\__defines\exosuit_fab.dm"
 #include "code\__defines\flags.dm"
 #include "code\__defines\gamemode.dm"
@@ -78,12 +84,15 @@
 #include "code\__defines\misc_ch.dm"
 #include "code\__defines\misc_vr.dm"
 #include "code\__defines\mobs.dm"
+#include "code\__defines\organ_internal.dm"
+#include "code\__defines\observer.dm"
 #include "code\__defines\mobs_vr.dm"
 #include "code\__defines\mobs_yw.dm"
 #include "code\__defines\nifsoft.dm"
 #include "code\__defines\objects.dm"
 #include "code\__defines\overlay_ch.dm"
 #include "code\__defines\overmap.dm"
+#include "code\__defines\power.dm"
 #include "code\__defines\pda.dm"
 #include "code\__defines\planets.dm"
 #include "code\__defines\planets_vr.dm"
@@ -91,8 +100,11 @@
 #include "code\__defines\preferences.dm"
 #include "code\__defines\process_scheduler.dm"
 #include "code\__defines\procpath.dm"
+#include "code\__defines\projectile.dm"
 #include "code\__defines\projectiles.dm"
 #include "code\__defines\qdel.dm"
+#include "code\__defines\recipe.dm"
+#include "code\__defines\robot.dm"
 #include "code\__defines\research.dm"
 #include "code\__defines\roguemining_vr.dm"
 #include "code\__defines\rust_g.dm"
@@ -2601,7 +2613,6 @@
 #include "code\modules\food\kitchen\smartfridge\service.dm"
 #include "code\modules\food\kitchen\smartfridge\smartfridge.dm"
 #include "code\modules\food\kitchen\smartfridge\smartfridge_vr.dm"
-#include "code\modules\gamemaster\defines.dm"
 #include "code\modules\gamemaster\event2\event.dm"
 #include "code\modules\gamemaster\event2\meta.dm"
 #include "code\modules\gamemaster\event2\events\ghost_pod_spawner.dm"
@@ -2811,7 +2822,6 @@
 #include "code\modules\keybindings\setup.dm"
 #include "code\modules\library\lib_items.dm"
 #include "code\modules\library\lib_machines.dm"
-#include "code\modules\library\lib_readme.dm"
 #include "code\modules\library\hardcode_library\_library.dm"
 #include "code\modules\library\hardcode_library\fiction\APsychonaut.dm"
 #include "code\modules\library\hardcode_library\fiction\battlefieldcommander.dm"