Skip to content

Commit

Permalink
Fixed HoS disposal and added a printer to the captain's office on Cer…
Browse files Browse the repository at this point in the history
…ebron
  • Loading branch information
lesTYP committed Dec 27, 2024
1 parent 7a4f324 commit f8e34d8
Showing 1 changed file with 56 additions and 26 deletions.
82 changes: 56 additions & 26 deletions _maps/map_files220/stations/metastation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,9 @@
"alm" = (
/obj/machinery/firealarm/directional/west,
/obj/structure/closet/crate/can,
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
Expand Down Expand Up @@ -3118,6 +3121,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"avr" = (
Expand Down Expand Up @@ -5771,9 +5775,6 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"aGW" = (
Expand Down Expand Up @@ -14403,6 +14404,7 @@
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/obj/machinery/photocopier,
/turf/simulated/floor/carpet,
/area/station/command/office/captain/bedroom)
"bjj" = (
Expand Down Expand Up @@ -42883,6 +42885,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/extinguisher_cabinet/directional/east,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"eeL" = (
Expand Down Expand Up @@ -46968,9 +46971,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
Expand Down Expand Up @@ -47241,6 +47241,9 @@
/turf/simulated/floor/plating,
/area/station/security/storage)
"glS" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
Expand Down Expand Up @@ -47691,9 +47694,6 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 1
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable/yellow{
icon_state = "2-8"
},
Expand Down Expand Up @@ -51789,6 +51789,9 @@
/turf/simulated/floor/carpet,
/area/station/public/vacant_office)
"iwm" = (
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
/turf/simulated/floor/plasteel{
dir = 8;
icon_state = "redcorner"
Expand Down Expand Up @@ -58426,6 +58429,9 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
Expand Down Expand Up @@ -59083,7 +59089,10 @@
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"maV" = (
/obj/structure/disposalpipe/segment,
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
sort_type_txt = "8"
},
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
Expand Down Expand Up @@ -60860,6 +60869,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
Expand Down Expand Up @@ -62783,6 +62793,9 @@
/turf/simulated/floor/plating,
/area/station/maintenance/fore)
"nNq" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "redcorner"
},
Expand Down Expand Up @@ -63509,10 +63522,6 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 4;
sort_type_txt = "8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
Expand Down Expand Up @@ -69822,6 +69831,15 @@
/obj/machinery/atmospherics/pipe/simple/visible/purple,
/turf/simulated/floor/plasteel,
/area/station/engineering/atmos)
"rAX" = (
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/structure/disposalpipe/segment/corner{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"rBn" = (
/obj/machinery/atmospherics/pipe/simple/visible/cyan{
dir = 4
Expand Down Expand Up @@ -70098,6 +70116,7 @@
c_tag = "Brig - Hallway - Starboard";
dir = 8
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"rIj" = (
Expand Down Expand Up @@ -74921,6 +74940,7 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
Expand Down Expand Up @@ -75288,6 +75308,9 @@
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel{
icon_state = "red"
},
Expand Down Expand Up @@ -75553,6 +75576,8 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/structure/disposalpipe/segment,

Check failure on line 75579 in _maps/map_files220/stations/metastation.dmm

View workflow job for this annotation

GitHub Actions / Run Linters

DMM Linter

(in pop uFZ) (at (112, 174, 1)) Typepath /obj/structure/disposalpipe/segment has a banned neighbor: /obj/structure/disposalpipe/segment
/obj/structure/disposalpipe/segment,

Check failure on line 75580 in _maps/map_files220/stations/metastation.dmm

View workflow job for this annotation

GitHub Actions / Run Linters

DMM Linter

(in pop uFZ) (at (112, 174, 1)) Typepath /obj/structure/disposalpipe/segment has a banned neighbor: /obj/structure/disposalpipe/segment
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "redcorner"
Expand Down Expand Up @@ -77425,6 +77450,7 @@
/obj/structure/cable/yellow{
icon_state = "1-4"
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"vzi" = (
Expand Down Expand Up @@ -77812,6 +77838,7 @@
},
/obj/machinery/status_display/directional/north,
/obj/structure/chair/stool,
/obj/structure/disposalpipe/segment/corner,
/turf/simulated/floor/plasteel{
dir = 1;
icon_state = "black"
Expand Down Expand Up @@ -78139,6 +78166,7 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"vWq" = (
Expand Down Expand Up @@ -78812,12 +78840,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 8
},
/obj/structure/disposalpipe/sortjunction/reversed{
dir = 2;
sort_type_txt = "7"
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"wtm" = (
Expand Down Expand Up @@ -80538,9 +80567,6 @@
/obj/structure/cable/yellow{
icon_state = "2-8"
},
/obj/structure/disposalpipe/segment/corner{
dir = 2
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
Expand All @@ -80550,6 +80576,7 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/obj/structure/disposalpipe/junction,
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"xoP" = (
Expand Down Expand Up @@ -81779,6 +81806,9 @@
/area/station/science/break_room)
"xUC" = (
/obj/item/radio/intercom/directional/south,
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/floor/plasteel,
/area/station/security/brig)
"xVB" = (
Expand Down Expand Up @@ -110865,7 +110895,7 @@ aSm
aqd
aSm
alm
wRx
oSi
bAx
oSi
oSi
Expand Down Expand Up @@ -111123,11 +111153,11 @@ uQU
uOh
glS
aGV
sQt
sQt
sQt
sQt
sQt
rAX
xkX
xkX
xkX
xkX
mVB
ule
uFZ
Expand Down

0 comments on commit f8e34d8

Please sign in to comment.