Remove duplicate macros (#4683)

code/ATMOSPHERICS/components/binary_devices/circulator.dm

@@ -1,8 +1,6 @@
 //node1, air1, network1 correspond to input
 //node2, air2, network2 correspond to output
 
-#define ADIABATIC_EXPONENT 0.667 //Actually adiabatic exponent - 1.
-
 /obj/machinery/atmospherics/binary/circulator
 	name = "circulator"
 	desc = "A gas circulator turbine and heat exchanger."

code/ATMOSPHERICS/components/binary_devices/pipeturbine.dm

@@ -1,5 +1,3 @@
-#define ADIABATIC_EXPONENT 0.667 //Actually adiabatic exponent - 1.
-
 /obj/machinery/atmospherics/pipeturbine
 	name = "turbine"
 	desc = "A gas turbine. Converting pressure into energy since 1884."

code/__defines/_macros.dm

@@ -1,4 +1,4 @@
-#define Clamp(x, y, z) 	(x <= y ? y : (x >= z ? z : x))
+#define Clamp(x, low, high) 	max(low, min(high, x))
 #define CLAMP01(x) 		(Clamp(x, 0, 1))
 
 #define span(class, text) ("<span class='[class]'>[text]</span>")

code/__defines/atmos.dm

@@ -95,3 +95,5 @@
 #define ATMOSTANK_CO2           25000 // CO2 and PH are not critically important for station, only for toxins and alternative coolants, no need to store a lot of those.
 #define ATMOSTANK_PHORON        25000
 #define ATMOSTANK_NITROUSOXIDE  10000 // N2O doesn't have a real useful use, i guess it's on station just to allow refilling of sec's riot control canisters?
+
+#define ADIABATIC_EXPONENT 0.667 //Actually adiabatic exponent - 1.

code/__defines/gamemode.dm

@@ -26,6 +26,7 @@
 #define ANTAG_RANDSPAWN         0x100 // Potentially randomly spawns due to events.
 #define ANTAG_VOTABLE           0x200 // Can be voted as an additional antagonist before roundstart.
 #define ANTAG_SET_APPEARANCE    0x400 // Causes antagonists to use an appearance modifier on spawn.
+#define ANTAG_RANDOM_EXCEPTED   0x800 // If a game mode randomly selects antag types, antag types with this flag should be excluded.
 
 // Mode/antag template macros.
 #define MODE_BORER "borer"
@@ -45,7 +46,6 @@
 #define MODE_MONKEY "monkey"
 #define MODE_RENEGADE "renegade"
 #define MODE_REVOLUTIONARY "revolutionary"
-#define MODE_LOYALIST "loyalist"
 #define MODE_MALFUNCTION "malf"
 #define MODE_TRAITOR "traitor"
 #define MODE_VAMPIRE "vampire"

code/__defines/math_physics.dm

@@ -19,7 +19,6 @@
 #define T20C 293.15 //   20.0 degrees celcius
 #define TCMB 2.7    // -270.3 degrees celcius
 
-#define CLAMP01(x) max(0, min(1, x))
 #define QUANTIZE(variable) (round(variable,0.0001))
 
 #define INFINITY	1.#INF

code/__defines/misc.dm

@@ -250,11 +250,6 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 #define CAPTURE_MODE_ALL 1 //Admin camera mode
 #define CAPTURE_MODE_PARTIAL 3 //Simular to regular mode, but does not do dummy check
 
-//Sound effects toggles
-#define ASFX_AMBIENCE	1
-#define ASFX_FOOTSTEPS	2
-#define ASFX_VOTE		4
-
 //Cargo random stock vars
 //These are used in randomstock.dm
 //And also for generating random loot crates in crates.dm

code/__defines/mobs.dm

@@ -100,9 +100,7 @@
 #define INV_R_HAND_DEF_ICON 'icons/mob/items/righthand.dmi'
 #define INV_W_UNIFORM_DEF_ICON 'icons/mob/uniform.dmi'
 #define INV_ACCESSORIES_DEF_ICON 'icons/mob/ties.dmi'
-#define INV_SUIT_DEF_ICON 'icons/mob/ties.dmi'
 #define INV_SUIT_DEF_ICON 'icons/mob/suit.dmi'
-#define MAX_SUPPLIED_LAW_NUMBER 50
 
 // NT's alignment towards the character
 #define COMPANY_LOYAL 			"Loyal"

code/_onclick/hud/parallax.dm

@@ -259,6 +259,7 @@
 	LAZYCLEARLIST(parallax)
 	LAZYCLEARLIST(parallax_movable)
 
+#undef GRID_WIDTH
 #undef PARALLAX4_ICON_NUMBER
 #undef PARALLAX3_ICON_NUMBER
 #undef PARALLAX2_ICON_NUMBER

code/controllers/subsystems/supply.dm

@@ -1,6 +1,6 @@
 //Config stuff
-#define SUPPLY_DOCKZ 2          //Z-level of the Dock.
-#define SUPPLY_STATIONZ 1       //Z-level of the Station.
+#define SUPPLY_DOCKZ 1          //Z-level of the Dock.
+#define SUPPLY_STATIONZ 6       //Z-level of the Station.
 #define SUPPLY_STATION_AREATYPE /area/supply/station //Type of the supply shuttle area for station
 #define SUPPLY_DOCK_AREATYPE /area/supply/dock	//Type of the supply shuttle area for dock
 
@@ -257,7 +257,7 @@ var/datum/controller/subsystem/cargo/SScargo
 				cargoconfig["items"][item]["access"],
 				cargoconfig["items"][item]["container_type"],
 				cargoconfig["items"][item]["groupable"],
-				cargoconfig["items"][item]["item_mul"])	
+				cargoconfig["items"][item]["item_mul"])
 		catch(var/exception/ei)
 			log_debug("SScargo: Error when loading supplier: [ei]")
 	return 1
