Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685

2020-04-25 17:09:34 +02:00
parent fecf6cef2f 24971060bd
commit 94f014589d
342 changed files with 5021 additions and 2930 deletions
@@ -204,7 +204,7 @@
 				pressure = text2num(pressure)
 				. = TRUE
 			if(.)
-				distribute_pressure = CLAMP(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
+				distribute_pressure = clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)

 /obj/item/tank/remove_air(amount)
 	return air_contents.remove(amount)