Merge pull request #14723 from bunny232/delta-ce-office-update

Delta ce office rearrangement
This commit is contained in:
Lin
2021-06-02 19:41:45 -05:00
committed by GitHub

View File

@@ -72141,24 +72141,6 @@
/obj/machinery/atmospherics/pipe/simple/general/visible,
/turf/open/floor/plasteel,
/area/engineering/atmos)
"exg" = (
/obj/structure/chair/office/light{
dir = 8
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
/area/command/heads_quarters/ce)
"exo" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -79857,20 +79839,6 @@
},
/turf/open/floor/plasteel/dark,
/area/service/library)
"hkJ" = (
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
/area/command/heads_quarters/ce)
"hkK" = (
/obj/structure/table/reinforced,
/obj/item/electronics/firelock,
@@ -86455,6 +86423,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -91661,6 +91632,9 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/cable/white{
icon_state = "4-8"
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"laA" = (
@@ -92991,9 +92965,6 @@
/area/engineering/break_room)
"lCx" = (
/obj/structure/table/reinforced,
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/item/clipboard,
/obj/item/toy/figure/ce,
/obj/effect/turf_decal/tile/neutral{
@@ -93526,9 +93497,6 @@
/area/service/abandoned_gambling_den)
"lLv" = (
/obj/structure/table/reinforced,
/obj/structure/cable/white{
icon_state = "2-4"
},
/obj/item/folder/blue{
pixel_x = 3;
pixel_y = 3
@@ -94394,9 +94362,6 @@
/obj/item/gps/engineering{
gpstag = "CE0"
},
/obj/machinery/newscaster{
pixel_y = 32
},
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -94410,6 +94375,15 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/power/apc{
areastring = "/area/command/heads_quarters/ce";
dir = 1;
name = "Chief Engineer's APC";
pixel_y = 30
},
/obj/structure/cable/white{
icon_state = "0-2"
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"mcu" = (
@@ -109351,25 +109325,6 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/service/hydroponics)
"rts" = (
/obj/structure/cable/white,
/obj/machinery/power/apc{
areastring = "/area/command/heads_quarters/ce";
name = "Chief Engineer's APC";
pixel_y = -26
},
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"rtx" = (
/obj/structure/table/wood,
/obj/item/storage/briefcase{
@@ -116201,6 +116156,19 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/engineering/storage/tech)
"tGF" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/structure/cable/white{
icon_state = "1-4"
},
/turf/open/floor/plasteel,
/area/command/heads_quarters/ce)
"tGL" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -117812,9 +117780,6 @@
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/structure/cable/white{
icon_state = "1-8"
},
/obj/machinery/light{
dir = 4
},
@@ -117829,6 +117794,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"uiv" = (
@@ -121250,9 +121219,6 @@
/area/service/chapel/office)
"vBq" = (
/obj/structure/table/reinforced,
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/item/cartridge/engineering{
pixel_x = 6
},
@@ -122264,6 +122230,22 @@
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/service/abandoned_gambling_den)
"vXq" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/firealarm{
pixel_y = -28
},
/turf/open/floor/plasteel/dark,
/area/command/heads_quarters/ce)
"vXw" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -124083,10 +124065,6 @@
/obj/item/cartridge/atmos,
/obj/item/cartridge/atmos,
/obj/item/cartridge/atmos,
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/obj/item/stamp/ce,
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -151712,13 +151690,13 @@ mMB
pRP
kkO
mcs
mHG
tGF
xKr
lLv
lCx
vBq
hkJ
rts
ikP
vXq
qjg
ine
vJe
@@ -151971,7 +151949,7 @@ kkO
nZq
jpC
ivQ
exg
tbI
tbI
ilG
hbc
@@ -152485,7 +152463,7 @@ kkO
jKf
prr
qPW
xSN
kkO
sSa
jry
pTd