@@ -292,7 +292,7 @@ var/datum/controller/subsystem/cargo/SScargo
 
 //Add a new item to the cargo subsystem, the categories and the items need to be a list and CAN NOT be passed as a json string.
 //Decoding of the string MUST take place before
-/datum/controller/subsystem/cargo/proc/add_item(var/id=null,var/name,var/supplier="nt",var/description,var/list/categories,var/price,var/list/items,var/access=0,var/container_type=CARGO_CONTAINER_CRATE,var/groupable=1,var/item_mul=1)	
+/datum/controller/subsystem/cargo/proc/add_item(var/id=null,var/name,var/supplier="nt",var/description,var/list/categories,var/price,var/list/items,var/access=0,var/container_type=CARGO_CONTAINER_CRATE,var/groupable=1,var/item_mul=1)
 	//TODO-CARGO: Maybe add the option to specify access as string instead of number
 
 	//If no item ID is supplied generate one ourselfs (use the next free id)
@@ -303,7 +303,7 @@ var/datum/controller/subsystem/cargo/SScargo
 		id = text2num(id)
 		if(id > last_item_id)
 			last_item_id = id
-	
+
 	var/datum/cargo_item/ci = new()
 	try
 		ci.id = id
@@ -322,7 +322,7 @@ var/datum/controller/subsystem/cargo/SScargo
 		log_debug("SScargo: Error when loading item: [e]")
 		qdel(ci)
 		return
-	
+
 	for(var/item in ci.items)
 		var/itempath = text2path(ci.items[item]["path"])
 		if(!ispath(itempath))
@@ -341,7 +341,7 @@ var/datum/controller/subsystem/cargo/SScargo
 		log_debug("SScargo: [ci.supplier] is not a valid supplier for item [ci.name].")
 		QDEL_NULL(ci)
 		return
-	
+
 	//Setting the supplier
 	ci.supplier_datum = cs
 
@@ -362,7 +362,7 @@ var/datum/controller/subsystem/cargo/SScargo
 			cc.items.Add(ci)
 		else
 			log_debug("SScargo: Warning - Attempted to add [ci.name] item to category [category] that does not exist.")
-	
+
 	return ci
 
 /*

code/datums/wires/vending.dm

@@ -45,7 +45,7 @@ var/const/VENDING_WIRE_IDSCAN = 8
 		if(VENDING_WIRE_THROW)
 			V.shoot_inventory = !mended
 		if(VENDING_WIRE_CONTRABAND)
-			V.categories &= ~CAT_HIDDEN  
+			V.categories &= ~CAT_HIDDEN
 		if(VENDING_WIRE_ELECTRIFY)
 			if(mended)
 				V.seconds_electrified = 0

code/game/antagonist/_antagonist_setup.dm

@@ -14,20 +14,6 @@
    - To skip equipping with appropriate gear, supply a positive third argument.
 */
 
-// Antagonist datum flags.
-#define ANTAG_OVERRIDE_JOB        1 // Assigned job is set to MODE when spawning.
-#define ANTAG_OVERRIDE_MOB        2 // Mob is recreated from datum mob_type var when spawning.
-#define ANTAG_CLEAR_EQUIPMENT     4 // All preexisting equipment is purged.
-#define ANTAG_CHOOSE_NAME         8 // Antagonists are prompted to enter a name.
-#define ANTAG_IMPLANT_IMMUNE     16 // Cannot be loyalty implanted.
-#define ANTAG_SUSPICIOUS         32 // Shows up on roundstart report.
-#define ANTAG_HAS_LEADER         64 // Generates a leader antagonist.
-#define ANTAG_HAS_NUKE          128 // Will spawn a nuke at supplied location.
-#define ANTAG_RANDSPAWN         256 // Potentially randomly spawns due to events.
-#define ANTAG_VOTABLE           512 // Can be voted as an additional antagonist before roundstart.
-#define ANTAG_SET_APPEARANCE   1024 // Causes antagonists to use an appearance modifier on spawn.
-#define ANTAG_RANDOM_EXCEPTED  2048 // If a game mode randomly selects antag types, antag types with this flag should be excluded.
-
 // Globals.
 var/global/list/all_antag_types = list()
 var/global/list/all_antag_spawnpoints = list()

