Merge branch 'master' into upstream-merge-31077

2017-09-29 12:46:25 -04:00
parent c80237c969 7d31aa7538
commit e8f581bb56
99 changed files with 1533 additions and 766 deletions
@@ -177,7 +177,7 @@
 		if("pressure")
 			var/pressure = params["pressure"]
 			if(pressure == "reset")
-				pressure = TANK_DEFAULT_RELEASE_PRESSURE
+				pressure = initial(distribute_pressure)
 				. = TRUE
 			else if(pressure == "min")
 				pressure = TANK_MIN_RELEASE_PRESSURE