From ff39c3dbfd3cb86ec97f547e1da9a1b306ae6a0e Mon Sep 17 00:00:00 2001 From: mikomyazaki Date: Mon, 21 Feb 2022 02:01:28 +0000 Subject: [PATCH] Reverts atmos pipe volume & pressure changes. --- .../components/binary_devices/passive_gate.dm | 2 +- code/ATMOSPHERICS/components/binary_devices/pump.dm | 2 +- code/__defines/machinery.dm | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 635014e20d6..e7005e81956 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -14,7 +14,7 @@ interact_offline = 1 var/unlocked = 0 //If 0, then the valve is locked closed, otherwise it is open(-able, it's a one-way valve so it closes if gas would flow backwards). var/target_pressure = ONE_ATMOSPHERE - var/max_pressure_setting = ATMOS_DEFAULT_MAX_PRESSURE //kPa + var/max_pressure_setting = ATMOS_PUMP_MAX_PRESSURE //kPa var/set_flow_rate = ATMOS_DEFAULT_VOLUME_PUMP * 2.5 var/regulate_mode = REGULATE_OUTPUT diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 24ca270d1f8..a300684aa52 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -28,7 +28,7 @@ Thus, the two variables affect pump operation are set in New(): idle_power_usage = 150 //internal circuitry, friction losses and stuff power_rating = 7500 //7500 W ~ 10 HP - var/max_pressure_setting = ATMOS_DEFAULT_MAX_PRESSURE //kPa + var/max_pressure_setting = ATMOS_PUMP_MAX_PRESSURE //kPa var/frequency = 0 var/id = null diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index a02487a39f5..168318c00e7 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -95,6 +95,8 @@ var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret #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. +#define ATMOS_PUMP_MAX_PRESSURE 15000 + // 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. @@ -110,12 +112,12 @@ var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret #define ATMOS_DEFAULT_VOLUME_PUMP 200 // Liters. #define ATMOS_DEFAULT_VOLUME_FILTER 200 // L. #define ATMOS_DEFAULT_VOLUME_MIXER 200 // L. -#define ATMOS_DEFAULT_VOLUME_PIPE 7 // L. +#define ATMOS_DEFAULT_VOLUME_PIPE 70 // L. #define ATMOS_DEFAULT_VOLUME_HE_PIPE 70 // L. // Default maximum pressure for simple pipes -#define ATMOS_DEFAULT_MAX_PRESSURE 50*ONE_ATMOSPHERE -#define ATMOS_DEFAULT_FATIGUE_PRESSURE 40*ONE_ATMOSPHERE +#define ATMOS_DEFAULT_MAX_PRESSURE 70*ONE_ATMOSPHERE +#define ATMOS_DEFAULT_FATIGUE_PRESSURE 55*ONE_ATMOSPHERE #define ATMOS_DEFAULT_ALERT_PRESSURE ATMOS_DEFAULT_FATIGUE_PRESSURE // Misc process flags.