code/game/dna/dna2.dm

@@ -58,10 +58,6 @@ var/global/list/datum/dna/gene/dna_genes[0]
 // Used for genes that check for value rather than a binary on/off.
 #define GENE_ALWAYS_ACTIVATE 1
 
-// Skip checking if it's already active.
-// Used for genes that check for value rather than a binary on/off.
-#define GENE_ALWAYS_ACTIVATE 1
-
 /datum/dna
 	// READ-ONLY, GETS OVERWRITTEN
 	// DO NOT FUCK WITH THESE OR BYOND WILL EAT YOUR FACE

code/game/machinery/pipe/construction.dm

@@ -208,101 +208,101 @@ Buildable meters
 /obj/item/pipe/proc/update()
 	var/list/nlist = list(
 		"pipe",
-		"bent pipe", 
+		"bent pipe",
 		"h/e pipe",
 		"bent h/e pipe",
 		"connector",
-		"manifold", 
-		"junction", 
-		"uvent", 
-		"mvalve", 
-		"pump", 
-		"scrubber", 
-		"insulated pipe", 
-		"bent insulated pipe", 
-		"gas filter", 
-		"gas mixer", 
-		"pressure regulator", 
-		"high power pump", 
-		"heat exchanger", 
-		"t-valve", 
-		"4-way manifold", 
-		"pipe cap", 
+		"manifold",
+		"junction",
+		"uvent",
+		"mvalve",
+		"pump",
+		"scrubber",
+		"insulated pipe",
+		"bent insulated pipe",
+		"gas filter",
+		"gas mixer",
+		"pressure regulator",
+		"high power pump",
+		"heat exchanger",
+		"t-valve",
+		"4-way manifold",
+		"pipe cap",
 ///// Z-Level stuff
-		"pipe up", 
-		"pipe down", 
+		"pipe up",
+		"pipe down",
 ///// Z-Level stuff
-		"gas filter m", 
-		"gas mixer t", 
-		"gas mixer m", 
-		"omni mixer", 
-		"omni filter", 
+		"gas filter m",
+		"gas mixer t",
+		"gas mixer m",
+		"omni mixer",
+		"omni filter",
 ///// Supply and scrubbers pipes
-		"universal pipe adapter", 
-		"supply pipe", 
-		"bent supply pipe", 
-		"scrubbers pipe", 
-		"bent scrubbers pipe", 
-		"supply manifold", 
-		"scrubbers manifold", 
-		"supply 4-way manifold", 
-		"scrubbers 4-way manifold", 
-		"supply pipe up", 
-		"scrubbers pipe up", 
-		"supply pipe down", 
-		"scrubbers pipe down", 
-		"supply pipe cap", 
-		"scrubbers pipe cap", 
+		"universal pipe adapter",
+		"supply pipe",
+		"bent supply pipe",
+		"scrubbers pipe",
+		"bent scrubbers pipe",
+		"supply manifold",
+		"scrubbers manifold",
+		"supply 4-way manifold",
+		"scrubbers 4-way manifold",
+		"supply pipe up",
+		"scrubbers pipe up",
+		"supply pipe down",
+		"scrubbers pipe down",
+		"supply pipe cap",
+		"scrubbers pipe cap",
 		"t-valve m"
 	)
 	name = nlist[pipe_type+1] + " fitting"
