Merge pull request #6474 from Heroman3003/mapover

A look over for floor decals and minor adjustments
This commit is contained in:
Novacat
2020-01-21 01:46:30 -05:00
committed by GitHub
7 changed files with 2389 additions and 2110 deletions
File diff suppressed because it is too large Load Diff
+36 -8
View File
@@ -16229,6 +16229,10 @@
/obj/machinery/disposal,
/turf/simulated/floor/plating,
/area/engineering/drone_fabrication)
"aDX" = (
/obj/structure/railing,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"aDY" = (
/obj/structure/railing{
dir = 8
@@ -23012,6 +23016,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/paramed)
"aQx" = (
@@ -23135,6 +23143,7 @@
/obj/effect/floor_decal/corner/paleblue/border{
dir = 5
},
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/lowerhall)
"aQE" = (
@@ -24676,6 +24685,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"aSR" = (
@@ -27807,11 +27820,13 @@
/turf/simulated/floor/carpet/sblucarpet,
/area/bridge/meeting_room)
"aXo" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
/obj/effect/floor_decal/rust,
/obj/structure/railing{
icon_state = "railing0";
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining)
"aXp" = (
/obj/machinery/alarm{
dir = 8;
@@ -28170,11 +28185,24 @@
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"aYg" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
},
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"aYh" = (
/obj/structure/table/woodentable,
/obj/machinery/chemical_dispenser/bar_soft/full,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"aYi" = (
/obj/structure/railing{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/bridge_hallway)
"aYj" = (
/obj/machinery/alarm{
pixel_y = 22
@@ -41886,7 +41914,7 @@ apW
aXL
aob
aXl
aXU
aYi
aYz
apS
avq
@@ -42027,7 +42055,7 @@ apl
aXw
aob
aob
aXo
aYg
aXY
aqy
aob
@@ -42142,7 +42170,7 @@ aab
aac
aaf
aao
aao
aDX
aQa
aRo
aap
@@ -43721,7 +43749,7 @@ acw
aad
aTg
adf
abt
aXo
adY
afu
afM
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+198 -245
View File
@@ -1086,12 +1086,12 @@
d2 = 2;
icon_state = "1-2"
},
/obj/machinery/door/firedoor/glass,
/obj/machinery/door_timer/cell_3{
id = "Cell 2";
name = "Cell 2";
pixel_x = -32
},
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"bK" = (
@@ -2392,7 +2392,9 @@
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 5
},
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/turf/simulated/floor/tiled,
/area/security/security_cell_hallway)
"dt" = (
@@ -3091,20 +3093,17 @@
/area/security/brig)
"ex" = (
/obj/effect/floor_decal/borderfloor{
dir = 8;
icon_state = "borderfloor";
pixel_x = 0
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 8
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
},
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
/area/tether/exploration/hallway)
"ey" = (
/obj/structure/cable/cyan{
d1 = 16;
@@ -3985,19 +3984,21 @@
/turf/simulated/floor/tiled/techfloor,
/area/ai_upload)
"fQ" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/effect/floor_decal/corner/paleblue/border,
/turf/simulated/floor/tiled,
/area/hallway/station/port)
/area/tether/exploration/hallway)
"fR" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -5239,19 +5240,13 @@
/area/engineering/foyer_mezzenine)
"hR" = (
/obj/effect/floor_decal/borderfloor{
dir = 8;
dir = 1;
icon_state = "borderfloor";
pixel_x = 0
pixel_y = 0
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 5
dir = 1
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
@@ -5260,24 +5255,18 @@
/area/tether/exploration/hallway)
"hS" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
dir = 1;
icon_state = "borderfloor";
pixel_y = 0
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"hT" = (
@@ -5791,6 +5780,11 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"iH" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/floor_decal/borderfloor{
dir = 1;
icon_state = "borderfloor";
@@ -5800,13 +5794,10 @@
icon_state = "bordercolor";
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"iI" = (
@@ -5868,23 +5859,15 @@
/area/ai_upload)
"iL" = (
/obj/effect/floor_decal/borderfloor{
dir = 1;
icon_state = "borderfloor";
pixel_y = 0
dir = 5
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 1
dir = 5
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 1
},
/obj/effect/floor_decal/corner/purple/bordercorner2{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
/obj/structure/flora/pottedplant/crystal,
/obj/machinery/camera/network/exploration{
icon_state = "camera";
dir = 9
},
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
@@ -5902,38 +5885,60 @@
/turf/simulated/floor,
/area/maintenance/station/exploration)
"iN" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/purple/bordercorner2{
dir = 9
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"iO" = (
/obj/effect/floor_decal/borderfloor{
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
},
/obj/effect/floor_decal/corner/purple/border{
dir = 5
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 4;
icon_state = "borderfloorcorner2";
pixel_y = 0
},
/obj/effect/floor_decal/corner/purple/bordercorner2{
dir = 5
},
/obj/effect/floor_decal/corner/purple/bordercorner2{
/obj/effect/floor_decal/borderfloor/corner{
dir = 4
},
/obj/structure/flora/pottedplant/crystal,
/obj/machinery/camera/network/exploration{
icon_state = "camera";
dir = 9
/obj/effect/floor_decal/corner/purple/bordercorner{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
@@ -6436,39 +6441,23 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"js" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/purple/bordercorner2{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
/obj/machinery/computer/guestpass{
pixel_y = 32
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
dir = 2
},
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
/area/hallway/station/starboard)
"jt" = (
/obj/structure/cable/green{
d1 = 1;
@@ -8927,23 +8916,12 @@
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
"mY" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/computer/guestpass{
pixel_y = 32
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
@@ -11131,22 +11109,26 @@
/turf/simulated/floor/tiled,
/area/engineering/foyer_mezzenine)
"qy" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
dir = 2
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/station/starboard)
/area/hallway/station/port)
"qz" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
@@ -12444,34 +12426,17 @@
/area/ai_server_room)
"sz" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/machinery/door/firedoor/glass/hidden/steel{
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
/area/hallway/station/port)
"sA" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
@@ -13950,6 +13915,19 @@
"uW" = (
/turf/simulated/wall,
/area/medical/morgue)
"uX" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/steeldecal/steel_decals6,
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"uY" = (
/obj/structure/table/woodentable,
/obj/item/weapon/paper_bin{
@@ -14196,6 +14174,10 @@
dir = 1
},
/obj/machinery/door/firedoor/glass,
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 1
},
/turf/simulated/floor/tiled/monofloor{
dir = 1
},
@@ -15317,6 +15299,14 @@
},
/turf/simulated/floor,
/area/maintenance/station/micro)
"xi" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/corner/paleblue/border,
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"xj" = (
/obj/structure/window/reinforced,
/turf/simulated/floor/tiled/white,
@@ -15451,6 +15441,40 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor,
/area/maintenance/evahallway)
"xs" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 8
},
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"xt" = (
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 4
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/tether/station/stairs_two)
"xu" = (
/obj/structure/bed/chair,
/obj/machinery/power/apc{
@@ -18268,30 +18292,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/patient_c)
"Cl" = (
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/structure/cable/green{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 5
},
/turf/simulated/floor/tiled,
/area/tether/exploration/hallway)
"Cm" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/purple/border,
@@ -20278,31 +20278,6 @@
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"Fo" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8";
pixel_x = 0
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"Fp" = (
/obj/structure/cable{
d1 = 1;
@@ -21513,16 +21488,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/security/recstorage)
"QF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"QG" = (
/obj/structure/railing{
dir = 8
@@ -22234,18 +22199,6 @@
},
/turf/simulated/floor,
/area/security/riot_control)
"Xq" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable{
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/hallway/station/port)
"Xs" = (
/obj/effect/floor_decal/corner/white/border{
dir = 8
@@ -30207,7 +30160,7 @@ pK
qp
re
rS
ex
xs
tf
tI
uo
@@ -30491,7 +30444,7 @@ pL
qr
rh
rU
sz
xt
tJ
uS
EA
@@ -31200,7 +31153,7 @@ pg
hr
qw
rl
QF
sz
VA
ZK
Jq
@@ -31342,7 +31295,7 @@ DO
hr
Fu
Vw
Xq
uX
TO
Do
VK
@@ -32334,9 +32287,9 @@ fq
kj
kj
pO
Fo
qy
fp
fQ
xi
pq
qM
rv
@@ -33606,9 +33559,9 @@ kp
kp
kp
kp
mY
js
nQ
qy
mY
DL
ac
ac
@@ -33739,7 +33692,7 @@ gh
ge
gH
hf
hR
ex
iF
jq
kp
@@ -33881,7 +33834,7 @@ fy
hk
gI
hi
hS
fQ
iG
jr
kp
@@ -34024,8 +33977,8 @@ gg
cZ
cZ
cZ
iH
js
hR
iN
kp
kR
lW
@@ -34876,7 +34829,7 @@ cZ
cZ
cZ
cZ
iL
hS
jK
kt
kt
@@ -35018,7 +34971,7 @@ mf
ns
mB
ic
iN
iH
jM
kt
lH
@@ -35160,8 +35113,8 @@ mw
lP
DP
ea
iL
iO
Cl
ku
Ex
mb
+160 -202
View File
@@ -2819,23 +2819,10 @@
/turf/simulated/floor/tiled/dark,
/area/security/security_lockerroom)
"ew" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
},
/obj/effect/floor_decal/corner/red/border{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/security/hallway)
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
"ex" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -2921,23 +2908,20 @@
/area/security/observation)
"eE" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
dir = 8
},
/obj/effect/floor_decal/corner/red/border{
dir = 4
dir = 8
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 5
},
/obj/machinery/door/firedoor/glass,
/obj/structure/extinguisher_cabinet{
dir = 8;
icon_state = "extinguisher_closed";
pixel_x = 30
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass/hidden/steel,
/turf/simulated/floor/tiled,
/area/security/hallway)
"eF" = (
@@ -3552,24 +3536,28 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"fF" = (
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/obj/effect/floor_decal/corner/red/border{
dir = 4
},
/obj/effect/floor_decal/borderfloor/corner2{
dir = 5
},
/obj/effect/floor_decal/corner/red/bordercorner2{
dir = 5
},
/obj/structure/extinguisher_cabinet{
dir = 8;
icon_state = "extinguisher_closed";
pixel_x = 30
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
/area/security/hallway)
"fG" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 10
@@ -4386,21 +4374,20 @@
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
"he" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/brown/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
/area/hallway/station/upper)
"hf" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 5
@@ -4767,22 +4754,14 @@
/turf/simulated/floor/tiled,
/area/security/eva)
"hO" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/brown/bordercorner2{
dir = 9
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
/obj/effect/floor_decal/corner/brown/border{
dir = 1
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
dir = 2
},
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
@@ -13152,10 +13131,18 @@
/turf/simulated/floor/wood,
/area/hallway/station/upper)
"un" = (
/obj/structure/shuttle/engine/propulsion,
/turf/simulated/floor/reinforced,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/excursion/tether)
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 1
},
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/lightgrey/border,
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"uo" = (
/obj/structure/disposalpipe/segment{
dir = 4;
@@ -13845,24 +13832,19 @@
/turf/simulated/wall,
/area/lawoffice)
"vv" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/brown/border,
/obj/effect/floor_decal/borderfloor/corner2{
dir = 9
},
/obj/effect/floor_decal/corner/brown/bordercorner2{
dir = 9
},
/obj/machinery/door/firedoor/glass/hidden/steel{
dir = 2
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/effect/floor_decal/borderfloor{
dir = 1
},
/obj/effect/floor_decal/corner/lightgrey/border{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals7,
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 4
},
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
/area/quartermaster/foyer)
"vw" = (
/obj/effect/floor_decal/spline/plain{
icon_state = "spline_plain";
@@ -17362,12 +17344,6 @@
"AL" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 9
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"AM" = (
@@ -17393,32 +17369,23 @@
/turf/simulated/floor/tiled,
/area/quartermaster/foyer)
"AP" = (
/obj/machinery/navbeacon/delivery/south{
location = "QM #2"
/obj/machinery/light{
dir = 1
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/secure_closet/cargotech,
/obj/item/weapon/stamp/cargo,
/obj/item/weapon/storage/backpack/dufflebag,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AQ" = (
/obj/machinery/light_switch{
dir = 2;
name = "light switch ";
pixel_x = 0;
pixel_y = 26
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AQ" = (
/obj/machinery/navbeacon/delivery/south{
location = "QM #3"
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_x = 0;
pixel_y = 28
},
/obj/structure/closet/secure_closet/cargotech,
/obj/item/weapon/stamp/cargo,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AR" = (
@@ -17456,14 +17423,23 @@
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AT" = (
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/apc{
dir = 1;
name = "north bump";
pixel_x = 0;
pixel_y = 28
},
/obj/structure/closet/secure_closet/cargotech,
/obj/item/weapon/stamp/cargo,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AU" = (
/obj/structure/closet/secure_closet/cargotech,
/obj/item/weapon/storage/backpack/dufflebag,
/obj/item/weapon/stamp/cargo,
/obj/machinery/camera/network/cargo{
dir = 4
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"AV" = (
@@ -18042,16 +18018,11 @@
/turf/simulated/floor/tiled,
/area/security/eva)
"BL" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "cargo_bay";
layer = 3.3;
name = "cargo bay hatch controller";
pixel_x = 30;
pixel_y = 0;
req_one_access = list(13,31);
tag_door = "cargo_bay_door"
/obj/machinery/camera/network/cargo{
icon_state = "camera";
dir = 8
},
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"BM" = (
@@ -18122,9 +18093,17 @@
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
"BR" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"BS" = (
/obj/structure/table/standard,
/obj/structure/cable/green{
@@ -18572,21 +18551,23 @@
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"CG" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 4;
icon_state = "1-4"
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
id_tag = "cargo_bay";
layer = 3.3;
name = "cargo bay hatch controller";
pixel_x = 30;
pixel_y = 0;
req_one_access = list(13,31);
tag_door = "cargo_bay_door"
},
/obj/structure/disposalpipe/segment{
dir = 1;
icon_state = "pipe-c"
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals4,
/obj/effect/floor_decal/steeldecal/steel_decals4{
dir = 10
},
/turf/simulated/floor/wood,
/area/quartermaster/qm)
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"CH" = (
/obj/machinery/door/airlock/mining{
name = "Quartermaster";
@@ -24958,6 +24939,7 @@
dir = 8;
icon_state = "pipe-c"
},
/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"MB" = (
@@ -26373,12 +26355,13 @@
/turf/simulated/floor/bluegrid,
/area/ai_core_foyer)
"OY" = (
/obj/machinery/camera/network/cargo{
icon_state = "camera";
dir = 8
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station)
"OZ" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -26989,12 +26972,12 @@
/turf/simulated/floor/tiled/white,
/area/crew_quarters/medical_restroom)
"Qg" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/camera/network/cargo{
dir = 4
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station)
"Qh" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/vehicle/train/trolley{
@@ -27097,21 +27080,6 @@
/turf/simulated/floor/tiled/white,
/area/medical/virology)
"Qp" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station)
"Qq" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station)
"Qr" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_r"
@@ -28000,16 +27968,6 @@
},
/turf/simulated/floor/carpet,
/area/security/breakroom)
"SD" = (
/obj/machinery/navbeacon/delivery/south{
location = "QM #1"
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled,
/area/quartermaster/storage)
"SE" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -35877,7 +35835,7 @@ ga
lz
ej
fm
ew
eE
lz
lz
Kr
@@ -36019,7 +35977,7 @@ lb
lA
eo
jl
eE
fF
nN
nN
fe
@@ -39330,11 +39288,11 @@ MK
Iy
ab
NL
OY
Qg
Qg
Qg
Qp
Qq
Qq
Qq
Qr
NL
vt
vt
@@ -40557,7 +40515,7 @@ Zy
WG
dj
XA
un
ew
ms
Oz
be
@@ -40578,9 +40536,9 @@ sq
sq
sq
sq
vv
he
xS
fF
un
AH
jV
yP
@@ -40699,7 +40657,7 @@ UJ
Xb
dj
XN
un
ew
ms
Xq
be
@@ -40841,7 +40799,7 @@ iW
WS
dj
XN
un
ew
ms
Xq
be
@@ -41124,7 +41082,7 @@ jZ
WR
Xo
XN
un
ew
cK
ms
Xq
@@ -41692,7 +41650,7 @@ ea
kx
dj
XN
un
ew
cK
ms
mq
@@ -41977,7 +41935,7 @@ kQ
TG
dj
XN
un
ew
ms
mq
be
@@ -42119,7 +42077,7 @@ kR
Vd
dj
XN
un
ew
ms
QL
be
@@ -42140,9 +42098,9 @@ uw
uw
uw
qr
he
ht
hO
ht
vv
zL
xP
BN
@@ -42261,7 +42219,7 @@ ZE
ZB
dj
XB
un
ew
ms
Sq
be
@@ -42430,7 +42388,7 @@ yV
zK
AM
BP
CG
BR
CD
Es
zK
@@ -42712,8 +42670,8 @@ vk
ya
yX
zO
SD
Qg
AP
AU
CI
Dx
Fk
@@ -42854,8 +42812,8 @@ xo
yc
NQ
zO
AP
BR
AQ
BU
CJ
Dy
BU
@@ -42996,8 +42954,8 @@ xp
yd
qu
qu
AQ
BR
AT
BU
CJ
Dz
Eu
@@ -43289,7 +43247,7 @@ Ew
Ew
Ew
HD
BU
Iu
IW
zO
ab
@@ -43422,7 +43380,7 @@ xs
yg
Qc
qu
AT
BU
BU
CM
BU
@@ -43564,7 +43522,7 @@ EI
Fx
zc
zR
AU
BU
BU
BU
BU
@@ -43849,11 +43807,11 @@ qu
qu
qu
AW
OY
BL
CO
DC
Ey
BL
CG
Ge
GP
HF
+2
View File
@@ -340,6 +340,8 @@
name = "\improper Public Garden Maintenence"
/area/maintenance/lower/public_garden_maintenence/upper
name = "\improper Upper Public Garden Maintenence"
/area/maintenance/lower/medsec_maintenance
name = "\improper Surface MedSec Maintenance"
// Research
/area/rnd/xenobiology/xenoflora/lab_atmos