Deletes a bunch of unused atmos stuff and code. (#18)

* Update atmospherics.dm * hmm * Update area.dm * Update species.dm * hmm * Update fire_alarm.dm * Update MaintMode.tsx * hm * space flag + DEFINES * Update debuffs.dm * pressure icon * Delete generic_old.dmi * Update generic.dmi * toxin_icon * Update _mecha.dm Signed-off-by: Helg2 <[email protected]> * 123 * Revert "123" This reverts commit bdb4b9a. --------- Signed-off-by: Helg2 <[email protected]>
PMC-Unga-Marines · Jul 17, 2024 · cd13fa6 · cd13fa6
1 parent 64fee7b
commit cd13fa6
Show file tree

Hide file tree

Showing 70 changed files with 56 additions and 1,369 deletions.
diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -8540,9 +8540,7 @@
 /area/mainship/medical/lower_medical)
 "hot" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Oxygen Supply Console";
-	output_tag = "oxyvent";
-	sensors = list("oxy_sensor"="Tank")
+	name = "Oxygen Supply Console"
 	},
 /turf/open/floor/mainship/floor,
 /area/mainship/engineering/starboard_atmos)
@@ -20993,10 +20991,7 @@
 /area/mainship/squads/general)
 "rrK" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "mix_in";
-	name = "Mixed Air Control";
-	output_tag = "mix_out";
-	sensors = list("mix_sensor"="Tank")
+	name = "Mixed Air Control"
 	},
 /turf/open/floor/mainship/floor,
 /area/mainship/engineering/starboard_atmos)
@@ -26876,9 +26871,7 @@
 /area/mainship/command/corporateliaison)
 "wzb" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Nitrogen Control Console";
-	output_tag = "nit_out";
-	sensors = list("nit_sensor"="Tank")
+	name = "Nitrogen Control Console"
 	},
 /turf/open/floor/mainship/floor,
 /area/mainship/engineering/starboard_atmos)

diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
@@ -11793,10 +11793,7 @@
 /area/mainship/command/self_destruct)
 "oYv" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1443;
-	name = "Lower Nitrogen Control Console";
-	output_tag = "nit_lower_out";
-	sensors = list("nit_sensor"="Tank")
+	name = "Lower Nitrogen Control Console"
 	},
 /turf/open/floor/mainship/mono,
 /area/mainship/engineering/port_atmos)
@@ -14821,10 +14818,7 @@
 /area/mainship/medical/chemistry)
 "sGA" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1443;
-	name = "Lower Oxygen Supply Console";
-	output_tag = "oxygen_lower_out";
-	sensors = list("oxy_sensor"="Tank")
+	name = "Lower Oxygen Supply Console"
 	},
 /turf/open/floor/mainship/mono,
 /area/mainship/engineering/port_atmos)
@@ -15132,11 +15126,7 @@
 /area/mainship/living/grunt_rnr)
 "tfK" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1443;
-	input_tag = "mix_lower_in";
-	name = "Lower Mixed Air Control";
-	output_tag = "mix_lower_out";
-	sensors = list("mix_sensor"="Tank")
+	name = "Lower Mixed Air Control"
 	},
 /obj/machinery/light/mainship{
 	dir = 1
@@ -18223,11 +18213,7 @@
 /area/mainship/hallways/stern_hallway)
 "wUx" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	frequency = 1443;
-	input_tag = "waste_lower_in";
-	name = "Lower Deck Waste Tank Control";
-	output_tag = "waste_lower_out";
-	sensors = list("waste_sensor"="Tank")
+	name = "Lower Deck Waste Tank Control"
 	},
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
 	dir = 1

diff --git a/_maps/map_files/Sulaco/TGS_Sulaco.dmm b/_maps/map_files/Sulaco/TGS_Sulaco.dmm
@@ -1567,10 +1567,7 @@
 /area/sulaco/engineering/atmos)
 "afZ" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "waste_in";
-	name = "Waste Tank Control";
-	output_tag = "waste_out";
-	sensors = list("waste_sensor"="Tank")
+	name = "Waste Tank Control"
 	},
 /turf/open/floor/prison/yellow{
 	dir = 4
@@ -1666,9 +1663,7 @@
 	dir = 1
 	},
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Oxygen Supply Console";
-	output_tag = "oxyvent";
-	sensors = list("oxy_sensor"="Tank")
+	name = "Oxygen Supply Console"
 	},
 /turf/open/floor/prison/yellow{
 	dir = 1
@@ -1728,10 +1723,7 @@
 /area/sulaco/engineering/atmos)
 "aih" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "mix_in";
