shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update pump.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-16 20:52:33 -05:00
committed by GitHub
parent 2987fadd2e
commit 35c80edc7a
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/portable/pump.dm
-3
View File
@@ -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)