Merge pull request #595 from CHOMPStationBot/upstream-merge-9186

[MIRROR] Fixes double chair
This commit is contained in:
Razgriz
2020-10-15 22:38:30 -07:00
committed by GitHub
+11 -12
View File
@@ -11494,6 +11494,16 @@
},
/turf/simulated/floor/water/pool,
/area/tether/surfacebase/surface_one_hall)
"atm" = (
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"atn" = (
/obj/machinery/status_display{
pixel_x = 32;
@@ -17310,17 +17320,6 @@
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"aIs" = (
/obj/structure/bed/chair/wood,
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/turf/simulated/floor/lino,
/area/crew_quarters/visitor_dining)
"aIt" = (
/obj/structure/bed/chair/wood,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -46106,7 +46105,7 @@ aEK
aEK
aEK
aDu
aIs
atm
aCQ
aJV
aDu