-	name = "Mixed Air Control";
-	output_tag = "mix_out";
-	sensors = list("mix_sensor"="Tank")
+	name = "Mixed Air Control"
 	},
 /obj/machinery/light/mainship{
 	dir = 1
@@ -1742,9 +1734,7 @@
 /area/sulaco/engineering/atmos)
 "aii" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Nitrogen Control Console";
-	output_tag = "nit_out";
-	sensors = list("nit_sensor"="Tank")
+	name = "Nitrogen Control Console"
 	},
 /turf/open/floor/prison/yellow{
 	dir = 1
@@ -4296,10 +4286,7 @@
 /area/sulaco/engineering/engine_monitoring)
 "awf" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "cooling_in";
-	name = "Core Cooling";
-	output_tag = "cooling_out";
-	sensors = list("core_sensor"="Tank")
+	name = "Core Cooling"
 	},
 /turf/open/floor/prison/darkyellow/corner,
 /area/sulaco/engineering/engine_monitoring)

diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm
@@ -440,10 +440,7 @@
 /area/mainship/hull/starboard_hull)
 "abK" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "waste_lower_in";
-	name = "Lower Deck Waste Tank Control";
-	output_tag = "waste_lower_out";
-	sensors = list("waste_sensor"="Tank")
+	name = "Lower Deck Waste Tank Control"
 	},
 /turf/open/floor/mainship/orange,
 /area/mainship/hull/starboard_hull)
