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

# Conflicts:
#	code/__DEFINES/flags.dm

code/ATMOSPHERICS/atmospherics.dm

@@ -32,6 +32,8 @@ Pipelines + Other Objects -> Pipe network
 	var/global/datum/pipe_icon_manager/icon_manager
 
 /obj/machinery/atmospherics/New()
+	if(!armor)
+		armor = list(melee = 25, bullet = 10, laser = 10, energy = 100, bomb = 0, bio = 100, rad = 100)
 	..()
 	SSair.atmos_machinery += src
 	if(!icon_manager)

code/ATMOSPHERICS/components/unary_devices/vent_pump.dm

@@ -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'