From d3b0ac882ff13de7dd8fafc4c718a42cb240a693 Mon Sep 17 00:00:00 2001 From: The0bserver Date: Fri, 20 Nov 2020 03:05:44 -0500 Subject: [PATCH] HERE WE GOOOOOOOOOO! New maps, new meme. --- _maps/map_files/BoxStation/BoxStation.dmm | 205 +++++++++++----- .../map_files/Deltastation/DeltaStation2.dmm | 231 +++++++++++++----- _maps/map_files/LambdaStation/lambda.dmm | 136 +++++++---- _maps/map_files/MetaStation/MetaStation.dmm | 133 +++++++--- _maps/map_files/PubbyStation/PubbyStation.dmm | 179 ++++++++------ 5 files changed, 630 insertions(+), 254 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index df4ab2bc72..ae674e0960 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -9547,6 +9547,20 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"asZ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/item/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "ata" = ( /turf/open/floor/wood, /area/lawoffice) @@ -51206,15 +51220,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"cyt" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 4" - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "cyu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -54554,6 +54559,18 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) +"fXJ" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "fZm" = ( /obj/structure/chair/sofa/left, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -55498,6 +55515,18 @@ /obj/structure/reagent_dispensers/cooking_oil, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) +"iOZ" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "iPX" = ( /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -56101,11 +56130,6 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"kls" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) "kmw" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -56825,6 +56849,12 @@ }, /turf/open/floor/plating, /area/security/processing) +"mlw" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mml" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -57665,6 +57695,14 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet/locker) +"oni" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "oqj" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -58453,6 +58491,17 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/aft) +"qFz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "qIw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -59070,6 +59119,15 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) +"sfE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/kirbyplants{ + icon_state = "plant-06" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "shR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59260,6 +59318,15 @@ }, /turf/open/floor/plasteel, /area/hydroponics) +"sIG" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "sJx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -60163,8 +60230,8 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "uRn" = ( -/mob/living/simple_animal/opossum, /obj/structure/chair/stool, +/mob/living/simple_animal/opossum, /turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "uRS" = ( @@ -60175,6 +60242,15 @@ icon_state = "carpetsymbol" }, /area/crew_quarters/theatre) +"uSx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uSC" = ( /obj/machinery/pool/drain, /turf/open/pool, @@ -60218,6 +60294,16 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/security/brig) +"uZy" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "vae" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -60929,6 +61015,15 @@ }, /turf/closed/wall, /area/hallway/secondary/service) +"wBv" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "wHk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -68460,7 +68555,7 @@ aaa aaa aaa aaa -aaa +gDl aaa aaa aaa @@ -68969,10 +69064,10 @@ aaa aaa aaa aaa +iOZ aaa aaa -aaa -aae +aoV aaa aaa aaa @@ -69224,11 +69319,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +wBv +awW +aaf aaa aaa aaa @@ -69481,11 +69576,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +auP +awW +aaf aaa aaa aaa @@ -69738,11 +69833,11 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa +arB +awW +uZy +awW +arB aaa aaa aaa @@ -69995,12 +70090,12 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa -aoV +arB +asZ +ayl +uSx +arB +aaf aaa aaa aaa @@ -70252,12 +70347,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aoV +awW +sIG +ayl +mlw +awW +aaf aaa aaa aaa @@ -70509,15 +70604,15 @@ aaa aaa aaa aaa +awW +sIG +ayl +oni +awW aaf aaa aaa aaa -aaf -kls -aaa -aaa -aaa aaa aaa aaa @@ -70767,9 +70862,9 @@ aaa aaa aaa arB -arB -arB -arB +qFz +ayn +sfE aAC aaf aaa @@ -71024,7 +71119,7 @@ aaa aaa aaa arB -awZ +fXJ ayk awW aAD @@ -71285,7 +71380,7 @@ awZ ayl beK auP -cyt +cyu cyd aaa aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 891b238f11..5e6698f975 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -660,6 +660,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abr" = ( @@ -1484,9 +1485,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/machinery/camera{ c_tag = "Arrivals Dock - Fore"; dir = 8; @@ -1495,6 +1493,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "acX" = ( @@ -125490,6 +125491,12 @@ "fMf" = ( /turf/closed/wall, /area/engine/transit_tube) +"fNv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "fRK" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -125528,6 +125535,13 @@ }, /turf/open/floor/engine, /area/science/mixing) +"gdi" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gmj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -125543,6 +125557,14 @@ }, /turf/open/floor/plating, /area/security/prison) +"gtU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gKn" = ( /obj/structure/grille, /turf/open/space, @@ -125689,6 +125711,10 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"hvq" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "hAf" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -125822,6 +125848,17 @@ /obj/structure/closet/crate/coffin, /turf/open/floor/plasteel/dark, /area/chapel/office) +"iwA" = ( +/obj/docking_port/stationary{ + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "iwL" = ( /obj/machinery/status_display/evac{ pixel_x = 32 @@ -125943,6 +125980,12 @@ }, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) +"jdg" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "jdx" = ( /obj/structure/lattice, /obj/structure/grille, @@ -126287,6 +126330,15 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/maintenance/port/fore) +"kRp" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lak" = ( /turf/open/floor/plasteel/white/side{ dir = 10 @@ -126320,6 +126372,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/maintenance/port/fore) +"ljQ" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lkk" = ( /obj/effect/turf_decal/delivery, /obj/machinery/hydroponics/soil, @@ -126396,6 +126455,15 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"lwc" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lyU" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_toxmix{ dir = 8 @@ -126962,6 +127030,14 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) +"pDK" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pQm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -127057,6 +127133,21 @@ dir = 5 }, /area/science/circuit) +"qsT" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock - Public Mining"; + dir = 8; + name = "arrivals camera" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "qBG" = ( /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, @@ -127075,6 +127166,15 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"rft" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "rhO" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -127083,6 +127183,18 @@ dir = 9 }, /area/science/circuit) +"ryj" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "rCv" = ( /turf/open/floor/plasteel/white/side{ dir = 6 @@ -127429,6 +127541,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"uFR" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "uNP" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line{ @@ -159602,13 +159721,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aaO +aaO +abf +aaO +aaO aad aad aad @@ -159859,13 +159978,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad +aaa +aaO +ljQ +kRp +pDK +aaO aad aaa aaa @@ -160116,13 +160235,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa aaO aaO +aaO +abe +abC +jdg +aaO abf aaO aaO @@ -160372,18 +160491,18 @@ hZh hZh hZh hZh -aaa -aaa -aaa -aaa -aaa -aaa -aaO -abe +iwA +ryj +hvq +ryj +acb +fNv +aiT +abZ abp abC abC -abZ +abC abC abC acV @@ -160630,19 +160749,19 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa +aaO +aaO aaO vcs +lwc +gtU +rft abq -abD -abD -abZ -abD -abD +gdi +gdi +gdi +gdi +gdi acW adr adr @@ -160887,12 +161006,12 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa +aad aaa aaO +agk +qsT +uFR aaO abf aaO @@ -161144,14 +161263,14 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad aad +aaO +aaO +abf +aaO +aaO +aad aaa aaa aad @@ -161402,12 +161521,12 @@ hZh hZh aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aad +aad +aad +aad aad aad aad diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index b87c755979..a219a333f1 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -63034,6 +63034,19 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plating, /area/storage/tech) +"cYI" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 3; + height = 5; + icon_state = "pinonfar"; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "dcB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -63774,6 +63787,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/cargo) +"etv" = ( +/obj/machinery/door/airlock/external/glass, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "euD" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -68221,6 +68242,20 @@ /obj/machinery/power/grounding_rod, /turf/open/floor/plating/airless, /area/engine/engineering) +"mnL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock Public Mining"; + dir = 1; + name = "arrivals camera" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mqh" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -69098,16 +69133,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) -"ohk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "ojZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -69418,6 +69443,11 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"oTI" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "oUp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, @@ -69460,6 +69490,16 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) +"oVP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "oXg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -69905,6 +69945,14 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) +"pPG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pRv" = ( /obj/machinery/air_sensor{ id_tag = "tox_sensor" @@ -103741,10 +103789,10 @@ nNI ngo bQW nNI -aav -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -103996,15 +104044,15 @@ gLI ifC jEO uYv -ohk +uYv +uYv +jEO +jEO +cIu +nNI +xMt +xMt nNI -aab -aav -aab -aab -aab -aab -aab aab aab aab @@ -104253,16 +104301,16 @@ rEw iiC jMW rEw +rEw +rEw +rEw +rEw cwD -xMt -aab -aav -aab -aab -aab -aab -aab -aab +oTI +cxe +cVf +etv +cYI aab aab aab @@ -104510,15 +104558,15 @@ cvp iqD jto jto -cvI +jto +jto +pPG +oVP +mnL +nNI xMt -aab -aav -aab -aab -aab -aab -aab +xMt +nNI aab aab aab @@ -104769,10 +104817,10 @@ xMt cWd nNI nNI -aab -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -105027,7 +105075,7 @@ cJk nNI aab aab -aav +aab aab aab aab diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index be1b5ba779..ce62317294 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24164,12 +24164,12 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "aVt" = ( -/obj/item/kirbyplants{ - icon_state = "plant-13" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/item/kirbyplants{ + icon_state = "plant-20" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aVu" = ( @@ -24941,10 +24941,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWV" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 +/obj/effect/turf_decal/stripes/corner{ + dir = 2 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWW" = ( @@ -81819,6 +81818,16 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) +"kHw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table, +/obj/item/gps{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kJW" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -81876,6 +81885,15 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"lcv" = ( +/obj/machinery/door/airlock/external{ + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "llb" = ( /obj/structure/table/reinforced, /obj/item/integrated_circuit_printer, @@ -81895,6 +81913,13 @@ /obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/circuit) +"lvm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lws" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -82009,6 +82034,12 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) +"mdt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mjJ" = ( /obj/machinery/nuclearbomb/beer{ pixel_x = 2; @@ -82379,6 +82410,21 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"pAD" = ( +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"pBY" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space, +/area/space) "pCV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82594,6 +82640,16 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"rta" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "rzX" = ( /obj/structure/chair/office/light{ dir = 1; @@ -82892,6 +82948,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"ulG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "upN" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -83040,6 +83102,15 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) +"vMG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/kirbyplants{ + icon_state = "plant-05" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vYs" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -91679,13 +91750,13 @@ aaf aaf aaa aaa +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf +aaa +aaa +aaa +pBY aaa aaa aaa @@ -91936,16 +92007,16 @@ aaa aaa aaa aaa -aaa -aaa -aaf -aaa -aaa -aaa aaf aaf aaf aaf +aaf +aVs +rta +aVs +aaf +aaf aaa aaa aaa @@ -92195,12 +92266,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf aaa aaf +aVs +pAD +aVs aaa aaf aaa @@ -92456,7 +92527,7 @@ aRA aRA aRA aVs -aVs +lcv aVs aVs aaf @@ -92713,10 +92784,10 @@ wOY aSH aUb aVt -aWT +mdt +vMG aVs aaf -aaf aaa aaa aaa @@ -92970,9 +93041,9 @@ abu bsk aUc aVu -aWU -aYC -aaa +bvF +lvm +aVs aaf aaa aaa @@ -93227,10 +93298,10 @@ wOY aSI aRA aVv -aWU +bvF +ulG aVs aaf -aaf aaa aaa aaa @@ -93485,8 +93556,8 @@ aRA aRA cZf aWV -aRA -aaa +kHw +aVs aaa aaa aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ed7abba3d6..056e27b982 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -32021,23 +32021,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"bwq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bwr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "bws" = ( /obj/structure/closet, /obj/item/stack/cable_coil/random, @@ -32812,9 +32795,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bxY" = ( -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bxZ" = ( @@ -33559,6 +33539,9 @@ network = list("monastery"); pixel_x = 28 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bzC" = ( @@ -53109,6 +53092,16 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"deJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "dgg" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -56534,12 +56527,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"kIc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, -/area/hallway/secondary/entry) "kIo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -58350,6 +58337,18 @@ }, /turf/open/floor/plating, /area/quartermaster/miningdock) +"oQm" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "oRX" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -58645,6 +58644,15 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit/departure_lounge) +"pqP" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "prQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -58707,9 +58715,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/chemistry) -"pyw" = ( -/turf/open/space/basic, -/area/hallway/secondary/entry) "pzF" = ( /mob/living/simple_animal/opossum, /turf/open/floor/wood, @@ -58751,6 +58756,15 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"pEH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/chair/comfy{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pEL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -59281,6 +59295,15 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"qRm" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "qTV" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -59997,6 +60020,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"sIK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJp" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line, @@ -61493,6 +61524,18 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"wjQ" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wkZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -80466,7 +80509,7 @@ aaa aaa aaa aaa -pyw +aaa bsl btL aZx @@ -80723,7 +80766,7 @@ aaa aaa aaa aaa -pyw +aaa aZx bcX aZx @@ -81759,7 +81802,7 @@ aaa aaa aaa aaa -aaa +oQm aaa aaa aaa @@ -82015,9 +82058,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +pqP +aZx aaa aaa aaa @@ -82272,9 +82315,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +bcX +aZx aaa aaa aaa @@ -82526,12 +82569,12 @@ aZx bno bon aZx -aaa -aaa -aaa -aaa -aaa -aaa +aZx +aZx +aZx +aZx +qRm +aZx aaa aaa aht @@ -82781,15 +82824,15 @@ bbQ bcX bdV bnp -bon +baK +pEH +deJ +sIK +wjQ +pEH +bbR aZx aaa -aaa -aaa -aaa -aaa -aaa -aaa aht bBV bDf @@ -83038,15 +83081,15 @@ jzz aZx jzz bnp -bon -aZx -aZx -aZx -aZx -aZx +baK +baK +baK +baK +baK +baK +baK aZx aaa -aht bAI abI abI @@ -83296,14 +83339,14 @@ bbR bbR bnp baK -bbR -bbR -bbR -bbR -bbR +baK +baK +baK +baK +baK +baK +aZx aZx -kIc -kIc bAJ bBX bBX @@ -83558,7 +83601,7 @@ baK baK baK baK -aZx +baK bxY bzz kGe @@ -83815,7 +83858,7 @@ bbT bbT bbT bbT -bwq +bbT bxZ bzA bAK @@ -84072,7 +84115,7 @@ bqS bsm btN bfY -bwr +bfY bya bzB bAL