@@ -716,9 +713,7 @@
 "acF" = (
 /obj/machinery/air_alarm,
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Lower Oxygen Supply Console";
-	output_tag = "oxygen_lower_out";
-	sensors = list("oxy_sensor"="Tank")
+	name = "Lower Oxygen Supply Console"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
 	dir = 4
@@ -732,9 +727,7 @@
 	dir = 1
 	},
 /obj/machinery/computer/general_air_control/large_tank_control{
-	name = "Lower Nitrogen Control Console";
-	output_tag = "nit_lower_out";
-	sensors = list("nit_sensor"="Tank")
+	name = "Lower Nitrogen Control Console"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
 	dir = 4
@@ -754,10 +747,7 @@
 /area/mainship/hull/port_hull)
 "acJ" = (
 /obj/machinery/computer/general_air_control/large_tank_control{
-	input_tag = "mix_lower_in";
-	name = "Lower Mixed Air Control";
-	output_tag = "mix_lower_out";
-	sensors = list("mix_sensor"="Tank")
+	name = "Lower Mixed Air Control"
 	},
 /turf/open/floor/mainship/orange{
 	dir = 5

diff --git a/_maps/map_files/deltastation/deltastation.dmm b/_maps/map_files/deltastation/deltastation.dmm
@@ -95001,7 +95001,7 @@
 /turf/closed/wall,
 /area/deltastation/maintenance/port)
 "tpg" = (
-/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse{
+/obj/machinery/atmospherics/components/trinary/mixer/airmix{
 	dir = 1
 	},
 /obj/effect/decal/cleanable/dirt,
@@ -102328,7 +102328,7 @@
 /area/deltastation/cargo/sorting)
 "uMn" = (
 /obj/effect/turf_decal/tile/transparent/neutral/fourcorners,
-/obj/machinery/atmospherics/components/trinary/mixer/airmix/inverse,
+/obj/machinery/atmospherics/components/trinary/mixer/airmix,
 /obj/effect/turf_decal/warning_stripes/box/empty,
 /turf/open/floor/iron,
 /area/deltastation/engineering/atmos)

diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm
@@ -1,11 +1,4 @@
-
-// Pressure limits.
-#define HAZARD_HIGH_PRESSURE 550	//This determins at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant)
-#define WARNING_HIGH_PRESSURE 325 	//This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE)
-#define WARNING_LOW_PRESSURE 50 	//This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE)
-#define HAZARD_LOW_PRESSURE 20		//This is when the black ultra-low pressure icon is displayed. (This one is set as a constant)
-
-#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5	//This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount.
+#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5	//This is used in reagents that affect body temperature. Temperature damage is multiplied by this amount.
 
 #define BODYTEMP_NORMAL 310.15		//The natural temperature for a body
 #define BODYTEMP_AUTORECOVERY_DIVISOR 20 //This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive.
@@ -23,64 +16,17 @@
 #define BODYTEMP_COLD_DAMAGE_LIMIT_TWO 240.15
 #define BODYTEMP_COLD_DAMAGE_LIMIT_THREE 120.15
 
-#define PRESSURE_DAMAGE_COEFFICIENT 4 ///The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE
-#define MAX_HIGH_PRESSURE_DAMAGE 4	///Maximum amount of damage someone can take from being in a too-high pressure area
-#define LOW_PRESSURE_DAMAGE 2 	///The amounb of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value).
-
-
-#define R_IDEAL_GAS_EQUATION 8.31 //kPa*L/(K*mol)
-#define ONE_ATMOSPHERE 101.325	//kPa
-#define IDEAL_GAS_ENTROPY_CONSTANT 1164	//(mol^3 * s^3) / (kg^3 * L). Equal to (4*pi/(avrogadro's number * planck's constant)^2)^(3/2) / (avrogadro's number * 1000 Liters per m^3).
-
-
-#define CELL_VOLUME 2500	//liters in a cell
-#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))	//moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC
-
-#define O2STANDARD 0.21
-#define N2STANDARD 0.79
-
-
-#define MIN_TOXIN_DAMAGE 1	//This and MAX_TOXIN_DAMAGE are for when a mob breathes poisonous air
-#define MAX_TOXIN_DAMAGE 10	//This and MIN_TOXIN_DAMAGE are for when a mob breathes poisonous air
-
-#define SPEED_OF_LIGHT 3e8 //not exact but hey!
-#define SPEED_OF_LIGHT_SQ 9e+16
-#define FIRE_DAMAGE_MODIFIER 0.0215 //Higher values result in more external fire damage to the skin (default 0.0215)
-#define AIR_DAMAGE_MODIFIER 2.025 //More means less damage from hot air scalding lungs, less = more damage. (default 2.025)
-
 #define T0C 273.15					// 0degC
 #define T20C 293.15					// 20degC
 #define TCMB 2.7					// -270.3degC
 #define ICE_COLONY_TEMPERATURE 255.15	//-18degC
 
-#define GAS_TYPE_AIR "air"
-#define GAS_TYPE_OXYGEN "oxygen"
-#define GAS_TYPE_NITROGEN "nitrogen"
-#define GAS_TYPE_N2O "anesthetic"
-#define GAS_TYPE_PHORON "phoron"
-#define GAS_TYPE_CO2 "carbon dioxyde"
-
-#define RADIATION_SPEED_COEFFICIENT 0.1
-
-//PIPES
-//Atmos pipe limits
-#define MAX_OUTPUT_PRESSURE 4500 // (kPa) What pressure pumps and powered equipment max out at.
-#define MAX_TRANSFER_RATE 200 // (L/s) Maximum speed powered equipment can work at.
-
 //used for device_type vars
 #define UNARY 1
 #define BINARY 2
 #define TRINARY 3
 #define QUATERNARY 4
 
-
-//HEAT TRANSFER COEFFICIENTS
-//Must be between 0 and 1. Values closer to 1 equalize temperature faster
-//Should not exceed 0.4 else strange heat flow occur
-#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0
-#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4
-#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1		//a hack for now
-
 //MULTIPIPES
 //IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH.
 #define PIPING_LAYER_MIN 1

diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -731,7 +731,6 @@
 #define COMSIG_KB_SELFHARM "keybind_selfharm"
 
 // mecha keybinds
-#define COMSIG_MECHABILITY_TOGGLE_INTERNALS "mechability_toggle_internals"
 #define COMSIG_MECHABILITY_TOGGLE_STRAFE "mechability_toggle_strafe"
 #define COMSIG_MECHABILITY_VIEW_STATS "mechability_view_stats"
 #define COMSIG_MECHABILITY_SMOKE "mechability_smoke"

diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
@@ -126,9 +126,7 @@
 //HELMET AND MASK======================================================================================
 
 //SUITS AND HELMETS====================================================================================
-//To successfully stop taking all pressure damage you must have both a suit and head item with this flag.
 #define BLOCKSHARPOBJ (1<<6)  //From /tg: prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
-#define NOPRESSUREDMAGE (1<<7) //This flag is used on the flags variable for SUIT and HEAD items which stop pressure damage.
 
 #define NOQUICKEQUIP (1<<8) // Prevents the item from being handled via quick-equip hotkeys. Can still manipulate the inventory and be inserted into the slot from the hand, however.
 

diff --git a/code/__DEFINES/mecha.dm b/code/__DEFINES/mecha.dm
@@ -1,8 +1,6 @@
 #define MECHA_INT_FIRE (1<<0)
-#define MECHA_INT_TEMP_CONTROL (1<<1)
-#define MECHA_INT_SHORT_CIRCUIT (1<<2)
-#define MECHA_INT_TANK_BREACH (1<<3)
-#define MECHA_INT_CONTROL_LOST (1<<4)
+#define MECHA_INT_SHORT_CIRCUIT (1<<1)
+#define MECHA_INT_CONTROL_LOST (1<<2)
 
 #define ADDING_ACCESS_POSSIBLE (1<<0)
 #define ADDING_MAINT_ACCESS_POSSIBLE (1<<1)

diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm
@@ -1,27 +1,6 @@
 // Doors!
 #define DOOR_CRUSH_DAMAGE 10
 
-/*
-	Atmos Machinery
-*/
-#define MAX_SIPHON_FLOWRATE 2500	//L/s	This can be used to balance how fast a room is siphoned. Anything higher than CELL_VOLUME has no effect.
-#define MAX_SCRUBBER_FLOWRATE 200		//L/s	Max flow rate when scrubbing from a turf.
-
-//These balance how easy or hard it is to create huge pressure gradients with pumps and filters. Lower values means it takes longer to create large pressures differences.
-//Has no effect on pumping gasses from high pressure to low, only from low to high. Must be between 0 and 1.
-#define ATMOS_PUMP_EFFICIENCY 2.5
-#define ATMOS_FILTER_EFFICIENCY 2.5
-
-//will not bother pumping or filtering if the gas source as fewer than this amount of moles, to help with performance.
-#define MINUMUM_MOLES_TO_PUMP 0.01
-#define MINUMUM_MOLES_TO_FILTER 0.1
-
-//The flow rate/effectiveness of various atmos devices is limited by their internal volume, so for many atmos devices these will control maximum flow rates in L/s
-#define ATMOS_DEFAULT_VOLUME_PUMP 200	//L
-#define ATMOS_DEFAULT_VOLUME_FILTER 200	//L
-#define ATMOS_DEFAULT_VOLUME_MIXER 200	//L
-#define ATMOS_DEFAULT_VOLUME_PIPE 70	//L
-
 // bitflags for machine stat variable
 #define BROKEN (1<<0)
 #define NOPOWER (1<<1)
@@ -56,7 +35,6 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
 	"NUKE"
 	))
 
