From ce16c91b2f12a95e83f792dcbcbb126ddb1c2226 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Thu, 16 Jan 2020 14:08:14 -0500 Subject: [PATCH 1/6] Code changes --- code/datums/shuttles.dm | 8 ++++++++ .../items/circuitboards/computer_circuitboards.dm | 4 ++++ .../crates_lockers/closets/secure/freezer.dm | 8 ++++++++ .../crates_lockers/closets/secure/security.dm | 14 ++++++++++++++ code/modules/mining/mine_items.dm | 7 +++++++ 5 files changed, 41 insertions(+) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index e6d80bedb5..7576ce4d30 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -131,6 +131,10 @@ port_id = "mining" can_be_bought = FALSE +/datum/map_template/shuttle/mining_common + port_id = "mining_common" + can_be_bought = FALSE + /datum/map_template/shuttle/cargo port_id = "cargo" can_be_bought = FALSE @@ -488,6 +492,10 @@ suffix = "delta" name = "labour shuttle (Delta)" +/datum/map_template/shuttle/mining_common/meta + suffix = "meta" + name = "lavaland shuttle (Meta)" + /datum/map_template/shuttle/arrival/delta suffix = "delta" name = "arrival shuttle (Delta)" diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 32c879e2d2..8400b6fa5c 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -293,6 +293,10 @@ name = "Mining Shuttle (Computer Board)" build_path = /obj/machinery/computer/shuttle/mining +/obj/item/circuitboard/computer/mining_shuttle/common + name = "Lavaland Shuttle (Computer Board)" + build_path = /obj/machinery/computer/shuttle/mining/common + /obj/item/circuitboard/computer/white_ship name = "White Ship (Computer Board)" build_path = /obj/machinery/computer/shuttle/white_ship diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 9ed148b4e3..c3a23cb171 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -66,6 +66,14 @@ req_access = null locked = FALSE +/obj/structure/closet/secure_closet/freezer/gulag_fridge + name = "refrigerator" + +/obj/structure/closet/secure_closet/freezer/gulag_fridge/PopulateContents() + ..() + for(var/i in 1 to 3) + new /obj/item/reagent_containers/food/drinks/beer/light(src) + /obj/structure/closet/secure_closet/freezer/fridge name = "refrigerator" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index ad482b68af..60fc9bbce2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -291,3 +291,17 @@ ..() for(var/i in 1 to 3) new /obj/item/storage/box/lethalshot(src) + +/obj/structure/closet/secure_closet/labor_camp_security + name = "labor camp security locker" + req_access = list(ACCESS_SECURITY) + icon_state = "sec" + +/obj/structure/closet/secure_closet/labor_camp_security/PopulateContents() + ..() + new /obj/item/clothing/suit/armor/vest(src) + new /obj/item/clothing/head/helmet/sec(src) + new /obj/item/clothing/under/rank/security(src) + new /obj/item/clothing/under/rank/security/skirt(src) + new /obj/item/clothing/glasses/hud/security/sunglasses(src) + new /obj/item/flashlight/seclite(src) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 950ae7dda1..7c49957fb4 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -87,6 +87,13 @@ return . = ..() +/obj/machinery/computer/shuttle/mining/common + name = "lavaland shuttle console" + desc = "Used to call and send the lavaland shuttle." + circuit = /obj/item/circuitboard/computer/mining_shuttle/common + shuttleId = "mining_common" + possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public" + /**********************Mining car (Crate like thing, not the rail car)**************************/ /obj/structure/closet/crate/miningcar From a360a89f8620e0c6a329264724b0379201f3613a Mon Sep 17 00:00:00 2001 From: r4d6 Date: Thu, 16 Jan 2020 15:10:57 -0500 Subject: [PATCH 2/6] Map Changes --- _maps/map_files/BoxStation/BoxStation.dmm | 82 +- .../map_files/Deltastation/DeltaStation2.dmm | 83 +- _maps/map_files/MetaStation/MetaStation.dmm | 1929 ++++++----- _maps/map_files/Mining/Lavaland.dmm | 2958 +++++++++++------ _maps/shuttles/mining_common_meta.dmm | 124 + 5 files changed, 3218 insertions(+), 1958 deletions(-) create mode 100644 _maps/shuttles/mining_common_meta.dmm diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index cfe7dd4335..ae2be70e7b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -53471,14 +53471,11 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "est" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03" +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 }, /turf/open/floor/plasteel/white/corner{ dir = 1 @@ -53625,6 +53622,10 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"eZP" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/space/basic, +/area/hallway/secondary/entry) "fbm" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -54818,6 +54819,15 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"jnX" = ( +/obj/machinery/door/airlock/external{ + name = "Common Mining Shuttle Bay" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "job" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -56831,6 +56841,18 @@ }, /turf/open/floor/plasteel/dark, /area/maintenance/port) +"rHa" = ( +/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) "rKc" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -58110,6 +58132,11 @@ "vYa" = ( /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"vZs" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/open/space, +/area/space/nearstation) "wcy" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/structure/cable{ @@ -58551,6 +58578,15 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"ycF" = ( +/obj/machinery/door/airlock/external{ + name = "Common Mining Shuttle Bay" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "ydD" = ( /obj/effect/turf_decal/bot, /obj/machinery/suit_storage_unit/rd, @@ -66662,7 +66698,7 @@ aaa aaa aaa aaa -aaf +aoV aaa aaa aaa @@ -66919,12 +66955,12 @@ aaa aaa aaa aaa -aaf +aoV +aaa +rHa aaa aaa -aaa -aaa -aaf +aoV aaa aaa aaa @@ -67176,12 +67212,12 @@ aaa aaa aaa aaa -aaf -aaa -aaa -aaa -aaf -aaf +asE +asE +ycF +asE +asE +aoV aaa aaa aaa @@ -67434,11 +67470,11 @@ aaa aaa aaa aaf -aaa -aaf -aaa -aAC +eZP +auP +eZP aaf +vZs aaa aaa aaa @@ -67691,10 +67727,10 @@ aaa aaa aaa arB -awW -awW -asE arB +jnX +asE +aAC aaf aaa aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index eb3140f281..e6192cc61d 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -159,7 +159,9 @@ /area/construction/mining/aux_base) "abe" = ( /obj/effect/turf_decal/delivery, -/obj/item/twohanded/required/kirbyplants/random, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abf" = ( @@ -182,7 +184,7 @@ pixel_x = -23 }, /obj/effect/turf_decal/stripes/line{ - dir = 9 + dir = 8 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -125760,6 +125762,17 @@ }, /turf/open/floor/plasteel/dark, /area/science/mixing) +"eYg" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "faI" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -125918,6 +125931,15 @@ }, /turf/open/floor/engine, /area/science/mixing) +"gdb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "giN" = ( /obj/structure/window/reinforced{ dir = 8 @@ -125929,6 +125951,19 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, /area/science/circuit) +"gmn" = ( +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gut" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -126063,6 +126098,11 @@ /obj/structure/sign/warning/vacuum, /turf/closed/wall/r_wall, /area/chapel/office) +"hlu" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "hrP" = ( /obj/structure/cable/white{ icon_state = "1-2" @@ -127466,6 +127506,17 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) +"xDY" = ( +/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) "xDZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 1 @@ -159473,8 +159524,8 @@ aaa aaa aaa aaa -aaa -aaa +rqh +rqh aad aad aaa @@ -159729,8 +159780,8 @@ aaa aaa aaa aaa -aaa -aaa +aaO +aaO aaO aaO abf @@ -159985,10 +160036,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaO +xDY +eYg +gdb +gmn abe abp abC @@ -160243,10 +160294,10 @@ aaa aaa aaa aaa -aaa -aaa aaO -abe +aaO +aaO +hlu abq abD abD @@ -160501,7 +160552,7 @@ aaa aaa aaa aaa -aaa +rqh aaO aaO abf @@ -160758,8 +160809,8 @@ aaa aaa aaa aaa -aaa -aaa +rqh +rqh aad aad aaa diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index d31dbe1405..e4bcdcc8d9 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -5325,9 +5325,12 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ako" = ( -/obj/structure/closet/firecloset, +/obj/structure/grille, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plating, -/area/maintenance/port) +/area/maintenance/port/fore) "akp" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/yellow, @@ -27339,6 +27342,7 @@ /turf/closed/wall, /area/security/checkpoint/customs) "bbL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -31531,28 +31535,35 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel/white/corner{ - dir = 4 - }, +/turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bjX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/turf/open/floor/plasteel/cafeteria, -/area/hallway/secondary/entry) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bjY" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/machinery/door/firedoor, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bjZ" = ( @@ -31589,7 +31600,6 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = 21 }, /obj/machinery/light{ @@ -31608,19 +31618,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/hallway/primary/port) "bke" = ( @@ -31633,9 +31635,6 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bkf" = ( @@ -31651,12 +31650,9 @@ icon_state = "map-right-MS"; pixel_y = 32 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ - dir = 4 + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -32632,38 +32628,44 @@ /turf/open/floor/plasteel/dark, /area/ai_monitored/storage/satellite) "blT" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"blU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"blV" = ( +"blU" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"blV" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/primary/port) "blW" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, @@ -32671,39 +32673,39 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"blX" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"blX" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "blY" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=5-Customs"; location = "4-Customs" }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"blZ" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"blZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -32711,12 +32713,13 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bma" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bma" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -32724,36 +32727,34 @@ /obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bmb" = ( +/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bmb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bmc" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 }, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -32761,8 +32762,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-8" }, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -33639,49 +33640,53 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bnL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bnM" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_x = 28; + pixel_y = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) +"bnM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) "bnN" = ( -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = 1; - pixel_y = 5 - }, -/turf/open/floor/plasteel/grimy, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/hallway/primary/port) "bnO" = ( -/obj/structure/chair/comfy/beige, -/turf/open/floor/plasteel/grimy, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/hallway/primary/port) "bnP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/door/airlock/external{ + name = "Common Mining Dock" }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/plating, /area/hallway/primary/port) "bnQ" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/chips, -/turf/open/floor/plasteel/grimy, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/hallway/primary/port) "bnR" = ( -/obj/machinery/vending/coffee, -/turf/open/floor/plasteel/dark, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/structure/sign/mining, +/turf/open/floor/plasteel, /area/hallway/primary/port) "bnS" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 6 @@ -33689,7 +33694,7 @@ /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -33701,8 +33706,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -34781,88 +34786,81 @@ /area/hallway/secondary/entry) "bqc" = ( /obj/machinery/holopad, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bqd" = ( -/obj/machinery/power/apc{ - areastring = "/area/hallway/secondary/entry"; - dir = 4; - name = "Arrivals APC"; - pixel_x = 24 - }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"bqe" = ( -/obj/structure/chair/comfy/beige{ - dir = 4 - }, -/obj/machinery/camera{ - c_tag = "Arrivals - Lounge"; - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/grimy, -/area/hallway/primary/port) -"bqf" = ( -/turf/open/floor/carpet, -/area/hallway/primary/port) -"bqg" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/holopad{ - pixel_y = -16 - }, -/turf/open/floor/carpet, -/area/hallway/primary/port) -"bqh" = ( -/obj/structure/chair/comfy/beige{ +"bqd" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plasteel/grimy, +/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bqe" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bqf" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bqg" = ( +/obj/docking_port/stationary{ + dir = 2; + 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/floor/plating, +/area/hallway/primary/port) +"bqh" = ( +/turf/open/floor/plating, /area/hallway/primary/port) "bqi" = ( -/obj/machinery/vending/cola/random, -/obj/machinery/newscaster{ - pixel_x = -28; - pixel_y = 1 - }, -/turf/open/floor/plasteel/dark, +/obj/structure/sign/warning/docking, +/turf/closed/wall, /area/hallway/primary/port) "bqj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bqk" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bql" = ( @@ -36074,69 +36072,44 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bso" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bsp" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/newscaster{ - pixel_x = 28; - pixel_y = 1 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) -"bsq" = ( -/obj/structure/chair/comfy/beige{ +/obj/effect/turf_decal/stripes/line{ dir = 4 }, -/turf/open/floor/plasteel/grimy, -/area/hallway/primary/port) -"bsr" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/carpet, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"bsp" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) +"bsq" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bsr" = ( +/turf/open/floor/plating, /area/hallway/primary/port) "bss" = ( -/obj/structure/chair/comfy/beige{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/plating, /area/hallway/primary/port) "bst" = ( -/obj/machinery/vending/snack/random, -/turf/open/floor/plasteel/dark, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, /area/hallway/primary/port) "bsu" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -36145,7 +36118,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bsw" = ( @@ -36917,58 +36892,47 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "btU" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-08" - }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/plating, /area/hallway/primary/port) "btV" = ( -/obj/structure/chair/comfy/beige{ - dir = 1 - }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/plating, /area/hallway/primary/port) "btW" = ( -/obj/item/twohanded/required/kirbyplants{ - icon_state = "plant-03" - }, -/turf/open/floor/plasteel/grimy, +/turf/open/floor/plating, /area/hallway/primary/port) "btX" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/airlock/external{ + name = "Arrival Airlock"; + safety_mode = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"btY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 }, /obj/machinery/camera{ c_tag = "Port Primary Hallway - Port"; dir = 4 }, -/turf/open/floor/plasteel/dark, -/area/hallway/primary/port) -"btY" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/plasteel, /area/hallway/primary/port) "btZ" = ( /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bua" = ( @@ -37767,18 +37731,12 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bvJ" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bvK" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -37786,101 +37744,41 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bvL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bvM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) -"bvN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bvO" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bvP" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bvQ" = ( -/obj/machinery/navbeacon{ - codes_txt = "patrol;next_patrol=6-Port-Central"; - location = "5-Customs" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"bvM" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) +"bvN" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bvO" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bvP" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) +"bvQ" = ( +/turf/open/floor/plating, /area/hallway/primary/port) "bvR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bvS" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bvT" = ( /obj/structure/disposalpipe/segment{ @@ -37892,25 +37790,26 @@ /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) "bvU" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bvV" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "bvW" = ( @@ -38635,7 +38534,7 @@ c_tag = "Arrivals - Middle Arm - Far"; dir = 1 }, -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_y = -32 }, /obj/effect/turf_decal/stripes/line, @@ -38682,6 +38581,7 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bxA" = ( @@ -38697,163 +38597,77 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/blue, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bxC" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, +/turf/open/floor/plasteel, /area/hallway/secondary/entry) "bxD" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bxE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 }, -/obj/item/radio/intercom{ - name = "Station Intercom (General)"; - pixel_y = -25 +/obj/machinery/door/airlock/external{ + name = "Arrival Airlock"; + safety_mode = 1 }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/plasteel/white/corner, +/turf/open/floor/plating, /area/hallway/secondary/entry) "bxF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/landmark/event_spawn, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxG" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/machinery/firealarm{ - pixel_y = -24 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/obj/machinery/status_display{ - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxI" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxJ" = ( -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxK" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/hallway/primary/port) "bxL" = ( -/obj/structure/sign/map/left{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-left-MS"; - pixel_y = -32 +/obj/structure/sign/warning/vacuum/external{ + pixel_y = 32 }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/vending/coffee, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"bxM" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) -"bxM" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/sign/map/right{ - desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; - icon_state = "map-right-MS"; - pixel_y = -32 - }, -/obj/effect/turf_decal/tile/neutral, -/obj/effect/turf_decal/tile/neutral{ +/obj/effect/turf_decal/stripes/line{ dir = 8 }, /turf/open/floor/plasteel, @@ -38862,15 +38676,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 4 }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/open/floor/plasteel, /area/hallway/primary/port) @@ -39736,34 +39552,34 @@ /turf/open/floor/plasteel/dark, /area/aisat) "bzw" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/obj/machinery/newscaster{ + pixel_x = 28; + pixel_y = 1 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/machinery/door/airlock{ - name = "Port Emergency Storage" - }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) "bzx" = ( /turf/closed/wall, /area/security/vacantoffice) "bzy" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, -/area/security/vacantoffice) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) "bzz" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/grunge/abandoned{ - name = "Vacant Office"; - req_access_txt = "32" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/hallway/primary/port) "bzA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -40446,36 +40262,57 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/effect/turf_decal/tile/blue{ - dir = 4 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/plasteel/white/corner, +/turf/open/floor/plasteel, /area/hallway/secondary/entry) "bBe" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/maintenance/port) -"bBf" = ( -/obj/structure/table/wood, -/obj/machinery/light_switch{ - pixel_x = -28 +/obj/machinery/light{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/folder, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bBf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bBg" = ( /turf/open/floor/wood, /area/security/vacantoffice) "bBh" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bBi" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -40488,22 +40325,27 @@ }, /area/maintenance/starboard) "bBk" = ( -/obj/structure/table/wood, -/obj/item/camera_film{ - pixel_y = 9 +/obj/effect/turf_decal/tile/neutral{ + dir = 1 }, -/obj/item/camera_film{ - pixel_x = -3; - pixel_y = 5 +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bBl" = ( -/obj/structure/urinal{ - pixel_y = 29 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/plating, -/area/crew_quarters/toilet/auxiliary) +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "bBm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -41180,38 +41022,36 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "bCH" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ - dir = 1 - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bCI" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"bCJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/plating, -/area/maintenance/port) -"bCJ" = ( -/obj/item/storage/toolbox/emergency, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, -/turf/open/floor/plating{ - icon_state = "panelscorched" - }, -/area/maintenance/port) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bCK" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -41220,45 +41060,77 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bCL" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/turf/open/floor/wood, -/area/security/vacantoffice) -"bCM" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, -/area/security/vacantoffice) -"bCN" = ( -/obj/structure/chair/office/dark{ +/obj/effect/turf_decal/tile/neutral{ dir = 8 }, -/turf/open/floor/wood, -/area/security/vacantoffice) -"bCP" = ( -/obj/machinery/light/small, -/obj/machinery/camera{ - c_tag = "Auxilary Restrooms"; - dir = 4 - }, -/turf/open/floor/plating, -/area/crew_quarters/toilet/auxiliary) -"bCQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 6 +/obj/machinery/firealarm{ + pixel_y = -24 }, /turf/open/floor/plasteel, -/area/crew_quarters/toilet/auxiliary) -"bCR" = ( +/area/hallway/primary/port) +"bCM" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 9 + dir = 4 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/item/radio/intercom{ + pixel_y = -28 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bCN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/machinery/power/apc{ + areastring = "/area/hallway/secondary/entry"; + dir = 8; + name = "Arrivals APC"; + pixel_x = -26 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"bCP" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/structure/sign/map/right{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-right-MS"; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) +"bCQ" = ( +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"bCR" = ( /obj/machinery/power/apc/highcap/five_k{ areastring = "/area/crew_quarters/toilet/auxiliary"; name = "Auxiliary Restrooms APC"; pixel_y = -24 }, /obj/structure/cable/yellow, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 5 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bCS" = ( @@ -41266,6 +41138,9 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 10 + }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bCV" = ( @@ -41901,54 +41776,57 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "bEn" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_x = 32 }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) -"bEo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/item/storage/box/lights/mixed, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"bEo" = ( +/obj/machinery/door/airlock{ + name = "Port Emergency Storage" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/port) "bEp" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/machinery/door/firedoor, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "bEq" = ( -/obj/structure/light_construct{ - dir = 8 - }, -/turf/open/floor/wood, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/closed/wall, /area/security/vacantoffice) "bEs" = ( +/obj/structure/table/wood, /obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, -/obj/structure/table/wood, -/turf/open/floor/carpet, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/open/floor/wood, /area/security/vacantoffice) "bEt" = ( -/obj/machinery/door/airlock{ - id_tag = "AuxShower"; - name = "Shower" - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/firedoor, /turf/open/floor/plasteel, -/area/crew_quarters/toilet/auxiliary) +/area/hallway/primary/port) "bEu" = ( /obj/machinery/door/airlock{ id_tag = "AuxToilet2"; @@ -42960,20 +42838,18 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bGj" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/door/firedoor, /obj/structure/cable/yellow{ - icon_state = "2-4" + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/wood, -/area/security/vacantoffice) +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bGk" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 + icon_state = "1-2" }, /turf/open/floor/wood, /area/security/vacantoffice) @@ -42989,13 +42865,13 @@ specialfunctions = 4 }, /obj/item/soap/nanotrasen, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bGm" = ( -/obj/machinery/shower{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bGp" = ( @@ -43596,9 +43472,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bHI" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -43606,35 +43479,39 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bHJ" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/plating{ - icon_state = "platingdmg1" +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/machinery/light/small{ + dir = 4 }, +/turf/open/floor/plating, /area/maintenance/port) "bHK" = ( -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = -3; - pixel_y = 5 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on{ + dir = 1 }, -/obj/structure/table/wood, /turf/open/floor/wood, /area/security/vacantoffice) "bHL" = ( /obj/structure/chair/comfy/black{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/carpet, /area/security/vacantoffice) "bHM" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, /obj/structure/table/wood, -/turf/open/floor/carpet, +/turf/open/floor/wood, /area/security/vacantoffice) "bHN" = ( /obj/machinery/shower{ @@ -43643,6 +43520,7 @@ /obj/machinery/light/small, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/blood/gibs/old, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) "bHO" = ( @@ -44347,10 +44225,9 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bJj" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, @@ -44379,41 +44256,33 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "bJo" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bJp" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;27;37" +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/port) +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "bJq" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/item/storage/box/lights/mixed, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, /turf/open/floor/plating, /area/maintenance/port) "bJr" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, -/obj/effect/landmark/event_spawn, +/obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/maintenance/port) "bJs" = ( @@ -44427,27 +44296,35 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; pixel_x = -29 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/wood, /area/security/vacantoffice) "bJu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 9 - }, /turf/open/floor/wood, /area/security/vacantoffice) "bJv" = ( -/obj/item/folder/blue, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, /obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, /turf/open/floor/carpet, /area/security/vacantoffice) "bJw" = ( -/obj/structure/chair/office/dark{ +/obj/structure/chair/office{ dir = 8 }, /turf/open/floor/carpet, @@ -44457,6 +44334,15 @@ dir = 8; pixel_x = 24 }, +/obj/structure/table/wood, +/obj/item/camera_film{ + pixel_x = 6; + pixel_y = 7 + }, +/obj/item/camera_film{ + pixel_x = -3; + pixel_y = 5 + }, /turf/open/floor/wood, /area/security/vacantoffice) "bJy" = ( @@ -45181,9 +45067,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bKW" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/firealarm{ dir = 8; pixel_x = 24 @@ -45195,19 +45078,24 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, -/turf/open/floor/plasteel/white/corner, -/area/hallway/secondary/entry) -"bKX" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/open/floor/plating{ - icon_state = "platingdmg2" +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) +"bKX" = ( +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "12;27;37" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, /area/maintenance/port) "bKY" = ( /obj/machinery/power/apc{ - areastring = "/area/security/vacantoffice"; + areastring = "/area/vacant_room/office"; dir = 8; name = "Vacant Office APC"; pixel_x = -25 @@ -45929,7 +45817,6 @@ dir = 4 }, /obj/item/radio/intercom{ - name = "Station Intercom (General)"; pixel_y = -25 }, /obj/effect/turf_decal/stripes/line, @@ -45948,26 +45835,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bMz" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bMA" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/structure/sign/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; @@ -45976,15 +45859,15 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bMB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, /obj/structure/sign/map/right{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-right-MS"; @@ -45999,10 +45882,13 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "bMC" = ( -/obj/structure/chair/office/dark, +/obj/structure/chair/office, /turf/open/floor/wood, /area/security/vacantoffice) "bMD" = ( @@ -46265,15 +46151,19 @@ /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bNd" = ( -/obj/item/tank/internals/air, -/obj/item/tank/internals/air, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/turf/open/floor/plating, -/area/maintenance/port) +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Port Primary Hallway - Mining Shuttle"; + dir = 1 + }, +/obj/effect/landmark/event_spawn, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bNe" = ( /obj/structure/table/wood, /obj/item/phone{ @@ -46317,15 +46207,17 @@ /turf/open/floor/wood, /area/bridge/showroom/corporate) "bNh" = ( -/obj/structure/table/wood, -/obj/item/folder/red, -/obj/item/pen/red, -/obj/machinery/newscaster{ - pixel_x = 30; - pixel_y = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bNi" = ( /obj/structure/window/reinforced{ dir = 8 @@ -46595,17 +46487,12 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "bNK" = ( -/obj/item/paper_bin{ - pixel_x = -2; - pixel_y = 6 +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/structure/table/wood, -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/wood, -/area/security/vacantoffice) +/turf/open/floor/plasteel, +/area/hallway/primary/port) "bNL" = ( /obj/structure/table, /obj/item/stock_parts/subspace/transmitter, @@ -46769,10 +46656,10 @@ /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;27" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port) "bOf" = ( @@ -47469,15 +47356,15 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "bPC" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/port) "bPD" = ( @@ -47497,31 +47384,30 @@ /turf/open/floor/plating, /area/maintenance/port) "bPG" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/plating, /area/maintenance/port) "bPH" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 4 - }, /obj/item/trash/candy, /turf/open/floor/plating, /area/maintenance/port) "bPI" = ( -/obj/machinery/door/airlock/maintenance/abandoned{ +/obj/machinery/door/airlock/maintenance{ name = "Vacant Office Maintenance"; req_access_txt = "32" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, -/area/maintenance/port) +/area/security/vacantoffice) "bPJ" = ( /obj/structure/rack, /obj/item/clothing/mask/horsehead, +/obj/effect/spawner/lootdrop/costume, /turf/open/floor/plating, /area/maintenance/port) "bPK" = ( @@ -48020,6 +47906,9 @@ dir = 8; pixel_x = 24 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "bQQ" = ( @@ -48106,6 +47995,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/port) "bRe" = ( @@ -48746,23 +48636,25 @@ /turf/open/floor/engine/plasma, /area/engine/atmos) "bSn" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/plating, /area/maintenance/port) "bSo" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /turf/open/floor/plating, /area/maintenance/port) "bSp" = ( @@ -48775,13 +48667,13 @@ /turf/open/floor/plating, /area/maintenance/port) "bSq" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/port) "bSr" = ( @@ -48806,12 +48698,12 @@ /turf/open/floor/plating, /area/maintenance/port) "bSt" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -79692,6 +79584,9 @@ /obj/structure/sign/poster/official/random{ pixel_y = 32 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/primary/port) "dhQ" = ( @@ -79769,14 +79664,14 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "dhZ" = ( -/obj/structure/urinal{ - pixel_y = 29 +/obj/effect/turf_decal/tile/neutral{ + dir = 4 }, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/open/floor/plating, -/area/crew_quarters/toilet/auxiliary) +/turf/open/floor/plasteel, +/area/hallway/primary/port) "dib" = ( /obj/structure/table/wood, /obj/item/lipstick{ @@ -79796,9 +79691,6 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "dic" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/light{ dir = 4 }, @@ -79808,14 +79700,18 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) "did" = ( /obj/structure/table/wood, -/obj/item/folder, -/obj/structure/sign/poster/official/random{ - pixel_x = -32 +/obj/machinery/light_switch{ + pixel_x = -28 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/item/folder, /turf/open/floor/wood, /area/security/vacantoffice) "dif" = ( @@ -79830,9 +79726,11 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "dig" = ( -/obj/structure/sign/poster/official/random{ - pixel_x = 32 +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 }, +/obj/structure/table/wood, /turf/open/floor/wood, /area/security/vacantoffice) "dih" = ( @@ -80428,14 +80326,20 @@ /turf/open/space/basic, /area/space) "djW" = ( -/obj/structure/table/wood, -/obj/item/clipboard, -/obj/item/paper, -/obj/structure/sign/poster/official/random{ - pixel_y = 32 +/obj/machinery/light{ + dir = 1 }, -/turf/open/floor/wood, -/area/security/vacantoffice) +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "djX" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ @@ -80663,6 +80567,12 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/science/mixing) +"drp" = ( +/obj/item/folder/blue, +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/carpet, +/area/security/vacantoffice) "drQ" = ( /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -81830,6 +81740,10 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) +"eiS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/turf/open/floor/plasteel, +/area/crew_quarters/toilet/auxiliary) "eoK" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -81943,6 +81857,13 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"ghM" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "gnZ" = ( /obj/item/radio/intercom{ pixel_y = -30 @@ -82035,6 +81956,10 @@ }, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) +"heE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/wood, +/area/security/vacantoffice) "hvt" = ( /obj/structure/kitchenspike_frame, /obj/effect/decal/cleanable/blood/gibs/old, @@ -82107,6 +82032,13 @@ /obj/structure/table, /turf/open/floor/plating, /area/maintenance/port/aft) +"iSt" = ( +/obj/machinery/door/airlock/grunge, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/security/vacantoffice) "jeV" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -82156,6 +82088,18 @@ }, /turf/open/floor/plating, /area/maintenance/solars/port/aft) +"jBe" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "jKK" = ( /obj/machinery/door/airlock/external{ req_access_txt = "13" @@ -82181,6 +82125,19 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"jPu" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "kfu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -82248,6 +82205,19 @@ }, /turf/open/floor/plasteel/white, /area/science/circuit) +"kQP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/airalarm{ + dir = 1; + pixel_y = -22 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "kVo" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82281,6 +82251,9 @@ /obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/circuit) +"lws" = ( +/turf/open/floor/carpet, +/area/security/vacantoffice) "lzk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ @@ -82339,6 +82312,32 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"maP" = ( +/obj/item/storage/toolbox/emergency, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/maintenance/port) +"mcS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/sign/map/left{ + desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; + icon_state = "map-left-MS"; + pixel_y = -32 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "mjJ" = ( /obj/machinery/nuclearbomb/beer{ pixel_x = 2; @@ -82373,6 +82372,16 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"mEe" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/spawner/lootdrop/maintenance, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "mWg" = ( /obj/structure/girder, /obj/structure/grille, @@ -82380,6 +82389,20 @@ icon_state = "panelscorched" }, /area/maintenance/port/aft) +"nhy" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "nnK" = ( /obj/item/stack/sheet/glass/fifty, /obj/item/paper_bin, @@ -82430,6 +82453,13 @@ }, /turf/open/floor/plasteel, /area/construction/storage/wing) +"nWb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "nXA" = ( /obj/structure/rack{ icon = 'icons/obj/stationobjs.dmi'; @@ -82515,10 +82545,10 @@ /obj/docking_port/stationary{ dir = 2; dwidth = 11; - height = 15; + height = 22; id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Port"; - width = 28 + width = 35 }, /turf/open/space/basic, /area/space) @@ -82531,6 +82561,10 @@ /obj/item/pen, /turf/open/floor/plasteel/white, /area/science/circuit) +"oWR" = ( +/obj/effect/spawner/lootdrop/maintenance, +/turf/open/floor/plating, +/area/maintenance/port) "oXn" = ( /obj/machinery/computer/cryopod{ dir = 4; @@ -82595,6 +82629,10 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"pHS" = ( +/obj/structure/closet/firecloset, +/turf/open/floor/plating, +/area/maintenance/port) "pMX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -82627,6 +82665,12 @@ }, /turf/open/floor/plating, /area/maintenance/aft) +"pZb" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/wood, +/area/security/vacantoffice) "qhe" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -82711,6 +82755,12 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"rbE" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) "roa" = ( /obj/structure/chair/stool, /obj/machinery/light/small{ @@ -82746,6 +82796,22 @@ /obj/machinery/status_display/supply, /turf/closed/wall, /area/quartermaster/miningoffice) +"rNX" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/navbeacon{ + codes_txt = "patrol;next_patrol=6-Port-Central"; + location = "5-Customs" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "rQK" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82792,6 +82858,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"syk" = ( +/obj/machinery/door/airlock{ + id_tag = "AuxShower"; + name = "Shower" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/crew_quarters/toilet/auxiliary) "sFv" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -82850,6 +82926,34 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"tre" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel/white/corner, +/area/hallway/secondary/entry) "tsx" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -82911,6 +83015,16 @@ "urv" = ( /turf/closed/wall/mineral/plastitanium, /area/security/prison) +"usf" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "usx" = ( /obj/machinery/status_display/supply, /turf/closed/wall, @@ -83026,6 +83140,12 @@ /obj/structure/lattice, /turf/open/floor/plating, /area/space/nearstation) +"wdO" = ( +/obj/structure/chair/comfy/black{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/security/vacantoffice) "wgw" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -83040,6 +83160,11 @@ }, /turf/open/floor/plating, /area/security/prison) +"wlH" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/reagent_dispensers/fueltank, +/turf/open/floor/plasteel, +/area/maintenance/port) "wmt" = ( /obj/effect/decal/cleanable/flour, /turf/open/floor/plating, @@ -83095,11 +83220,25 @@ /obj/machinery/light, /turf/open/floor/plasteel/dark, /area/crew_quarters/cryopod) +"xfI" = ( +/obj/machinery/vending/cola/random, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xkG" = ( /obj/item/integrated_electronics/wirer, /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, /area/science/circuit) +"xmb" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/hallway/primary/port) "xse" = ( /obj/machinery/door/airlock/external{ name = "Solar Maintenance"; @@ -83140,6 +83279,21 @@ /obj/structure/chair/comfy, /turf/open/floor/plasteel, /area/science/misc_lab) +"xDn" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/port) "xEf" = ( /obj/structure/table, /obj/item/flashlight/lamp{ @@ -83156,6 +83310,27 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"xLL" = ( +/obj/structure/table/wood, +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/wood, +/area/security/vacantoffice) +"xTV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/port) "xVl" = ( /turf/closed/wall, /area/hallway/secondary/service) @@ -93854,9 +94029,9 @@ aaa aaa aaa aaa -djz +btX bsk -djC +bxE aVu bxu aRA @@ -95653,9 +95828,9 @@ aaa aaa aaa aaa -djz +btX bsk -djC +bxE bvH bMw aRA @@ -95913,7 +96088,7 @@ aaa aVs aVs aVs -bvH +bBl bxz aRA bBc @@ -96172,19 +96347,19 @@ aVs btR bvI bxA -biu +bCN bbI bbI bbI bbI bbI -bjV +nWb btT bMA alK bPD asa -alK +pHS aaa aaa aaf @@ -96394,7 +96569,7 @@ dne auD avL awM -dnk +ako dqe doA dnk @@ -96426,10 +96601,10 @@ aVs aRA aRA aRA -btS +bxL bvJ bxB -biv +bCQ bBd bCH bEn @@ -96686,13 +96861,13 @@ bbI btT bvK bxC -alK -alK -alK -alK -alK -alK +bEp bJp +rbE +alK +alK +alK +alK alK alK alK @@ -96940,21 +97115,21 @@ blT bnL bqc bso -bnL +bso bvL bxD bzw -bvY +tre bCI bEo bJj -bzC +xTV bJq bKX bbL bbL bPG -bxT +usf bSn bTo bUO @@ -97194,25 +97369,25 @@ bbK biw bjX blU -bnM -bqd -bsp -bnM -bvM -bxE +baE +baE +bzz +bzz +bzz +baE +baE +jPu +bCJ alK auF -bCJ -bEp -alK -apz +maP bJr -alC +alK aqK aqO -bPF +alC aGN -asa +bSo bTp bUP bVS @@ -97451,24 +97626,24 @@ bgw bix bjY blV -baE -baE -baE -baE -bvN -bjY -alK -bBe +bqi +bxK +bxK +bxK +bxK +bxK +bqi +djW bNd -ako alK +wlH bHJ -bJs -aLd -aLd -aLd +pHS +alK +oWR +aob bPH -aLd +aob bSo bTn bTn @@ -97708,15 +97883,15 @@ bgx biy bjZ blW -bnN -bqe -bsq -btU -bvO -bxF -bzx -bzx -bzx +bzz +bxK +bxK +bxK +bxK +bxK +bzz +bBk +kQP bzx bzx bzx @@ -97726,7 +97901,7 @@ bzx bzx bzx alC -cgH +mEe alK aob aob @@ -97965,14 +98140,14 @@ bgy biz bka blX -bnO -bqf -bqf -btV -bvP -bxG -bzy -bBf +bzz +bxK +bxK +bxK +bxK +bxK +bzz +bBk bCL bEq did @@ -98220,27 +98395,27 @@ bda beO bgz biA -bka +bnR blY bnP bqg -bsr -bnP -bvQ -bxH +bxK +bxK +bxK +bxK +bzz +rNX +jBe bzx bBg -bBg -bBg -bGj -bBh +pZb bJu bKZ bMC din bzx auF -bSr +bSo alK bJs bVU @@ -98479,25 +98654,25 @@ bgA biz bkb blZ -bnO -bqf -bqf -btV -bvR -bxI +bzz +bxK +bxK +bxK +bxK +bxK bzz bBh -bBh -bBh +xmb +iSt bGk +bKZ bHL -bHL -bBg +wdO bBg bOg bzx aoa -bSr +bSo alK bUR alK @@ -98736,25 +98911,25 @@ bpt bcW bkc bma -bnQ -bqh -bss -btW -bvS -bxJ -bzx -bBi +bzz +bxK +bxK +bxK +bxK +bxK +bzz +bBk bCM -bBg -bBg +bzx +bzx bHM bJv -bBg -bBg -bBg +drp +heE +heE bPI bRd -bSr +ghM alK alK alK @@ -98992,26 +99167,26 @@ beR bbK bcW dhP -blV -baE -baE -baE -baE -bvN +bqd +bqi bxK -bzx +bxK +bxK +bxK +bxK +bqi djW -bCN -bBg -bBg +bsx +xfI +bzx bEs bJw -bBg +lws bMC -bOg +xLL bzx bRe -bSs +xDn aSO bUS bVV @@ -99250,17 +99425,17 @@ bgC biB bkd bmb -bnR -bqi -bst -btX -bvO -bxL -bzx +baE +baE +bzz +baE +bzz +baE +baE bBk bNh bNK -bBg +bzx dig bJx bLa @@ -99508,15 +99683,15 @@ biC bke bmc bnS -bqj -bsu +bvU +bxM btY bvU bxM -bzx -bzx -bzx -bzx +bEt +nhy +mcS +bvW bzx bzx bzx @@ -99525,7 +99700,7 @@ bzx bzx bzx alK -bSr +bSo dux bUT bVW @@ -99770,7 +99945,7 @@ bsv btZ bvV bxN -bvW +bGj dhZ bCP bvW @@ -99782,7 +99957,7 @@ bME bOi bPJ alK -cgH +mEe dux iLj dvt @@ -100028,9 +100203,9 @@ baE bvW bxO bvW -bBl -bCQ -bEt +bvW +bvW +bvW bGm bHO bvW @@ -100288,7 +100463,7 @@ bzA bBm bCR bvW -bvW +syk bvW bvW bLd @@ -100544,7 +100719,7 @@ bxQ bzB bBn bCS -bBn +eiS bQN dih bvW diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 99c536bd3c..7f2da8f7d3 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -26,9 +26,7 @@ /area/lavaland/surface/outdoors) "af" = ( /obj/structure/necropolis_gate/legion_gate, -/obj/structure/necropolis_arch{ - pixel_y = -40 - }, +/obj/structure/necropolis_arch, /obj/structure/stone_tile/slab, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) @@ -76,6 +74,17 @@ "an" = ( /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors) +"ao" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "Labor Camp APC"; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/mine/laborcamp) "ap" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -166,7 +175,6 @@ "aE" = ( /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; - dir = 2; name = "Prison Intercom (General)"; pixel_y = 24; prison_radio = 1 @@ -273,9 +281,17 @@ }, /turf/closed/wall, /area/mine/laborcamp) +"aV" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "aW" = ( /obj/machinery/conveyor{ - dir = 2; id = "gulag" }, /turf/open/floor/plating, @@ -318,6 +334,9 @@ c_tag = "Labor Camp Central"; network = list("labor") }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/plasteel, /area/mine/laborcamp) "bc" = ( @@ -327,16 +346,12 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "bd" = ( -/obj/machinery/mineral/processing_unit_console{ - dir = 2; - machinedir = 4 - }, +/obj/machinery/mineral/processing_unit_console, /turf/closed/wall, /area/mine/laborcamp) "be" = ( /obj/machinery/mineral/processing_unit{ - dir = 1; - output_dir = 2 + dir = 1 }, /turf/open/floor/plating, /area/mine/laborcamp) @@ -348,7 +363,9 @@ /turf/open/floor/plating, /area/mine/eva) "bh" = ( -/obj/machinery/computer/shuttle/labor/one_way, +/obj/machinery/computer/shuttle/labor/one_way{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/laborcamp) "bi" = ( @@ -356,7 +373,7 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "bj" = ( -/obj/machinery/status_display{ +/obj/machinery/status_display/evac{ pixel_y = 32 }, /turf/open/floor/plasteel, @@ -472,6 +489,10 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) +"bw" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/mine/laborcamp/security) "bx" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -482,41 +503,34 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "by" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"bz" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, /obj/structure/cable{ icon_state = "2-4" }, /turf/open/floor/plasteel, -/area/mine/laborcamp) -"bz" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/mine/laborcamp) +/area/mine/production) "bA" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Backroom"; - req_access_txt = "2" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, +/turf/closed/wall/r_wall, /area/mine/laborcamp) "bB" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Labor Camp APC"; - pixel_y = 24 +/obj/structure/toilet{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/light/small{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/open/floor/plasteel, -/area/mine/laborcamp) +/turf/open/floor/plating, +/area/mine/laborcamp/security) "bC" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -593,25 +607,18 @@ /turf/open/floor/plasteel, /area/mine/eva) "bL" = ( -/obj/machinery/door/airlock/security/glass{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/airlock/highsecurity{ name = "Labor Camp Monitoring"; - req_access_txt = "2" - }, -/obj/structure/cable{ - icon_state = "1-2" + req_access_txt = "2"; + security_level = 6 }, /turf/open/floor/plasteel, /area/mine/laborcamp) "bM" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" - }, -/obj/structure/cable{ - icon_state = "1-10" - }, -/turf/open/floor/plating, -/area/mine/laborcamp) +/turf/closed/wall, +/area/mine/laborcamp/security) "bN" = ( /obj/structure/sign/warning/docking, /obj/effect/spawner/structure/window/reinforced, @@ -628,31 +635,22 @@ /turf/open/floor/plasteel, /area/mine/production) "bQ" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel, -/area/mine/production) -"bR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/cable{ - icon_state = "4-8" - }, /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/open/floor/plasteel, -/area/mine/production) -"bS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/mine/production) +"bR" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Station EVA"; req_access_txt = "54" @@ -660,28 +658,25 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel, -/area/mine/eva) -"bT" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/cable{ icon_state = "4-8" }, +/turf/open/floor/plasteel, +/area/mine/eva) +"bS" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/turf/open/floor/plasteel, -/area/mine/eva) -"bU" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, /obj/structure/cable{ @@ -689,6 +684,32 @@ }, /turf/open/floor/plasteel, /area/mine/eva) +"bT" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "Labor Camp Security APC"; + pixel_y = 23 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"bU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/mine/eva) "bV" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -727,20 +748,24 @@ /turf/closed/mineral/random/volcanic, /area/lavaland/surface/outdoors/explored) "ca" = ( -/turf/closed/wall, +/turf/closed/wall/r_wall, /area/mine/laborcamp/security) "cb" = ( -/obj/structure/table, -/obj/machinery/recharger, -/obj/machinery/light/small{ +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/structure/table, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cc" = ( -/obj/structure/chair/office/dark, -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/red{ + dir = 1 }, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "Powered by the tears and sweat of laborers."; @@ -749,51 +774,57 @@ /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cd" = ( -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/obj/machinery/power/apc{ - dir = 4; - name = "Labor Camp Security APC"; - pixel_x = 24 - }, -/obj/machinery/camera{ - c_tag = "Labor Camp Monitoring"; - network = list("labor") - }, -/obj/structure/cable{ - icon_state = "0-8" +/obj/effect/turf_decal/tile/red{ + dir = 1 }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "ce" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "5-6" - }, -/turf/open/floor/plating, -/area/mine/laborcamp) -"cf" = ( -/obj/machinery/power/terminal, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/mine/laborcamp) -"cg" = ( -/obj/machinery/light/small{ +/obj/machinery/computer/secure_data, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plating, -/area/mine/laborcamp) +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"cf" = ( +/obj/machinery/computer/security/labor, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"cg" = ( +/obj/machinery/computer/prisoner, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "ch" = ( -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"ci" = ( +/obj/machinery/power/apc{ + name = "Mining EVA APC"; + pixel_x = 1; + pixel_y = -23 + }, +/obj/machinery/recharge_station, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/cable, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/plasteel, +/area/mine/eva) "cj" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -815,12 +846,24 @@ /turf/open/floor/plasteel, /area/mine/production) "cl" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"cm" = ( +/obj/machinery/mech_bay_recharge_port, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/mine/eva) +"cn" = ( +/obj/effect/turf_decal/tile/purple{ dir = 4 }, /turf/open/floor/plasteel, /area/mine/production) -"cm" = ( +"co" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -829,39 +872,28 @@ }, /turf/open/floor/plasteel, /area/mine/production) -"cn" = ( -/obj/effect/turf_decal/tile/purple{ - dir = 4 +"cp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 }, -/turf/open/floor/plasteel, -/area/mine/production) -"co" = ( -/obj/machinery/power/apc{ - dir = 2; - name = "Mining EVA APC"; - pixel_x = 1; - pixel_y = -23 - }, -/obj/structure/cable, -/obj/machinery/recharge_station, -/obj/effect/turf_decal/tile/purple{ +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, -/area/mine/eva) -"cp" = ( -/obj/machinery/mech_bay_recharge_port, -/obj/structure/cable, -/turf/open/floor/plating, -/area/mine/eva) +/area/mine/laborcamp/security) "cq" = ( /turf/open/floor/mech_bay_recharge_floor, /area/mine/eva) "cr" = ( -/obj/machinery/computer/mech_bay_power_console, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/computer/mech_bay_power_console{ + dir = 1 + }, /turf/open/floor/plasteel, /area/mine/eva) "cs" = ( @@ -887,47 +919,60 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cw" = ( -/obj/machinery/computer/secure_data, +/obj/machinery/vending/security{ + !INVALID_VAR! = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cx" = ( -/obj/machinery/computer/security{ - name = "Labor Camp Monitoring"; - network = list("labor") - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cy" = ( -/obj/machinery/computer/prisoner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"cz" = ( +/obj/structure/table, +/obj/item/storage/fancy/donut_box, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) -"cz" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/mine/laborcamp) "cA" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "0-9" - }, -/turf/open/floor/plating, -/area/mine/laborcamp) +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cB" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cC" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/item/paper_bin, +/obj/item/pen, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cD" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -935,12 +980,18 @@ /turf/open/floor/plasteel, /area/mine/production) "cE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/mine/production) +/area/mine/laborcamp/security) "cF" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -949,8 +1000,17 @@ /turf/open/floor/plasteel, /area/mine/production) "cG" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/closet/secure_closet/freezer/gulag_fridge, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/mine/laborcamp/security) "cH" = ( /obj/effect/turf_decal/tile/purple{ @@ -985,9 +1045,9 @@ /turf/closed/wall, /area/mine/living_quarters) "cN" = ( -/obj/structure/sign/warning/electricshock, -/turf/closed/wall, -/area/mine/living_quarters) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) "cO" = ( /obj/item/radio/intercom{ dir = 8; @@ -1020,31 +1080,44 @@ /turf/open/floor/plating, /area/mine/living_quarters) "cS" = ( -/obj/machinery/power/smes{ - charge = 5e+006 +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/camera{ + c_tag = "Labor Camp Security Office"; + dir = 1; + network = list("labor") }, -/turf/open/floor/plating, -/area/mine/living_quarters) -"cT" = ( /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/light/small{ +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"cT" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 1 }, -/obj/structure/closet/crate/secure/loot, -/turf/open/floor/plating, -/area/mine/living_quarters) -"cU" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/turf_decal/tile/red{ + dir = 8 }, -/turf/open/floor/plating, -/area/mine/living_quarters) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"cU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Monitoring"; + req_access_txt = "2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cV" = ( /turf/open/floor/plating, /area/mine/living_quarters) @@ -1053,36 +1126,27 @@ /turf/open/floor/plating, /area/mine/living_quarters) "cX" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "Mining Station Starboard Wing APC"; - pixel_x = -27; - pixel_y = 2 +/obj/machinery/power/smes{ + charge = 5e+006 }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple{ +/turf/open/floor/plating, +/area/mine/living_quarters) +"cY" = ( +/obj/machinery/light/small{ dir = 1 }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/mine/production) -"cY" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/closet/crate/secure/loot, +/obj/structure/sign/warning/electricshock{ + pixel_y = 32 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/open/floor/plasteel, -/area/mine/production) +/turf/open/floor/plating, +/area/mine/living_quarters) "cZ" = ( /obj/machinery/mineral/equipment_vendor, /obj/effect/turf_decal/tile/brown{ @@ -1095,9 +1159,7 @@ /turf/open/floor/plasteel, /area/mine/production) "da" = ( -/obj/machinery/mineral/mint{ - input_dir = 4 - }, +/obj/machinery/mineral/mint, /turf/open/floor/plasteel, /area/mine/production) "db" = ( @@ -1139,17 +1201,12 @@ /turf/open/floor/circuit, /area/mine/maintenance) "dh" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "2-8" }, -/obj/machinery/power/apc{ - dir = 1; - name = "Mining Communications APC"; - pixel_x = 1; - pixel_y = 25 - }, -/turf/open/floor/plasteel/dark, -/area/mine/maintenance) +/turf/open/floor/plating, +/area/mine/living_quarters) "di" = ( /obj/machinery/telecomms/relay/preset/mining, /obj/machinery/light/small{ @@ -1218,27 +1275,42 @@ /turf/open/floor/plasteel/white, /area/mine/living_quarters) "do" = ( -/obj/machinery/power/terminal{ +/obj/machinery/power/apc{ + dir = 8; + name = "Mining Station Starboard Wing APC"; + pixel_x = -25; + pixel_y = 2 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple{ dir = 1 }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"dp" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "Mining Communications APC"; + pixel_x = 1; + pixel_y = 23 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /obj/structure/cable{ icon_state = "0-2" }, -/turf/open/floor/plating, -/area/mine/living_quarters) -"dp" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plating, -/area/mine/living_quarters) +/turf/open/floor/plasteel/dark, +/area/mine/maintenance) "dq" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 }, /turf/open/floor/plating, /area/mine/living_quarters) @@ -1249,13 +1321,27 @@ /turf/open/floor/plating, /area/mine/living_quarters) "ds" = ( -/obj/machinery/mineral/equipment_vendor, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 4 +/obj/machinery/power/terminal{ + dir = 1 }, -/turf/open/floor/plasteel, -/area/mine/production) +/obj/machinery/power/port_gen/pacman{ + anchored = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"dt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 + }, +/obj/machinery/meter, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) "du" = ( /obj/effect/turf_decal/loading_area, /turf/open/floor/plasteel, @@ -1274,20 +1360,28 @@ /turf/open/floor/plasteel, /area/mine/production) "dx" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/machinery/mineral/equipment_vendor, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 4 }, -/turf/open/floor/circuit, -/area/mine/maintenance) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) "dy" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 6 - }, -/turf/open/floor/plasteel/dark, -/area/mine/maintenance) +/turf/open/floor/plasteel, +/area/mine/living_quarters) "dz" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -1337,10 +1431,16 @@ /turf/open/floor/plasteel/white, /area/mine/living_quarters) "dC" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel/white, /area/mine/living_quarters) "dD" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, /turf/open/floor/plasteel/white, /area/mine/living_quarters) "dE" = ( @@ -1353,36 +1453,34 @@ /turf/open/floor/plasteel/white, /area/mine/living_quarters) "dF" = ( -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/turf/open/floor/plating, -/area/mine/living_quarters) -"dG" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/mine/living_quarters) -"dH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/open/floor/plating, +/turf/open/floor/plasteel, /area/mine/living_quarters) +"dG" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"dH" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/open/floor/circuit, +/area/mine/maintenance) "dI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 + dir = 5 }, /turf/open/floor/plating, /area/mine/living_quarters) @@ -1455,15 +1553,17 @@ /turf/open/floor/plating, /area/mine/production) "dP" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Mining Station Communications"; - req_access_txt = "48" +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 6 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/bluespace_beacon, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/turf/open/floor/plasteel, +/turf/open/floor/plasteel/dark, /area/mine/maintenance) "dQ" = ( /obj/effect/spawner/structure/window, @@ -1474,32 +1574,35 @@ name = "Infirmary" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel/white, /area/mine/living_quarters) "dS" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/machinery/power/port_gen/pacman{ + anchored = 1 }, -/obj/machinery/door/airlock/maintenance{ - name = "Mining Station Maintenance"; - req_access_txt = "48" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/structure/cable, /turf/open/floor/plating, /area/mine/living_quarters) "dT" = ( -/obj/effect/turf_decal/tile/brown{ - dir = 1 +/obj/machinery/atmospherics/components/binary/pump/on, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"dU" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Communications"; + req_access_txt = "48" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" }, /turf/open/floor/plasteel, -/area/mine/production) -"dU" = ( -/obj/effect/turf_decal/tile/purple, -/turf/open/floor/plasteel, -/area/mine/production) +/area/mine/maintenance) "dV" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -1521,7 +1624,6 @@ /area/mine/production) "dY" = ( /obj/machinery/conveyor{ - dir = 2; id = "mining_internal" }, /obj/effect/turf_decal/stripes/line{ @@ -1539,17 +1641,15 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "eb" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Mining Station Maintenance"; + req_access_txt = "48" + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/plasteel, +/turf/open/floor/plating, /area/mine/living_quarters) "ec" = ( /obj/effect/turf_decal/tile/purple{ @@ -1559,9 +1659,10 @@ /area/mine/living_quarters) "ed" = ( /obj/machinery/camera{ - c_tag = "Crew Area Hallway West"; + c_tag = "Crew Area Hallway"; network = list("mine") }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "ee" = ( @@ -1578,20 +1679,27 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "eg" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "Mining Station Port Wing APC"; - pixel_x = 1; - pixel_y = 25 +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/airlock/mining/glass{ + name = "Processing Area"; + req_access_txt = "48" }, /obj/structure/cable{ - icon_state = "0-2" + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" }, /turf/open/floor/plasteel, -/area/mine/living_quarters) +/area/mine/production) "eh" = ( /obj/structure/extinguisher_cabinet{ pixel_x = -5; @@ -1600,15 +1708,14 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "ei" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "Mining Station Port Wing APC"; + pixel_x = 1; + pixel_y = 23 + }, /obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 + icon_state = "0-2" }, /turf/open/floor/plasteel, /area/mine/living_quarters) @@ -1627,12 +1734,11 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "el" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Processing Area"; - req_access_txt = "48" +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 }, /turf/open/floor/plasteel, -/area/mine/living_quarters) +/area/mine/laborcamp) "em" = ( /obj/machinery/light{ dir = 4 @@ -1641,6 +1747,9 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/production) "en" = ( @@ -1649,8 +1758,7 @@ /area/mine/production) "eo" = ( /obj/machinery/mineral/processing_unit{ - dir = 1; - output_dir = 2 + dir = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -1658,19 +1766,62 @@ /turf/open/floor/plating, /area/mine/production) "ep" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "eq" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"er" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"es" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/cable{ icon_state = "1-4" }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"er" = ( +"et" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1679,164 +1830,168 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"es" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) -"et" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "eu" = ( +/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/structure/cable{ + icon_state = "4-8" + }, /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel, /area/mine/living_quarters) "ev" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ - dir = 1 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "ew" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "ex" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Station Bridge"; - req_access_txt = "48" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "ey" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "ez" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/open/floor/plasteel, -/area/mine/production) +/area/mine/living_quarters) "eA" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Station Bridge"; - req_access_txt = "48" +/obj/structure/cable{ + icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/open/floor/plasteel, -/area/mine/production) +/area/mine/living_quarters) "eB" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"eC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"eD" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/production) +"eE" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 }, /obj/effect/turf_decal/tile/brown{ dir = 8 }, -/turf/open/floor/plasteel, -/area/mine/production) -"eC" = ( -/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/mine/production) -"eD" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/mine/production) -"eE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, +/area/mine/living_quarters) +"eF" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/turf/open/floor/plasteel, -/area/mine/production) -"eF" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Processing Area"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/open/floor/plasteel, /area/mine/production) "eG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 }, /turf/open/floor/plasteel, /area/mine/production) @@ -1845,6 +2000,9 @@ dir = 4 }, /obj/effect/turf_decal/tile/purple, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/production) "eI" = ( @@ -1855,6 +2013,9 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, /turf/open/floor/plasteel, /area/mine/production) "eJ" = ( @@ -1873,6 +2034,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "eL" = ( @@ -1887,6 +2049,7 @@ /area/mine/living_quarters) "eN" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "eO" = ( @@ -1903,18 +2066,17 @@ /turf/open/floor/plasteel, /area/mine/production) "eQ" = ( -/obj/machinery/door/airlock/mining{ - name = "Mining Station Storage"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/door/airlock/glass, /turf/open/floor/plasteel, /area/mine/living_quarters) "eR" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/door/airlock/glass{ name = "Break Room" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "eS" = ( @@ -1922,13 +2084,7 @@ dir = 1; pixel_y = -22 }, -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, +/obj/machinery/mineral/equipment_vendor, /turf/open/floor/plasteel, /area/mine/production) "eT" = ( @@ -1951,16 +2107,7 @@ /turf/open/floor/plasteel, /area/mine/production) "eV" = ( -/obj/structure/closet/crate{ - icon_state = "crateopen" - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, +/obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/mine/production) "eW" = ( @@ -1999,27 +2146,18 @@ dir = 4 }, /obj/effect/turf_decal/stripes/corner{ - dir = 4 + dir = 1 }, /turf/open/floor/plating, /area/mine/production) "fa" = ( -/obj/machinery/mineral/equipment_vendor, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 +/obj/machinery/newscaster{ + pixel_y = 32 }, +/obj/structure/chair, /turf/open/floor/plasteel, /area/mine/living_quarters) "fb" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/structure/extinguisher_cabinet{ pixel_x = -5; pixel_y = 30 @@ -2027,6 +2165,10 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/chair, /turf/open/floor/plasteel, /area/mine/living_quarters) "fc" = ( @@ -2040,11 +2182,9 @@ /area/mine/living_quarters) "fd" = ( /obj/machinery/camera{ - c_tag = "Storage"; - dir = 2; + c_tag = "Public Shuttle Lobby"; network = list("mine") }, -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -2052,6 +2192,9 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, +/obj/structure/table, +/obj/item/gps/mining, +/obj/item/gps/mining, /turf/open/floor/plasteel, /area/mine/living_quarters) "fe" = ( @@ -2066,6 +2209,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, /turf/open/floor/carpet, /area/mine/living_quarters) "fg" = ( @@ -2076,6 +2222,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fh" = ( @@ -2088,12 +2237,18 @@ /obj/effect/turf_decal/tile/brown{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fi" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fj" = ( @@ -2112,11 +2267,12 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "fl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "fm" = ( @@ -2142,15 +2298,12 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "fo" = ( -/obj/structure/ore_box, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, -/area/mine/living_quarters) +/area/mine/laborcamp) "fp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -2163,10 +2316,12 @@ name = "Station Intercom (General)"; pixel_x = 28 }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fr" = ( @@ -2184,6 +2339,9 @@ pixel_x = 25; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/mine/living_quarters) "ft" = ( @@ -2199,11 +2357,12 @@ /area/mine/living_quarters) "fu" = ( /obj/structure/chair, -/obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) "fv" = ( @@ -2215,50 +2374,50 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"fw" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "fx" = ( -/obj/structure/ore_box, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) +/turf/closed/mineral/random/labormineral/volcanic, +/area/lavaland/surface/outdoors/explored) "fy" = ( -/obj/machinery/recharge_station, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/mine/living_quarters) +/area/mine/production) "fz" = ( -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, +/obj/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, +/obj/item/flashlight, /turf/open/floor/plasteel, /area/mine/living_quarters) "fA" = ( -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, -/area/mine/living_quarters) +/area/mine/eva) "fB" = ( -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, +/obj/structure/table, +/obj/item/gps/mining, +/obj/item/gps/mining, /turf/open/floor/plasteel, /area/mine/living_quarters) "fC" = ( @@ -2269,6 +2428,9 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fD" = ( @@ -2277,9 +2439,6 @@ pixel_x = 7; pixel_y = 5 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 5 - }, /obj/item/reagent_containers/food/drinks/beer{ pixel_x = -1; pixel_y = 9 @@ -2291,29 +2450,35 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fE" = ( /obj/structure/chair{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 4 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fF" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 8 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fG" = ( @@ -2333,6 +2498,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fI" = ( @@ -2376,7 +2544,7 @@ /area/mine/living_quarters) "fL" = ( /obj/structure/sink{ - dir = 4; + dir = 8; pixel_x = 11 }, /obj/effect/turf_decal/tile/bar, @@ -2396,6 +2564,9 @@ pixel_x = 25; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/mine/living_quarters) "fN" = ( @@ -2403,6 +2574,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fO" = ( @@ -2413,6 +2587,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fP" = ( @@ -2426,6 +2603,9 @@ pixel_x = 25; specialfunctions = 4 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, /turf/open/floor/carpet, /area/mine/living_quarters) "fQ" = ( @@ -2446,6 +2626,24 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"fU" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) "fV" = ( /turf/closed/indestructible/riveted/boss/see_through, /area/lavaland/surface/outdoors) @@ -2454,6 +2652,14 @@ /obj/structure/stone_tile/slab, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) +"fX" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) "gj" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 1 @@ -2582,9 +2788,14 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"gX" = ( +/obj/structure/toilet{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) "gY" = ( /obj/docking_port/stationary{ - area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 2; height = 5; @@ -2639,13 +2850,19 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) -"il" = ( -/obj/machinery/computer/cryopod{ - dir = 4; - pixel_x = -26 +"ie" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" }, /turf/open/floor/plasteel, -/area/mine/laborcamp) +/area/mine/living_quarters) +"il" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/eva) "ir" = ( /obj/structure/stone_tile/slab/cracked{ dir = 5 @@ -2813,6 +3030,15 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"jI" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "jL" = ( /obj/structure/stone_tile/surrounding_tile, /obj/structure/stone_tile/surrounding_tile{ @@ -2835,6 +3061,17 @@ /obj/structure/stone_tile/center/cracked, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"jO" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 7; + id = "lavaland_common_away"; + name = "Mining base public dock"; + width = 7 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "jQ" = ( /obj/structure/stone_tile{ dir = 1 @@ -2870,6 +3107,12 @@ /obj/structure/fluff/drake_statue/falling, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"km" = ( +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "ko" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 @@ -3061,6 +3304,13 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"lB" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) "lD" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 @@ -3104,6 +3354,13 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"lN" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "lP" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 @@ -3141,6 +3398,14 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"lU" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ + dir = 4; + piping_layer = 3 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/mine/living_quarters) "lW" = ( /obj/structure/stone_tile/block/cracked, /obj/structure/stone_tile/block/cracked{ @@ -3176,6 +3441,15 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"mi" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "mk" = ( /obj/structure/stone_tile/block/cracked{ dir = 8 @@ -3541,12 +3815,573 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) -"Po" = ( -/obj/machinery/cryopod{ +"ns" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/mine/production) +"nE" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = -12 + }, +/obj/structure/mirror{ + pixel_x = -28 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"nG" = ( +/obj/item/twohanded/required/kirbyplants/random, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"nJ" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"nO" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"nZ" = ( +/obj/machinery/door/window/southright, +/obj/machinery/shower{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"oZ" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"pg" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plasteel, +/area/mine/production) +"pm" = ( +/obj/structure/table, +/obj/item/tank/internals/emergency_oxygen{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/tank/internals/emergency_oxygen, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"qq" = ( +/obj/machinery/light, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"qE" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"qZ" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"rf" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"rs" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"rF" = ( +/obj/effect/turf_decal/tile/brown{ dir = 4 }, /turf/open/floor/plasteel, -/area/mine/laborcamp) +/area/mine/living_quarters) +"rY" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"sF" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"sL" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "Lavaland Shuttle Airlock" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"sV" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"tg" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/mine/production) +"uy" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"vk" = ( +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"vE" = ( +/obj/item/twohanded/required/kirbyplants/random, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"vP" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"xc" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/mine/production) +"zc" = ( +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"zS" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"CS" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/mine/production) +"Dn" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"DM" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Et" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"EH" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"FB" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/obj/machinery/recharger, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"FX" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Gr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"GC" = ( +/obj/machinery/camera{ + c_tag = "Crew Area Hallway West"; + dir = 1; + network = list("mine") + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Hk" = ( +/obj/structure/displaycase, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"HO" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external{ + name = "Lavaland Shuttle Airlock" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Iv" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Ki" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel/white, +/area/mine/living_quarters) +"Ky" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 6 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"KS" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"LW" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/living_quarters) +"Mc" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"My" = ( +/obj/machinery/door/airlock{ + id_tag = "miningbathroom"; + name = "Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"MX" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"NC" = ( +/obj/effect/turf_decal/tile/brown, +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/structure/displaycase, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"NU" = ( +/obj/machinery/atmospherics/pipe/manifold4w/supply, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"OJ" = ( +/obj/structure/table, +/obj/item/cigbutt, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Pd" = ( +/obj/machinery/button/door{ + id = "miningbathroom"; + name = "Door Bolt Control"; + normaldoorcontrol = 1; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"Pr" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"PR" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/closet/secure_closet/labor_camp_security, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Qj" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Qo" = ( +/obj/machinery/shower{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 30 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"Rn" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/production) +"RD" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"RR" = ( +/obj/item/bikehorn{ + color = "#000"; + desc = "A horn off of a bicycle. This one has been charred to hell and back, yet somehow it still honks."; + name = "charred bike horn" + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors/explored) +"RW" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"Se" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/mine/living_quarters) +"Sj" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"SI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Tp" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/mine/living_quarters) +"Ty" = ( +/obj/machinery/door/window/southleft, +/obj/machinery/shower{ + pixel_y = 22 + }, +/turf/open/floor/plasteel/freezer, +/area/mine/living_quarters) +"Tz" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"TW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"TX" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Ub" = ( +/obj/structure/statue{ + desc = "A lifelike statue of a horrifying monster."; + dir = 8; + icon = 'icons/mob/lavaland/lavaland_monsters.dmi'; + icon_state = "goliath"; + name = "goliath" + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "Uq" = ( /obj/docking_port/stationary{ area_type = /area/lavaland/surface/outdoors; @@ -3559,12 +4394,35 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"UP" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/mine/production) +"US" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Vk" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"Vz" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/open/floor/plating, +/area/mine/production) "Wp" = ( /obj/docking_port/stationary{ - area_type = /area/lavaland/surface/outdoors; dir = 8; dwidth = 3; - height = 5; + height = 10; id = "mining_away"; name = "lavaland mine"; width = 7 @@ -3622,6 +4480,22 @@ }, /turf/open/floor/plasteel, /area/mine/production) +"YT" = ( +/obj/effect/spawner/structure/window/reinforced, +/turf/closed/wall, +/area/mine/living_quarters) +"Zt" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) (1,1,1) = {" aa @@ -7712,10 +8586,10 @@ aj aj aj aj -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -7968,14 +8842,14 @@ aj aj aj aj -aj -aj -aj -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -8219,21 +9093,21 @@ aj aj aj aj -ai ab +ai aj aj aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -8473,26 +9347,26 @@ aD bZ aj aj -aD +RR aj ab +ab ai ai aj aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -8732,23 +9606,23 @@ bZ aj aj aj +ab +ab ai ai -ai -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -8982,30 +9856,30 @@ aq bj az az -aq +bA ca ca ca -aj -aj -aj -ai -ad -ai -ai -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj +uy +ca +Se +Mc +LW +cM +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -9229,8 +10103,6 @@ ap ar ar aq -Po -il az az az @@ -9238,30 +10110,32 @@ az az az az +el az -aq +az +bA cb cw cG -aj -aj -aj -aj -ai +cz +ca +OJ +SI +nG +cM +lU +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -9492,33 +10366,33 @@ az az aU bb -az -az -az +cN +fo +by by bL cc cx -cG -aj -aj -aj -aj -aj +mi +cE +ca +km +SI +eM +cM +Tp +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -9745,37 +10619,37 @@ ay aq aE az -az -az -az -az +cl +cN +cN +dG aQ bk az -bz -aq +az +bA cd -cy -cG -aj -aj -aj -aj +cA +fw +cS +ca +nJ +SI +dZ +cM +er +LW +cM +ab +ab +ab +ab +ab +jO +ab +ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -10008,31 +10882,31 @@ az bc aq bl -aq bA -aq -aq -aq -aq -aj -aj -aj +bA +bA +bT +cA +qE +cT +bw +eL +dy +ec +dZ +ie +DM +cM +ab +ab +ab +ab +cR +sL +cR ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -10265,33 +11139,33 @@ aq bd aq bl -aq -bz -aq -ce -cz -aq -aj -aj -aj +bA +ao +aV +Zt +Tz +cp +sF +cU +EH +dF +EH +EH +es +GC +cM ab ab ab ab +cR +dZ +cR ab ab aj aj aj -ai -ai -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -10522,28 +11396,28 @@ aW be aW bm -aq +bA bB bM -cf +ce cA -aq -aj -aj -ab -ad -ai -ab -ab -ab -ai -ab -ab -ab -ad -ai -ai -ai +Iv +vk +bw +dZ +dZ +lN +rF +et +dZ +cM +cM +cM +YT +cM +cR +HO +cR aj aj aj @@ -10779,28 +11653,28 @@ aq aq aq aq -aq -aq -aq -cg +bA +bA +ca +cf cB -aq -aj +cA +qq cQ cQ cQ cQ -cR -cR -cR +rs +et +dZ cM +vE +FX +Qj +FX +eL +Dn cR -cR -cR -cM -ai -ai -aj aj aj aj @@ -11037,27 +11911,27 @@ aX aD aD aD -aD -aq -ch +aw +bw +cg cC -aq -aj +FB +PR cQ dg dg cQ dZ -dZ +et dZ cM fa -fo -fx -cM -ab -aj -aj +dZ +dZ +dZ +dZ +dZ +cR aj aj aj @@ -11294,27 +12168,27 @@ aD aD aD aD -aD -aq -aq -aq -aq -aj +aw +bw +bw +bw +bw +bw cQ -dh -dx +dp +dH cQ ea -ep +et ek cM fb dZ -fy +fz +fz +dZ +Ub cR -ab -aj -aj aj aj aj @@ -11541,7 +12415,7 @@ an an an an -aD +an aq WA aq @@ -11559,19 +12433,19 @@ aj ab cQ di -dy dP -eb -eq +dU +rY +eu eK eQ ef -fp +TX fz +fz +dZ +dZ cR -ab -aj -aj aj aj aj @@ -11819,16 +12693,16 @@ dj dz cQ ec -er +ev eL cM fc +zS dZ -fA -cR -ab -ai -ai +dZ +dZ +eM +cM aj aj aj @@ -12076,17 +12950,17 @@ dk dA cQ ed -er +ew eM cM fd fq fB +pm +Hk +NC cM ai -ad -ai -ai ab aj aj @@ -12333,7 +13207,7 @@ cQ cQ cQ ee -er +ev dZ cM cM @@ -12590,8 +13464,8 @@ dl dB cM dZ -er -dZ +ex +fp cM fe fr @@ -12843,11 +13717,11 @@ aj aj ab cR -dm +Ki dC dQ ea -er +ev dZ cM ff @@ -13093,7 +13967,7 @@ aD aT an aD -aD +fx aj aj aj @@ -13104,7 +13978,7 @@ dm dD dR ef -es +ey dZ cM fg @@ -13349,9 +14223,9 @@ an an an an -aD -aD -aD +fx +fx +an aj aj ai @@ -13361,14 +14235,14 @@ dn dE dQ ec -er +ev dZ eL fh ft eL fh -ec +zc eL fh ec @@ -13617,8 +14491,8 @@ cM cM cM cM -eg -et +ei +ez eN eN fi @@ -13627,7 +14501,7 @@ eN fi fN eN -fi +NU fp cR ab @@ -13865,18 +14739,18 @@ an an an an -an -aD +aj +aj aj aj cM -cS -do -dF +cX +ds +dS cM eh -er -dZ +ex +fp cM cM dQ @@ -13884,8 +14758,8 @@ dQ cM cM cM -cR -cR +RD +cM cM ai ab @@ -14120,29 +14994,29 @@ an an an an -an -an -aD -aD aj aj -cN -cT +aj +aj +aj +aj +cM +cY +cV cV -dG cM ea -er +ev eM cM fj fk -fk +qZ fI cM -ab -ab -ab +Ty +nO +cM ai ad ai @@ -14375,21 +15249,21 @@ an an an an -an -an -an -an -aD -aD +ab +aj +aj +aj +aj +aj aj aj cM -cU -dp -dH -dS -ei -eu +dh +dt +dT +eb +ep +eA ek dQ fk @@ -14397,9 +15271,9 @@ fk fC fk cM -ab -aj -ab +nZ +Sj +cM ab ai ai @@ -14631,13 +15505,13 @@ an an an an -an -an -an -an -an -aD -aD +ab +aj +aj +aj +aj +ab +ab aj ab cM @@ -14646,17 +15520,17 @@ dq dI cM ej -ev -eK +Et +jI eR fl fu fD fJ cM -ai -aj -aj +cM +My +cM aj aj aj @@ -14888,22 +15762,22 @@ an an an an -an -an -an -an -aD -aD aj aj +aj +ab +ab +ab +ab +ab ab cM cW dr dr cM -dZ -er +US +ew eL dQ fk @@ -14911,9 +15785,9 @@ fk fE fK cM -ad -aj -aj +nE +Pd +cM aj aj aj @@ -15144,23 +16018,23 @@ aj an an an -an -an -aD -aD -aD -aD -aj aj aj aj +ab +ab +ab +ab +ab +ab +ab cM cM cM cM cM dZ -er +ev dZ cM fm @@ -15168,9 +16042,9 @@ fk fF fk cM -ai -aj -aj +gX +oZ +cM aj aj aj @@ -15399,25 +16273,25 @@ aj aj aj aj -aj -aj -aD -aD -aD -aD -aj -aj -aj -aj -aj -aj +ab +ab aj aj ab ab +ab +ab +ab +ab +ab +ab +ab +ab +aj +aj cR dZ -er +ev dZ cM fn @@ -15425,9 +16299,9 @@ fv fG fL cM -ai -ai -aj +cM +cM +cM aj aj aj @@ -15661,20 +16535,20 @@ aj aj aj aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab +ab ab aj -aj -aj -aj -aj -aj -ab cR ek -ew +eB eO cM cR @@ -15917,21 +16791,21 @@ aj aj aj aj -aj -aj -aj -aj ab -aj ab -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab +ab aj cR cR -ex +eC cR cR ab @@ -16174,8 +17048,10 @@ aj aj aj aj -aj -aj +ab +ab +ab +ab ab ab ab @@ -16184,11 +17060,9 @@ ab ab ab aj -aj -aj -aj +ab cR -ey +eE cR ab ab @@ -16445,7 +17319,7 @@ aj aj aj cR -er +ev cR ab aj @@ -16702,9 +17576,9 @@ aj aj aj cR -er +ev cR -ab +aj aj aj aj @@ -16959,9 +17833,9 @@ ab aj aj cR -er +ev cR -ab +aj aj aj aj @@ -17214,11 +18088,11 @@ ab ab ab aj -ab +aj br -ez +vP br -ab +aj aj aj aj @@ -17471,11 +18345,11 @@ ab ab aj aj -ab +aj br -ez +vP br -ab +aj aj aj aj @@ -17730,9 +18604,9 @@ aj aj ab br -ez +vP br -ab +aj aj aj aj @@ -17987,10 +18861,10 @@ aj aj ab br -bR +eF br ab -ab +aj aj aj aj @@ -18244,7 +19118,7 @@ aj ab br br -eA +fy br br ab @@ -18499,14 +19373,14 @@ bq bq bq bq -br +ns cH -eB +fU cD br bq -am -am +ab +ab aj aj aj @@ -18748,23 +19622,23 @@ aj ab bq bC +Gr bP -cl -bP +TW cH cO -cX +do ck dJ -dT -bP -ez +CS +cn +vP bP eS bq ab -aj -aj +ab +ab aj aj aj @@ -19005,24 +19879,24 @@ aj ab br bD -bQ -cm -cE -cE -cE -cY -cE -cE -cE -cE -eC +bz +ch +co +cy +cy +MX +sV +cy +eg +eq +fX eP eT bq ab -aj -aj -aj +ab +ab +ab aj aj aj @@ -19262,26 +20136,26 @@ ab ab br bE -bR +bQ cn cF cI cP cn +Rn bP -bP -bP -bP +tg +lB eD bP eU -br +bq +bq +bq +bq +xc +ab ab -aj -aj -aj -aj -aj aj aj aj @@ -19519,26 +20393,26 @@ bf bf bf bF -bS +bR bF bf cJ bq cZ -ds +dx dK -dU -cF -eE -cn +tg +bP +eG +bP +eV +br +KS eV br ab -aj -aj -aj -aj -aj +ab +ai aj aj aj @@ -19776,27 +20650,27 @@ bf bn bs bG -bT -co +bS +ci bf cK bq bq -br -bq -dV -el -eF -dV -bq +Vz bq +Vz +bP +eG +bP +UP +pg +RW +UP +rf ab ab -aj -aj -aj -aj -aj +ai +ai aj aj aj @@ -20031,10 +20905,10 @@ ab ab bg bo -bt -bt +fA +il bU -cp +cm bf cL bq @@ -20042,18 +20916,18 @@ da du dL cH -ck +Vk eG -cD bP +cH +br +Pr +Qo br ab ab -aj -aj -aj -aj -aj +ab +ai aj aj aj @@ -20304,13 +21178,13 @@ eH cF eW bq +bq +bq +bq +xc +ab ab ab -aj -aj -aj -aj -aj aj aj aj @@ -20556,18 +21430,18 @@ dc bP dM dW -dW +Ky eI bq eX bq ab ab -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab aj aj aj @@ -20820,11 +21694,11 @@ eY bq ab ab -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab aj aj aj @@ -21077,10 +21951,10 @@ eY bq ab ab -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -21335,10 +22209,10 @@ bq ab ab ab -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -21592,10 +22466,10 @@ bq ab ab ab -aj -aj -aj -aj +ab +ab +ab +ab ab aj aj @@ -21849,10 +22723,10 @@ ab ab ab ab -aj -aj ab -aj +ab +ab +ab aj aj aj @@ -22106,9 +22980,9 @@ ab ab ab ab -aj -aj -aj +ab +ab +ab aj aj aj @@ -22363,8 +23237,8 @@ ab ab ab ab -aj -aj +ab +ab ab aj aj @@ -22620,8 +23494,8 @@ aj ab ab ab -aj -aj +ab +ab ab aj aj @@ -22877,7 +23751,7 @@ ai ab ab ab -aj +ab ab ab ab diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm new file mode 100644 index 0000000000..f04f8e1a3b --- /dev/null +++ b/_maps/shuttles/mining_common_meta.dmm @@ -0,0 +1,124 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"b" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/shuttle/mining) +"c" = ( +/obj/structure/table, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"d" = ( +/obj/machinery/computer/shuttle/mining/common, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"e" = ( +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) +"f" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"g" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) +"h" = ( +/obj/machinery/door/airlock/titanium{ + name = "Lavaland Shuttle Airlock" + }, +/obj/docking_port/mobile{ + dir = 8; + dwidth = 3; + height = 5; + id = "mining_common"; + name = "lavaland shuttle"; + port_direction = 4; + width = 7 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"i" = ( +/obj/structure/closet/crate, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"j" = ( +/obj/structure/shuttle/engine/heater, +/obj/structure/window/reinforced{ + dir = 1; + layer = 2.9 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"k" = ( +/obj/structure/ore_box, +/turf/open/floor/mineral/titanium/blue, +/area/shuttle/mining) +"l" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/open/floor/plating/airless, +/area/shuttle/mining) +"Q" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/shuttle/mining) + +(1,1,1) = {" +a +a +b +a +b +a +a +"} +(2,1,1) = {" +a +c +e +g +f +i +a +"} +(3,1,1) = {" +b +d +Q +e +f +j +l +"} +(4,1,1) = {" +a +c +e +e +f +k +a +"} +(5,1,1) = {" +a +a +b +h +b +a +a +"} From 79256fa6987253ea52906ee1efbe2d76363db259 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Thu, 16 Jan 2020 15:50:01 -0500 Subject: [PATCH 3/6] Fix TG's snowflake on_station_override var --- _maps/map_files/Mining/Lavaland.dmm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 7f2da8f7d3..0fa7ed29d0 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -919,15 +919,13 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cw" = ( -/obj/machinery/vending/security{ - !INVALID_VAR! = 1 - }, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/effect/turf_decal/tile/red{ dir = 8 }, +/obj/machinery/vending/security, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cx" = ( From 1413990ea2bc34b8ba46810065d0d1f5dfae8dd3 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Thu, 16 Jan 2020 16:15:54 -0500 Subject: [PATCH 4/6] Fix another TG snowflake variable. --- _maps/map_files/MetaStation/MetaStation.dmm | 281 +++++--------------- 1 file changed, 60 insertions(+), 221 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index e4bcdcc8d9..ce5b36dc44 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -33660,24 +33660,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/hallway/primary/port) -"bnN" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) -"bnO" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) "bnP" = ( /obj/machinery/door/airlock/external{ name = "Common Mining Dock" }, /turf/open/floor/plating, /area/hallway/primary/port) -"bnQ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) "bnR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34812,9 +34800,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"bqe" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) "bqf" = ( /turf/open/floor/plating, /area/hallway/primary/port) @@ -34830,9 +34815,6 @@ }, /turf/open/floor/plating, /area/hallway/primary/port) -"bqh" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) "bqi" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -36084,23 +36066,6 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"bsp" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) -"bsq" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bsr" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bss" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bst" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) "bsu" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 @@ -36891,23 +36856,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"btU" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"btV" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"btW" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"btX" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "btY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -37758,28 +37706,6 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"bvM" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvN" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvO" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvP" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvQ" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvR" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bvS" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) "bvT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37789,17 +37715,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"bvU" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "bvV" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 27 @@ -38621,34 +38536,6 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) -"bxE" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Arrival Airlock"; - safety_mode = 1 - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) -"bxF" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bxG" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bxH" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bxI" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bxJ" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) -"bxK" = ( -/turf/open/floor/plating, -/area/hallway/primary/port) "bxL" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = 32 @@ -38659,19 +38546,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"bxM" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "bxN" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -39572,14 +39446,6 @@ "bzx" = ( /turf/closed/wall, /area/security/vacantoffice) -"bzy" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) -"bzz" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/hallway/primary/port) "bzA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -40267,21 +40133,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"bBe" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "bBf" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -40324,18 +40175,6 @@ icon_state = "panelscorched" }, /area/maintenance/starboard) -"bBk" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plasteel, -/area/hallway/primary/port) "bBl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -94029,9 +93868,9 @@ aaa aaa aaa aaa -btX +djz bsk -bxE +djC aVu bxu aRA @@ -95828,9 +95667,9 @@ aaa aaa aaa aaa -btX +djz bsk -bxE +djC bvH bMw aRA @@ -97371,9 +97210,9 @@ bjX blU baE baE -bzz -bzz -bzz +bnM +bnM +bnM baE baE jPu @@ -97627,11 +97466,11 @@ bix bjY blV bqi -bxK -bxK -bxK -bxK -bxK +bqf +bqf +bqf +bqf +bqf bqi djW bNd @@ -97883,14 +97722,14 @@ bgx biy bjZ blW -bzz -bxK -bxK -bxK -bxK -bxK -bzz -bBk +bnM +bqf +bqf +bqf +bqf +bqf +bnM +bBf kQP bzx bzx @@ -98140,14 +97979,14 @@ bgy biz bka blX -bzz -bxK -bxK -bxK -bxK -bxK -bzz -bBk +bnM +bqf +bqf +bqf +bqf +bqf +bnM +bBf bCL bEq did @@ -98399,11 +98238,11 @@ bnR blY bnP bqg -bxK -bxK -bxK -bxK -bzz +bqf +bqf +bqf +bqf +bnM rNX jBe bzx @@ -98654,13 +98493,13 @@ bgA biz bkb blZ -bzz -bxK -bxK -bxK -bxK -bxK -bzz +bnM +bqf +bqf +bqf +bqf +bqf +bnM bBh xmb iSt @@ -98911,14 +98750,14 @@ bpt bcW bkc bma -bzz -bxK -bxK -bxK -bxK -bxK -bzz -bBk +bnM +bqf +bqf +bqf +bqf +bqf +bnM +bBf bCM bzx bzx @@ -99169,11 +99008,11 @@ bcW dhP bqd bqi -bxK -bxK -bxK -bxK -bxK +bqf +bqf +bqf +bqf +bqf bqi djW bsx @@ -99427,12 +99266,12 @@ bkd bmb baE baE -bzz +bnM baE -bzz +bnM baE baE -bBk +bBf bNh bNK bzx @@ -99683,11 +99522,11 @@ biC bke bmc bnS -bvU -bxM +bqj +bsu btY -bvU -bxM +bqj +bsu bEt nhy mcS From 4e114d399c6392d31f969ea5cbc702708f883387 Mon Sep 17 00:00:00 2001 From: r4d6 Date: Fri, 17 Jan 2020 22:13:19 -0500 Subject: [PATCH 5/6] Readding Cryo Sleeper in the gulag --- _maps/map_files/Mining/Lavaland.dmm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 0fa7ed29d0..b79f05cc69 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -4139,6 +4139,12 @@ }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) +"IY" = ( +/obj/machinery/cryopod{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp) "Ki" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -10101,7 +10107,7 @@ ap ar ar aq -az +IY az az az From 0d3706b7f950e569baab8c3fe88ac0da49fa69da Mon Sep 17 00:00:00 2001 From: r4d6 Date: Fri, 17 Jan 2020 22:15:29 -0500 Subject: [PATCH 6/6] Make public shuttle not require access --- code/modules/mining/mine_items.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 7c49957fb4..1ddb3a3189 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -90,6 +90,7 @@ /obj/machinery/computer/shuttle/mining/common name = "lavaland shuttle console" desc = "Used to call and send the lavaland shuttle." + req_access = list() circuit = /obj/item/circuitboard/computer/mining_shuttle/common shuttleId = "mining_common" possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"