Merge pull request #15342 from dapnee/oopy

Adding trash piles to meta and also maybe not everyone should be able to get into xenobio
This commit is contained in:
Lin
2021-11-09 03:37:31 +00:00
committed by GitHub
+34 -16
View File
@@ -1504,7 +1504,6 @@
areastring = "/area/security/prison/upper"; areastring = "/area/security/prison/upper";
damage_deflection = 21; damage_deflection = 21;
desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage."; desc = "A control terminal for the area's electrical systems. It's secured with a durable antitampering plasteel cage.";
dir = 2;
name = "Armored Prison Wing Cells APC"; name = "Armored Prison Wing Cells APC";
pixel_y = -26 pixel_y = -26
}, },
@@ -12552,9 +12551,7 @@
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"aWV" = ( "aWV" = (
/obj/effect/turf_decal/stripes/corner{ /obj/effect/turf_decal/stripes/corner,
dir = 2
},
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/hallway/secondary/entry) /area/hallway/secondary/entry)
"aWW" = ( "aWW" = (
@@ -43635,7 +43632,8 @@
idDoor = "xeno_airlock_exterior"; idDoor = "xeno_airlock_exterior";
idSelf = "xeno_airlock_control"; idSelf = "xeno_airlock_control";
name = "Access Button"; name = "Access Button";
pixel_x = -24 pixel_x = -24;
req_access_txt = "47"
}, },
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
@@ -45280,7 +45278,7 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/starboard) /area/maintenance/starboard)
"dbl" = ( "dbl" = (
/obj/structure/easel, /obj/structure/loot_pile/maint,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/starboard/aft) /area/maintenance/starboard/aft)
"dbo" = ( "dbo" = (
@@ -45465,7 +45463,8 @@
idSelf = "xeno_airlock_control"; idSelf = "xeno_airlock_control";
name = "Access Button"; name = "Access Button";
pixel_x = 29; pixel_x = 29;
pixel_y = -8 pixel_y = -8;
req_access_txt = "47"
}, },
/obj/machinery/firealarm{ /obj/machinery/firealarm{
pixel_y = 24 pixel_y = 24
@@ -45640,7 +45639,8 @@
idSelf = "xeno_airlock_control"; idSelf = "xeno_airlock_control";
name = "Access Console"; name = "Access Console";
pixel_x = -25; pixel_x = -25;
pixel_y = -25 pixel_y = -25;
req_access_txt = "47"
}, },
/obj/effect/turf_decal/tile/purple{ /obj/effect/turf_decal/tile/purple{
dir = 1 dir = 1
@@ -46619,10 +46619,10 @@
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/fore) /area/maintenance/fore)
"dht" = ( "dht" = (
/obj/item/cigbutt,
/obj/structure/sign/poster/contraband/random{ /obj/structure/sign/poster/contraband/random{
pixel_x = -32 pixel_x = -32
}, },
/obj/structure/loot_pile/maint,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/starboard/fore) /area/maintenance/starboard/fore)
"dhu" = ( "dhu" = (
@@ -52041,6 +52041,7 @@
/obj/structure/extinguisher_cabinet{ /obj/structure/extinguisher_cabinet{
pixel_y = -30 pixel_y = -30
}, },
/obj/structure/loot_pile/maint,
/turf/open/floor/plating, /turf/open/floor/plating,
/area/maintenance/port/aft) /area/maintenance/port/aft)
"fpg" = ( "fpg" = (
@@ -56725,6 +56726,13 @@
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/service/hydroponics) /area/service/hydroponics)
"iaH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
},
/obj/structure/loot_pile/maint,
/turf/open/floor/plating,
/area/maintenance/starboard)
"ibn" = ( "ibn" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "1-2" icon_state = "1-2"
@@ -65226,6 +65234,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
/area/cargo/storage) /area/cargo/storage)
"mKY" = (
/obj/structure/loot_pile/maint,
/turf/open/floor/plating,
/area/maintenance/port)
"mLh" = ( "mLh" = (
/obj/structure/cable/yellow{ /obj/structure/cable/yellow{
icon_state = "4-8" icon_state = "4-8"
@@ -67942,6 +67954,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall, /turf/closed/wall,
/area/security/brig) /area/security/brig)
"osn" = (
/obj/structure/loot_pile/maint,
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"osB" = ( "osB" = (
/obj/machinery/door/firedoor, /obj/machinery/door/firedoor,
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
@@ -73549,7 +73565,6 @@
/area/commons/fitness/recreation) /area/commons/fitness/recreation)
"rta" = ( "rta" = (
/obj/machinery/door/airlock/external{ /obj/machinery/door/airlock/external{
dir = 2;
name = "Public Mining Dock" name = "Public Mining Dock"
}, },
/obj/effect/mapping_helpers/airlock/cyclelink_helper{ /obj/effect/mapping_helpers/airlock/cyclelink_helper{
@@ -74329,6 +74344,10 @@
}, },
/turf/open/floor/plasteel/dark, /turf/open/floor/plasteel/dark,
/area/command/bridge) /area/command/bridge)
"rPp" = (
/obj/structure/loot_pile/maint,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"rPB" = ( "rPB" = (
/obj/effect/spawner/structure/window, /obj/effect/spawner/structure/window,
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -78146,7 +78165,6 @@
/obj/structure/bed/roller, /obj/structure/bed/roller,
/obj/machinery/camera{ /obj/machinery/camera{
c_tag = "Prison Hallway Fore"; c_tag = "Prison Hallway Fore";
dir = 2;
network = list("ss13","prison") network = list("ss13","prison")
}, },
/turf/open/floor/plasteel, /turf/open/floor/plasteel,
@@ -99568,7 +99586,7 @@ arX
dne dne
dne dne
dne dne
aRG rPp
aoc aoc
drQ drQ
dne dne
@@ -99866,7 +99884,7 @@ auF
bCJ bCJ
tUa tUa
alK alK
apz mKY
aob aob
alC alC
aqK aqK
@@ -104958,7 +104976,7 @@ aji
dnd dnd
alE alE
vhj vhj
aRG rPp
alE alE
dou dou
dne dne
@@ -122203,7 +122221,7 @@ nQW
yeJ yeJ
pSY pSY
avD avD
dnR osn
dtS dtS
tMD tMD
eoN eoN
@@ -125064,7 +125082,7 @@ alq
diu diu
bWZ bWZ
bYs bYs
bZB iaH
bZE bZE
ccG ccG
ceb ceb