Merge pull request #5612 from Heroman3003/secmaintfixes

Readjusts areas in security maint
This commit is contained in:
Novacat
2019-08-14 22:53:44 -04:00
committed by GitHub

View File

@@ -2116,21 +2116,11 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"dx" = ( "dx" = (
/obj/structure/cable/green{ /obj/machinery/door/airlock/maintenance/common,
d1 = 4; /obj/effect/floor_decal/rust,
d2 = 8; /obj/machinery/door/firedoor/glass,
icon_state = "4-8"
},
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/structure/catwalk,
/obj/machinery/alarm{
pixel_y = 22
},
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/ai)
"dy" = ( "dy" = (
/turf/simulated/shuttle/wall/voidcraft/hard_corner, /turf/simulated/shuttle/wall/voidcraft/hard_corner,
/area/shuttle/excursion/tether) /area/shuttle/excursion/tether)
@@ -2906,13 +2896,18 @@
/turf/simulated/wall, /turf/simulated/wall,
/area/security/security_equiptment_storage) /area/security/security_equiptment_storage)
"eU" = ( "eU" = (
/obj/structure/railing{ /obj/structure/catwalk,
icon_state = "railing0"; /obj/structure/cable{
dir = 1 d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
}, },
/obj/structure/closet, /obj/machinery/alarm{
/obj/structure/railing{ dir = 4;
dir = 4 icon_state = "alarm0";
pixel_x = -22;
pixel_y = 0
}, },
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
@@ -3191,7 +3186,10 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/ai) /area/maintenance/station/ai)
"fq" = ( "fq" = (
/obj/effect/decal/cleanable/dirt, /obj/structure/railing{
icon_state = "railing0";
dir = 1
},
/obj/structure/railing{ /obj/structure/railing{
dir = 4 dir = 4
}, },
@@ -5022,6 +5020,18 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/security/hallway) /area/security/hallway)
"iq" = ( "iq" = (
/obj/structure/catwalk,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 1;
d2 = 2;
icon_state = "1-2";
pixel_y = 0
},
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"ir" = ( "ir" = (
@@ -9967,7 +9977,14 @@
/turf/simulated/floor/tiled/white, /turf/simulated/floor/tiled/white,
/area/medical/surgery) /area/medical/surgery)
"pT" = ( "pT" = (
/obj/structure/railing, /obj/structure/catwalk,
/obj/structure/cable{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"pU" = ( "pU" = (
@@ -10524,25 +10541,17 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/security/hallway) /area/security/hallway)
"qT" = ( "qT" = (
/obj/structure/cable/green{ /turf/simulated/floor,
icon_state = "32-2" /area/maintenance/station/elevator)
},
/obj/structure/lattice,
/obj/structure/railing,
/turf/simulated/open,
/area/maintenance/station/sec_upper)
"qU" = ( "qU" = (
/obj/machinery/portable_atmospherics/powered/pump/filled, /obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"qV" = ( "qV" = (
/obj/effect/decal/cleanable/dirt, /obj/effect/floor_decal/rust,
/obj/structure/railing{ /obj/effect/decal/cleanable/cobweb,
dir = 4
},
/obj/structure/railing,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"qW" = ( "qW" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
@@ -11048,23 +11057,16 @@
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/crew_quarters/heads/cmo) /area/crew_quarters/heads/cmo)
"rD" = ( "rD" = (
/obj/structure/cable/green{ /obj/structure/railing,
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/catwalk,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"rE" = ( "rE" = (
/obj/structure/cable/green{ /obj/effect/decal/cleanable/dirt,
d1 = 1; /obj/structure/railing{
d2 = 8; dir = 4
icon_state = "1-8"
}, },
/obj/structure/catwalk,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"rF" = ( "rF" = (
/obj/structure/cable{ /obj/structure/cable{
icon_state = "1-2" icon_state = "1-2"
@@ -11598,10 +11600,10 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/security/security_processing) /area/security/security_processing)
"so" = ( "so" = (
/obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt,
/obj/structure/catwalk, /obj/structure/catwalk,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"sp" = ( "sp" = (
/turf/simulated/wall/r_wall, /turf/simulated/wall/r_wall,
/area/hallway/station/upper) /area/hallway/station/upper)
@@ -12178,16 +12180,12 @@
/area/security/hallway) /area/security/hallway)
"te" = ( "te" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
d1 = 4; icon_state = "32-2"
d2 = 8;
icon_state = "4-8"
}, },
/obj/structure/disposalpipe/segment{ /obj/structure/lattice,
dir = 4 /obj/structure/railing,
}, /turf/simulated/open,
/obj/structure/catwalk, /area/maintenance/station/elevator)
/turf/simulated/floor,
/area/maintenance/station/sec_upper)
"tf" = ( "tf" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -12856,10 +12854,22 @@
/turf/simulated/floor/tiled, /turf/simulated/floor/tiled,
/area/security/hallway) /area/security/hallway)
"ue" = ( "ue" = (
/obj/structure/shuttle/engine/propulsion, /obj/structure/table/rack{
/turf/simulated/floor/reinforced, dir = 8;
/turf/simulated/shuttle/plating/airless/carry, layer = 2.9
/area/shuttle/excursion/tether) },
/obj/random/maintenance/security,
/obj/random/maintenance/security,
/obj/random/maintenance/medical,
/obj/item/weapon/storage/box/lights/mixed,
/obj/structure/railing,
/obj/random/tool,
/obj/machinery/light/small{
icon_state = "bulb1";
dir = 1
},
/turf/simulated/floor,
/area/maintenance/station/elevator)
"uf" = ( "uf" = (
/obj/structure/cable{ /obj/structure/cable{
d1 = 2; d1 = 2;
@@ -27578,22 +27588,13 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"Re" = ( "Re" = (
/obj/structure/table/rack{ /obj/effect/decal/cleanable/dirt,
dir = 8; /obj/structure/railing{
layer = 2.9 dir = 4
}, },
/obj/random/maintenance/security,
/obj/random/maintenance/security,
/obj/random/maintenance/medical,
/obj/item/weapon/storage/box/lights/mixed,
/obj/structure/railing, /obj/structure/railing,
/obj/random/tool,
/obj/machinery/light/small{
icon_state = "bulb1";
dir = 1
},
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"Rf" = ( "Rf" = (
/obj/effect/floor_decal/borderfloor/corner2{ /obj/effect/floor_decal/borderfloor/corner2{
dir = 8 dir = 8
@@ -27637,10 +27638,9 @@
/turf/space, /turf/space,
/area/space) /area/space)
"Rk" = ( "Rk" = (
/obj/effect/floor_decal/rust, /obj/structure/catwalk,
/obj/effect/decal/cleanable/cobweb,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"Rl" = ( "Rl" = (
/obj/effect/floor_decal/borderfloor{ /obj/effect/floor_decal/borderfloor{
dir = 6 dir = 6
@@ -27754,10 +27754,10 @@
/turf/simulated/mineral/vacuum, /turf/simulated/mineral/vacuum,
/area/quartermaster/office) /area/quartermaster/office)
"Rv" = ( "Rv" = (
/obj/machinery/door/airlock/maintenance/common, /obj/structure/shuttle/engine/propulsion,
/obj/effect/floor_decal/rust, /turf/simulated/floor/reinforced,
/turf/simulated/floor, /turf/simulated/shuttle/plating/airless/carry,
/area/maintenance/station/ai) /area/shuttle/excursion/tether)
"Rw" = ( "Rw" = (
/obj/structure/catwalk, /obj/structure/catwalk,
/obj/machinery/light/small{ /obj/machinery/light/small{
@@ -27949,12 +27949,17 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/sec_upper)
"RP" = ( "RP" = (
/obj/structure/catwalk, /obj/structure/cable/green{
/obj/structure/cable{ d1 = 4;
icon_state = "2-8" d2 = 8;
icon_state = "4-8"
}, },
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/catwalk,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"RQ" = ( "RQ" = (
/obj/structure/closet/crate, /obj/structure/closet/crate,
/obj/random/drinkbottle, /obj/random/drinkbottle,
@@ -28180,39 +28185,30 @@
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/ai) /area/maintenance/station/ai)
"St" = ( "St" = (
/obj/structure/railing{ /obj/structure/cable/green{
icon_state = "railing0";
dir = 1
},
/obj/structure/railing{
dir = 4
},
/obj/structure/cable{
icon_state = "0-4";
d2 = 4
},
/obj/machinery/power/apc{
dir = 8;
name = "west bump";
pixel_x = -28
},
/turf/simulated/floor,
/area/maintenance/station/sec_upper)
"Su" = (
/obj/structure/catwalk,
/obj/structure/cable{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable{
d1 = 4; d1 = 4;
d2 = 8; d2 = 8;
icon_state = "4-8"; icon_state = "4-8"
pixel_x = 0 },
/obj/structure/disposalpipe/segment{
dir = 2;
icon_state = "pipe-c"
},
/obj/structure/catwalk,
/obj/machinery/alarm{
pixel_y = 22
}, },
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/station/sec_upper) /area/maintenance/station/elevator)
"Su" = (
/obj/structure/cable/green{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/elevator)
"Sv" = ( "Sv" = (
/obj/structure/catwalk, /obj/structure/catwalk,
/obj/effect/floor_decal/rust, /obj/effect/floor_decal/rust,
@@ -28236,6 +28232,7 @@
icon_state = "4-8" icon_state = "4-8"
}, },
/obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/airlock/maintenance/common,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor, /turf/simulated/floor,
/area/maintenance/cargo) /area/maintenance/cargo)
"Sx" = ( "Sx" = (
@@ -28409,6 +28406,25 @@
}, },
/turf/simulated/floor/tiled/monotile, /turf/simulated/floor/tiled/monotile,
/area/tether/exploration) /area/tether/exploration)
"SL" = (
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/elevator)
"SM" = (
/obj/effect/floor_decal/rust,
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/elevator)
"SN" = (
/obj/structure/disposalpipe/segment,
/obj/structure/catwalk,
/turf/simulated/floor,
/area/maintenance/station/elevator)
"SP" = ( "SP" = (
/obj/structure/table/woodentable, /obj/structure/table/woodentable,
/obj/item/device/taperecorder{ /obj/item/device/taperecorder{
@@ -37227,7 +37243,7 @@ eX
lC lC
lC lC
mH mH
te RP
mH mH
mH mH
mH mH
@@ -37369,8 +37385,8 @@ eX
lC lC
lC lC
mH mH
dx St
so SN
tk tk
uf uf
uW uW
@@ -37511,8 +37527,8 @@ pr
lC lC
lC lC
mH mH
rD Su
af tl
tl tl
ug ug
tl tl
@@ -37653,8 +37669,8 @@ le
mH mH
mH mH
mH mH
rD Su
af tl
tm tm
uh uh
uX uX
@@ -37792,11 +37808,11 @@ mm
SF SF
oL oL
le le
iq
af
qT qT
rE tl
af te
SL
tl
tn tn
tn tn
tn tn
@@ -37934,11 +37950,11 @@ nS
om om
oI oI
le le
af tl
af tl
Re ue
fc Rk
af tl
tn tn
ui ui
ui ui
@@ -38076,11 +38092,11 @@ nT
on on
oM oM
le le
Rk
fq
qV qV
fc rE
af Re
Rk
tl
tn tn
ui ui
ui ui
@@ -38218,11 +38234,11 @@ nU
oo oo
oN oN
le le
pT rD
dw so
fc Rk
mR SM
af tl
tn tn
ui ui
ui ui
@@ -38363,8 +38379,8 @@ af
aI aI
qn qn
aI aI
aI yz
af tl
tn tn
ui ui
ui ui
@@ -38779,7 +38795,7 @@ ku
kJ kJ
aI aI
mR mR
St fq
aI aI
aI aI
aI aI
@@ -38919,10 +38935,10 @@ RE
RH RH
RH RH
RH RH
RH
RH
Su
eU eU
RH
iq
RO
aI aI
ab ab
ab ab
@@ -39063,8 +39079,8 @@ be
be be
be be
be be
RP aI
RO pT
aI aI
ab ab
ab ab
@@ -39767,7 +39783,7 @@ it
di di
di di
dy dy
ue Rv
cK cK
cK cK
ms ms
@@ -39909,7 +39925,7 @@ iK
jY jY
kn kn
di di
ue Rv
cK cK
cK cK
ms ms
@@ -40051,7 +40067,7 @@ iK
jY jY
kn kn
di di
ue Rv
cK cK
cK cK
ms ms
@@ -40903,7 +40919,7 @@ eb
ka ka
ky ky
di di
ue Rv
cK cK
cK cK
ms ms
@@ -41045,7 +41061,7 @@ jf
kj kj
kQ kQ
di di
ue Rv
cK cK
cK cK
ms ms
@@ -41187,7 +41203,7 @@ jr
kk kk
kR kR
dy dy
ue Rv
cK cK
cK cK
ms ms
@@ -42175,7 +42191,7 @@ dV
eI eI
fp fp
mT mT
Rv dx
Rx Rx
dV dV
fy fy