-	var/list/islist = list( 
-		"simple", 
-		"simple", 
-		"he", 
-		"he", 
-		"connector", 
-		"manifold", 
-		"junction", 
-		"uvent", 
-		"mvalve", 
-		"pump", 
-		"scrubber", 
-		"insulated", 
-		"insulated", 
-		"filter", 
-		"mixer", 
-		"passivegate", 
-		"volumepump", 
-		"heunary", 
-		"mtvalve", 
-		"manifold4w", 
-		"cap", 
+	var/list/islist = list(
+		"simple",
+		"simple",
+		"he",
+		"he",
+		"connector",
+		"manifold",
+		"junction",
+		"uvent",
+		"mvalve",
+		"pump",
+		"scrubber",
+		"insulated",
+		"insulated",
+		"filter",
+		"mixer",
+		"passivegate",
+		"volumepump",
+		"heunary",
+		"mtvalve",
+		"manifold4w",
+		"cap",
 ///// Z-Level stuff
-		"cap", 
-		"cap", 
+		"cap",
+		"cap",
 ///// Z-Level stuff
-		"m_filter", 
-		"t_mixer", 
-		"m_mixer", 
-		"omni_mixer", 
-		"omni_filter", 
+		"m_filter",
+		"t_mixer",
+		"m_mixer",
+		"omni_mixer",
+		"omni_filter",
 ///// Supply and scrubbers pipes
-		"universal", 
-		"simple", 
-		"simple", 
-		"simple", 
-		"simple", 
-		"manifold", 
-		"manifold", 
-		"manifold4w", 
-		"manifold4w", 
-		"cap", 
-		"cap", 
-		"cap", 
-		"cap", 
-		"cap", 
-		"cap", 
+		"universal",
+		"simple",
+		"simple",
+		"simple",
+		"simple",
+		"manifold",
+		"manifold",
+		"manifold4w",
+		"manifold4w",
+		"cap",
+		"cap",
+		"cap",
+		"cap",
+		"cap",
+		"cap",
 		"mtvalvem"
 	)
 	icon_state = islist[pipe_type + 1]
@@ -359,16 +359,16 @@ Buildable meters
 	var/acw = turn(dir, 90)
 
 	switch(pipe_type)
-		if(	PIPE_SIMPLE_STRAIGHT, 
+		if(	PIPE_SIMPLE_STRAIGHT,
 			PIPE_INSULATED_STRAIGHT,
-			PIPE_HE_STRAIGHT, 
+			PIPE_HE_STRAIGHT,
 			PIPE_JUNCTION ,
 			PIPE_PUMP ,
 			PIPE_VOLUME_PUMP ,
 			PIPE_PASSIVE_GATE ,
-			PIPE_MVALVE, 
-			PIPE_SUPPLY_STRAIGHT, 
-			PIPE_SCRUBBERS_STRAIGHT, 
+			PIPE_MVALVE,
+			PIPE_SUPPLY_STRAIGHT,
+			PIPE_SCRUBBERS_STRAIGHT,
 			PIPE_UNIVERSAL
 		)
 			return dir|flip
@@ -457,7 +457,7 @@ Buildable meters
 				else
 					user << "<span class='warning'>You can not change this pipe!</span>"
 					return
-		
+
 			else if(pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SIMPLE_BENT, PIPE_SCRUBBERS_STRAIGHT, PIPE_SCRUBBERS_BENT, PIPE_SUPPLY_BENT, PIPE_SUPPLY_STRAIGHT))
 				if(pipe_type in list(PIPE_SIMPLE_BENT, PIPE_SIMPLE_STRAIGHT))
 					if(PIPE_SIMPLE_BENT)
@@ -475,7 +475,7 @@ Buildable meters
 					else
 						pipe_type = PIPE_SIMPLE_STRAIGHT
 			update()
-	
+
 	if (!isturf(src.loc))
 		return 1
 	if (pipe_type in list (PIPE_SIMPLE_STRAIGHT, PIPE_SUPPLY_STRAIGHT, PIPE_SCRUBBERS_STRAIGHT, PIPE_HE_STRAIGHT, PIPE_INSULATED_STRAIGHT, PIPE_MVALVE))
@@ -1234,7 +1234,6 @@ Buildable meters
 #undef PIPE_GAS_MIXER
 #undef PIPE_PASSIVE_GATE
 #undef PIPE_VOLUME_PUMP
-#undef PIPE_OUTLET_INJECT
 #undef PIPE_MTVALVE
 #undef PIPE_MTVALVEM
 #undef PIPE_GAS_FILTER_M

code/game/machinery/status_display.dm

@@ -238,8 +238,7 @@
 			mode = STATUS_DISPLAY_TIME
 	update()
 
-#undef CHARS_PER_LINE
-#undef FOND_SIZE
+#undef FONT_SIZE
 #undef FONT_COLOR
 #undef FONT_STYLE
 #undef SCROLL_SPEED

code/game/supplyshuttle.dm

@@ -1,9 +1,4 @@
 //Config stuff
-#define SUPPLY_DOCKZ 3         //Z-level of the Dock.
-#define SUPPLY_STATIONZ 1       //Z-level of the Station.
-#define SUPPLY_STATION_AREATYPE /area/supply/station //Type of the supply shuttle area for station
-#define SUPPLY_DOCK_AREATYPE /area/supply/dock	//Type of the supply shuttle area for dock
-
 //Supply packs are in /code/defines/obj/supplypacks.dm
 //Computers are in /code/game/machinery/computer/supply.dm