From 2987fadd2e690ae32ceecc3929797a91195ababd Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 16 Oct 2017 22:50:41 -0200 Subject: [PATCH 1/3] lowers portable pump max pressure to 25 atm --- code/modules/atmospherics/machinery/portable/pump.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 0cddd5cb4f..040b1714a1 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,6 +1,10 @@ #define PUMP_OUT "out" #define PUMP_IN "in" +<<<<<<< HEAD #define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 10) +======= +#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25) +>>>>>>> 0ff5e9d... Merge pull request #31775 from duncathan/atmos-patch11 #define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) #define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE) From 35c80edc7a3aecc1b59fa552d4c41324a523340d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 16 Oct 2017 20:52:33 -0500 Subject: [PATCH 2/3] Update pump.dm --- code/modules/atmospherics/machinery/portable/pump.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 040b1714a1..388e957c08 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,10 +1,7 @@ #define PUMP_OUT "out" #define PUMP_IN "in" <<<<<<< HEAD -#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 10) -======= #define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25) ->>>>>>> 0ff5e9d... Merge pull request #31775 from duncathan/atmos-patch11 #define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) #define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE) From a07871c9de49b6d423f9a96183be88f7401b3e0e Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 17 Oct 2017 07:46:18 -0500 Subject: [PATCH 3/3] Update pump.dm --- code/modules/atmospherics/machinery/portable/pump.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 388e957c08..3f2bceaa04 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -1,6 +1,5 @@ #define PUMP_OUT "out" #define PUMP_IN "in" -<<<<<<< HEAD #define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25) #define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10) #define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)