Merge pull request #16737 from meow20/meta

Metastation various fixes
This commit is contained in:
variableundefined
2021-09-19 10:40:41 -05:00
committed by GitHub
+135 -59
View File
@@ -42897,6 +42897,10 @@
/obj/effect/decal/warning_stripes/yellow/partial{
dir = 1
},
/obj/machinery/ticket_machine{
layer = 4;
pixel_x = 32
},
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -42924,10 +42928,6 @@
},
/obj/effect/decal/warning_stripes/arrow,
/obj/effect/decal/warning_stripes/yellow/partial,
/obj/machinery/ticket_machine{
layer = 4;
pixel_x = -32
},
/turf/simulated/floor/plasteel,
/area/bridge/meeting_room{
name = "\improper Command Hallway"
@@ -44244,16 +44244,6 @@
/area/security/vacantoffice)
"bPS" = (
/obj/effect/decal/warning_stripes/southeast,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel,
@@ -46735,8 +46725,8 @@
"bVd" = (
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/stamp/centcom,
/obj/item/pen/multi/fountain,
/obj/item/stamp/rep,
/turf/simulated/floor/carpet,
/area/ntrep)
"bVe" = (
@@ -47124,11 +47114,6 @@
d2 = 8;
icon_state = "1-8"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/effect/decal/warning_stripes/east,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -47313,11 +47298,6 @@
dir = 4;
pixel_x = -24
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/obj/effect/decal/warning_stripes/southwest,
/turf/simulated/floor/plasteel,
/area/teleporter{
@@ -47463,18 +47443,12 @@
name = "E.V.A. Storage"
})
"bWB" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/effect/decal/warning_stripes/south,
/turf/simulated/floor/plasteel,
/area/teleporter{
name = "\improper Teleporter Room"
})
"bWC" = (
/obj/structure/cable/yellow,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "vault"
@@ -47509,7 +47483,6 @@
name = "\improper Teleporter Room"
})
"bWF" = (
/obj/structure/cable/yellow,
/obj/machinery/shieldwallgen,
/turf/simulated/floor/plasteel{
dir = 4;
@@ -47607,11 +47580,6 @@
/obj/item/clothing/mask/gas,
/obj/structure/table,
/obj/item/radio/off,
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/effect/decal/warning_stripes/yellow/hollow,
/turf/simulated/floor/plasteel,
/area/teleporter{
@@ -51638,7 +51606,6 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/obj/machinery/atmospherics/pipe/simple/visible/yellow,
/turf/simulated/floor/plating,
/area/maintenance/incinerator)
"cfM" = (
@@ -52450,6 +52417,9 @@
/obj/effect/landmark{
name = "lightsout"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52467,6 +52437,12 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -52681,6 +52657,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -53366,6 +53344,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "whiteblue"
},
@@ -56119,6 +56099,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "whitebluefull"
},
@@ -56868,6 +56850,8 @@
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "whiteblue"
@@ -57813,13 +57797,9 @@
d2 = 8;
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60214,6 +60194,10 @@
name = "privacy shutters";
opacity = 0
},
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/medical/cmo)
"cyt" = (
@@ -60523,6 +60507,16 @@
/obj/machinery/camera{
c_tag = "Medbay Surgery 1 North"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -60555,6 +60549,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 8;
icon_state = "2-8"
},
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -60720,6 +60719,11 @@
pixel_y = 2
},
/obj/item/clothing/accessory/stethoscope,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -60746,6 +60750,11 @@
/obj/item/folder/white,
/obj/item/stamp/cmo,
/obj/item/clothing/glasses/hud/health,
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61593,12 +61602,27 @@
name = "Chief Medical Officer's Office";
req_access_txt = "40"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
},
/area/medical/cmo)
"cBs" = (
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61608,6 +61632,11 @@
/obj/effect/landmark/start{
name = "Chief Medical Officer"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -61615,6 +61644,16 @@
/area/medical/cmo)
"cBu" = (
/obj/machinery/hologram/holopad,
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -67403,6 +67442,16 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 4;
icon_state = "1-4"
},
/obj/structure/cable/yellow{
d1 = 2;
d2 = 4;
icon_state = "2-4"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -67418,6 +67467,11 @@
dir = 4;
icon_state = "pipe-c"
},
/obj/structure/cable/yellow{
d1 = 4;
d2 = 8;
icon_state = "4-8"
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "barber"
@@ -69323,6 +69377,7 @@
pixel_x = -24
},
/obj/effect/decal/warning_stripes/east,
/obj/structure/cable/yellow,
/turf/simulated/floor/plasteel{
icon_state = "white"
},
@@ -74229,20 +74284,15 @@
/turf/simulated/wall,
/area/medical/surgeryobs)
"dbv" = (
/obj/structure/sign/biohazard{
pixel_x = -32
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
icon_state = "white"
},
/area/maintenance/aft)
/area/medical/medbay2{
name = "Medbay Storage"
})
"dbw" = (
/obj/item/radio/intercom{
name = "Station Intercom (General)";
@@ -76905,6 +76955,7 @@
dir = 4
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/medical/cmo)
"ebA" = (
@@ -79330,6 +79381,15 @@
/obj/effect/decal/warning_stripes/southeast,
/turf/simulated/floor/engine,
/area/engine/engineering)
"lrA" = (
/obj/structure/sign/biohazard{
pixel_x = -32
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "whitegreen"
},
/area/maintenance/aft)
"lwN" = (
/obj/effect/spawner/lootdrop{
loot = list(/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/structure/grille,/obj/item/cigbutt,/obj/item/trash/cheesie,/obj/item/trash/candy,/obj/item/trash/chips,/obj/item/trash/pistachios,/obj/item/trash/plate,/obj/item/trash/popcorn,/obj/item/trash/raisins,/obj/item/trash/sosjerky,/obj/item/trash/syndi_cakes);
@@ -80326,6 +80386,18 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/plasteel,
/area/crew_quarters/locker)
"pcN" = (
/obj/effect/spawner/window/reinforced,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
id_tag = "cmoprivacy";
name = "privacy shutters";
opacity = 0
},
/obj/structure/cable/yellow,
/turf/simulated/floor/plating,
/area/medical/cmo)
"pcW" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -80386,6 +80458,10 @@
opacity = 0
},
/obj/effect/spawner/window/reinforced,
/obj/structure/cable/yellow{
d2 = 2;
icon_state = "0-2"
},
/turf/simulated/floor/plating,
/area/medical/cmo)
"pjn" = (
@@ -104258,7 +104334,7 @@ chy
bZU
cZv
day
cZv
lrA
bZU
cQx
bZU
@@ -104515,7 +104591,7 @@ cNZ
cKV
cZq
dax
dbv
cZq
deg
cSl
cRj
@@ -105012,7 +105088,7 @@ cxt
csJ
cys
cMP
cys
pcN
csJ
csJ
cFd
@@ -105255,7 +105331,7 @@ ccD
cdT
chU
cjt
cjt
dbv
cjt
cjt
cLT