Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27503

2017-05-24 08:11:07 -05:00
parent 01cd2039e5 a78624e196
commit 006c74c6ae
105 changed files with 2783 additions and 2423 deletions
@@ -19,7 +19,7 @@
 /obj/machinery/meter/Initialize(mapload)
 	. = ..()
 	SSair.atmos_machinery += src
-	if (mapload && !target)
+	if (!target)
 		target = locate(/obj/machinery/atmospherics/pipe) in loc

 /obj/machinery/meter/Destroy()