mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
Merge pull request #4468 from CHOMPStation2/upstream-merge-13231
[MIRROR] Moves scrubber on westwilds2 version of sci outpost
This commit is contained in:
@@ -13,6 +13,23 @@
|
||||
/obj/item/weapon/tool/wrench,
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/groundbase/science/outpost/toxins_mixing)
|
||||
"ab" = (
|
||||
/obj/machinery/artifact_scanpad,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"ac" = (
|
||||
/obj/machinery/artifact_analyser,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"ad" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_x = 30
|
||||
},
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"am" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/visible/blue{
|
||||
dir = 9
|
||||
@@ -438,11 +455,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"gg" = (
|
||||
/obj/machinery/artifact_scanpad,
|
||||
/obj/machinery/atmospherics/unary/vent_scrubber/on,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"gi" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/machinery/computer/atmoscontrol/laptop{
|
||||
@@ -958,11 +970,6 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/groundbase/science/outpost/toxins_lab)
|
||||
"lq" = (
|
||||
/obj/machinery/artifact_analyser,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"lw" = (
|
||||
/obj/structure/cable/green{
|
||||
icon_state = "1-2"
|
||||
@@ -2667,15 +2674,6 @@
|
||||
/obj/machinery/atmospherics/portables_connector,
|
||||
/turf/simulated/floor,
|
||||
/area/groundbase/science/outpost/atmos)
|
||||
"DN" = (
|
||||
/obj/structure/table/standard,
|
||||
/obj/item/device/flashlight/lamp,
|
||||
/obj/machinery/vending/wallmed1{
|
||||
pixel_x = 30
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/turf/simulated/floor/tiled/dark,
|
||||
/area/groundbase/science/outpost/anomaly_lab)
|
||||
"DP" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible/supply,
|
||||
/obj/machinery/meter,
|
||||
@@ -18599,9 +18597,9 @@ MY
|
||||
qy
|
||||
Sh
|
||||
mh
|
||||
gg
|
||||
lq
|
||||
DN
|
||||
ab
|
||||
ac
|
||||
ad
|
||||
bp
|
||||
hm
|
||||
qg
|
||||
|
||||
Reference in New Issue
Block a user