From 2987fadd2e690ae32ceecc3929797a91195ababd Mon Sep 17 00:00:00 2001 From: Leo Date: Mon, 16 Oct 2017 22:50:41 -0200 Subject: [PATCH] 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)