Merge remote-tracking branch 'upstream/master' into air-injector-link-fix

This commit is contained in:
SteelSlayer
2020-10-17 11:38:41 -05:00
210 changed files with 8872 additions and 10310 deletions
@@ -93,7 +93,7 @@
else
vent_icon += "[on ? "[pump_direction ? "out" : "in"]" : "off"]"
overlays += GLOB.pipe_icon_manager.get_atmos_icon("device", , , vent_icon)
overlays += SSair.icon_manager.get_atmos_icon("device", , , vent_icon)
/obj/machinery/atmospherics/binary/dp_vent_pump/update_underlays()
if(..())