-
 // Diagonal movement for movable atoms
 #define FIRST_DIAG_STEP 1
 #define SECOND_DIAG_STEP 2
@@ -68,14 +46,12 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
 #define SHUTTLE_COOLING_FACTOR_RECHARGE 0.5
 #define SHUTTLE_FUEL_ENHANCE_FACTOR_TRAVEL 0.75
 
-
 //sharp item defines
 #define IS_NOT_SHARP_ITEM 0
 #define IS_SHARP_ITEM_SIMPLE 1 //not easily usable to cut or slice. e.g. shard, wirecutters, spear
 #define IS_SHARP_ITEM_ACCURATE 2 //knife, scalpel
 #define IS_SHARP_ITEM_BIG 3 //fireaxe, hatchet, energy sword
 
-
 //pry capable item defines
 #define IS_PRY_CAPABLE_SIMPLE 1
 #define IS_PRY_CAPABLE_CROWBAR 2 //actual crowbar
@@ -152,13 +128,11 @@ GLOBAL_LIST_INIT(restricted_camera_networks, list( //Those networks can only be
 #define SCOPE_RAIL_MINI 0.2
 #define SCOPE_RAIL_SNIPER 0.5
 
-
 //Hypospray
 
 #define HYPOSPRAY_INJECT_MODE_DRAW 0
 #define HYPOSPRAY_INJECT_MODE_INJECT 1
 
-
 //Lighter
 
 #define LIGHTER_LUMINOSITY 2

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -208,7 +208,6 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"COVERMOUTH" = COVERMOUTH,
 		"BLOCKGASEFFECT" = BLOCKGASEFFECT,
 		"BLOCKSHARPOBJ" = BLOCKSHARPOBJ,
-		"NOPRESSUREDMAGE" = NOPRESSUREDMAGE,
 		"NOQUICKEQUIP" = NOQUICKEQUIP
 	),
 	"flags_armor_features" = list(