Merge pull request #3608 from Citadel-Station-13/upstream-merge-32082

[MIRROR] Fixes pipe runtime
This commit is contained in:
LetterJay
2017-10-26 14:21:07 -04:00
committed by GitHub
+8 -10
View File
@@ -39983,7 +39983,9 @@
/turf/open/floor/engine, /turf/open/floor/engine,
/area/science/misc_lab) /area/science/misc_lab)
"bTm" = ( "bTm" = (
/obj/machinery/atmospherics/pipe/simple/general/visible, /obj/machinery/atmospherics/components/trinary/mixer/flipped{
dir = 1
},
/turf/open/floor/engine, /turf/open/floor/engine,
/area/science/misc_lab) /area/science/misc_lab)
"bTn" = ( "bTn" = (
@@ -48489,12 +48491,8 @@
}, },
/area/ai_monitored/security/armory) /area/ai_monitored/security/armory)
"coT" = ( "coT" = (
/obj/item/pipe{ /obj/machinery/atmospherics/pipe/simple/general/visible,
dir = 4; /obj/machinery/meter,
icon_state = "mixer";
name = "gas mixer fitting";
pipe_type = 14
},
/turf/open/floor/engine, /turf/open/floor/engine,
/area/science/misc_lab) /area/science/misc_lab)
"coZ" = ( "coZ" = (
@@ -108055,7 +108053,7 @@ cBE
bOE bOE
bEC bEC
bQV bQV
bSi coT
bTm bTm
bUn bUn
bXr bXr
@@ -108312,8 +108310,8 @@ bNu
bMv bMv
bEC bEC
bQT bQT
bSh bSi
coT bUn
bTl bTl
bXr bXr
bNZ bNZ