Merge remote-tracking branch 'upstream/master' into SMC

# Conflicts:
#	code/__DEFINES/flags.dm
This commit is contained in:
tigercat2000
2018-03-22 15:35:12 -07:00
280 changed files with 6565 additions and 2171 deletions
@@ -1,7 +1,6 @@
#define EXTERNAL_PRESSURE_BOUND ONE_ATMOSPHERE
#define INTERNAL_PRESSURE_BOUND 0
#define PRESSURE_CHECKS 1
#undefine
/obj/machinery/atmospherics/unary/vent_pump
icon = 'icons/atmos/vent_pump.dmi'