diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c73cd97a9ae..214a0dc4fdd 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -22630,6 +22630,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "bgj" = ( @@ -47139,7 +47142,8 @@ height = 22; id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Port"; - width = 35 + width = 35; + roundstart_template = /datum/map_template/shuttle/mining_common/meta }, /turf/open/space/basic, /area/space) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index bc45982505f..d6f0a1e78d3 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1569,7 +1569,8 @@ height = 22; id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Fore"; - width = 35 + width = 35; + roundstart_template = /datum/map_template/shuttle/mining_common/meta }, /turf/open/space/basic, /area/space) @@ -116757,6 +116758,14 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"sDV" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -149639,7 +149648,7 @@ aec aaO aeR aft -aeb +sDV agj aaO aej diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4270e4718b4..0bfc02dff97 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -70053,6 +70053,15 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper, /turf/open/floor/plating, /area/construction/mining/aux_base) +"cWS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "cXc" = ( /obj/machinery/light/small{ dir = 8 @@ -75569,7 +75578,8 @@ height = 22; id = "whiteship_home"; name = "SS13: Auxiliary Dock, Station-Port"; - width = 35 + width = 35; + roundstart_template = /datum/map_template/shuttle/mining_common/meta }, /turf/open/space/basic, /area/space) @@ -85774,7 +85784,7 @@ aaa aaa aVs bKS -aWT +cWS aVs aVs aVs diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index a6dd3eeff65..59d14030d77 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -333,6 +333,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" = ( @@ -363,9 +366,6 @@ /turf/open/floor/plating, /area/mine/eva) "bh" = ( -/obj/machinery/computer/secure_data{ - dir = 1 - }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "bi" = ( @@ -490,9 +490,8 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/eva) "bw" = ( -/obj/machinery/computer/security/labor{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "bx" = ( @@ -506,25 +505,33 @@ /area/mine/laborcamp) "by" = ( /obj/structure/cable, -/turf/open/floor/plasteel, -/area/mine/laborcamp) -"bA" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Labor Camp Backroom"; - req_access_txt = "2" - }, -/obj/structure/cable, -/turf/open/floor/plasteel, -/area/mine/laborcamp) -"bB" = ( /obj/machinery/power/apc{ dir = 1; name = "Labor Camp APC"; pixel_y = 23 }, -/obj/structure/cable, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, /turf/open/floor/plasteel, /area/mine/laborcamp) +"bB" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/closet/secure_closet/labor_camp_security, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "bC" = ( /obj/machinery/airalarm{ pixel_y = 23 @@ -601,21 +608,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, /turf/open/floor/plasteel, /area/mine/laborcamp) "bM" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Labor Camp Maintenance"; - req_access_txt = "2" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "bN" = ( /obj/structure/sign/warning/docking, /obj/effect/spawner/structure/window/reinforced, @@ -735,16 +739,26 @@ /turf/closed/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 = 4 + }, +/obj/effect/turf_decal/tile/red{ dir = 8 }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cc" = ( -/obj/structure/chair/office, -/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "Powered by the tears and sweat of laborers."; name = "Prison Ofitser" @@ -752,41 +766,42 @@ /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, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cf" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cg" = ( -/obj/machinery/light/small{ +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/obj/effect/turf_decal/tile/red{ dir = 1 }, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "ch" = ( -/turf/open/floor/plating, -/area/mine/laborcamp) -"ci" = ( -/obj/machinery/computer/prisoner{ - dir = 1 - }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "cj" = ( @@ -871,30 +886,24 @@ /obj/structure/ore_box, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"cz" = ( -/obj/machinery/power/port_gen/pacman{ - anchored = 1 - }, -/obj/machinery/power/terminal{ +"cB" = ( +/obj/structure/chair/office{ dir = 4 }, -/turf/open/floor/plating, -/area/mine/laborcamp) -"cA" = ( -/obj/machinery/power/smes{ - charge = 5e+006 - }, /obj/structure/cable, -/turf/open/floor/plating, -/area/mine/laborcamp) -"cB" = ( -/obj/machinery/portable_atmospherics/canister/air, -/turf/open/floor/plating, -/area/mine/laborcamp) +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cC" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/open/floor/plating, -/area/mine/laborcamp) +/obj/machinery/computer/security/labor{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "cD" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -917,8 +926,10 @@ /turf/open/floor/plasteel, /area/mine/production) "cG" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/mine/laborcamp/security) "cH" = ( /obj/effect/turf_decal/tile/purple{ @@ -1202,6 +1213,7 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/structure/cable, /turf/open/floor/plasteel, /area/mine/production) "du" = ( @@ -1558,13 +1570,6 @@ /obj/effect/turf_decal/tile/purple, /turf/open/floor/plasteel, /area/mine/living_quarters) -"el" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Processing Area"; - req_access_txt = "48" - }, -/turf/open/floor/plasteel, -/area/mine/production) "em" = ( /obj/machinery/light{ dir = 4 @@ -1649,10 +1654,6 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "ex" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Station Bridge"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1660,6 +1661,9 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "ey" = ( @@ -1689,10 +1693,6 @@ /turf/open/floor/plasteel, /area/mine/production) "eA" = ( -/obj/machinery/door/airlock/mining/glass{ - name = "Mining Station Bridge"; - req_access_txt = "48" - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1700,6 +1700,9 @@ dir = 4 }, /obj/structure/cable, +/obj/machinery/door/airlock/glass{ + name = "Mining Station Bridge" + }, /turf/open/floor/plasteel, /area/mine/production) "eB" = ( @@ -1735,38 +1738,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ - 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 - }, -/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 }, @@ -1843,12 +1814,9 @@ /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" = ( @@ -1867,10 +1835,6 @@ /obj/structure/closet/crate{ icon_state = "crateopen" }, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, /turf/open/floor/plasteel, /area/mine/production) "eT" = ( @@ -1896,13 +1860,7 @@ /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" = ( @@ -1946,22 +1904,13 @@ /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_x = 0; + pixel_y = 32 }, /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 @@ -1969,6 +1918,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "fc" = ( @@ -1986,7 +1938,6 @@ dir = 2; network = list("mine") }, -/obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/brown{ dir = 1 }, @@ -1994,6 +1945,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" = ( @@ -2087,16 +2041,6 @@ }, /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 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "fp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -2109,7 +2053,6 @@ name = "Station Intercom (General)"; pixel_x = 28 }, -/obj/effect/turf_decal/tile/purple, /obj/effect/turf_decal/tile/purple{ dir = 4 }, @@ -2168,50 +2111,16 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"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) "fy" = ( -/obj/machinery/recharge_station, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) -"fz" = ( -/obj/structure/closet/secure_closet/miner, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/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/structure/table, +/obj/item/clothing/glasses/meson, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/mining_scanner, /turf/open/floor/plasteel, /area/mine/living_quarters) "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/displaycase, /turf/open/floor/plasteel, /area/mine/living_quarters) "fC" = ( @@ -2430,6 +2339,9 @@ /area/lavaland/surface/outdoors) "gd" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, /turf/open/floor/plasteel, /area/mine/production) "gj" = ( @@ -2456,6 +2368,12 @@ /obj/structure/stone_tile/center, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) +"gn" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "go" = ( /obj/structure/stone_tile/block, /turf/open/lava/smooth/lava_land_surface, @@ -2618,6 +2536,18 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) +"hN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"ia" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/production) "id" = ( /obj/structure/stone_tile{ dir = 4 @@ -2681,6 +2611,16 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"iM" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "iX" = ( /obj/structure/stone_tile, /obj/structure/stone_tile{ @@ -2723,6 +2663,13 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"jh" = ( +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/structure/closet/secure_closet/freezer/gulag_fridge, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "jk" = ( /obj/structure/stone_tile/center, /obj/structure/stone_tile/surrounding_tile, @@ -2770,6 +2717,16 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"ju" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "jx" = ( /obj/structure/stone_tile{ dir = 4 @@ -2838,6 +2795,15 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"jV" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) "kg" = ( /obj/structure/fluff/drake_statue, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -2865,6 +2831,17 @@ /obj/structure/stone_tile, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"ku" = ( +/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) "kv" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -2918,6 +2895,16 @@ /obj/structure/stone_tile/center/cracked, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"kI" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable, +/obj/machinery/door/airlock/mining/glass{ + name = "Processing Area"; + req_access_txt = "48" + }, +/turf/open/floor/plasteel, +/area/mine/production) "kJ" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 4 @@ -2943,6 +2930,12 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"kO" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "kR" = ( /obj/structure/stone_tile/slab/cracked, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, @@ -3098,6 +3091,15 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"lO" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) "lP" = ( /obj/structure/stone_tile/block/cracked{ dir = 4 @@ -3535,6 +3537,59 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) +"oL" = ( +/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) +"oW" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"po" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/mine/production) +"pV" = ( +/obj/structure/cable, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"qt" = ( +/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/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"sa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"sj" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown, +/turf/open/floor/plasteel, +/area/mine/production) "ss" = ( /obj/machinery/button/door{ id = "miningbathroom"; @@ -3551,6 +3606,27 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"su" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"sH" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0; + req_access_txt = "0" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plasteel, +/area/mine/production) +"sM" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/mine/laborcamp/security) "tI" = ( /obj/machinery/light/small{ dir = 4 @@ -3563,6 +3639,34 @@ "tY" = ( /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors/explored) +"tZ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"up" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"uG" = ( +/obj/structure/table, +/obj/machinery/recharger, +/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) +"uJ" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/laborcamp/security) "vb" = ( /obj/machinery/door/window/southleft, /obj/machinery/shower{ @@ -3574,13 +3678,94 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) -"zO" = ( +"vW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"wj" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"xi" = ( /obj/effect/spawner/structure/window/reinforced, +/turf/closed/wall, +/area/mine/living_quarters) +"xU" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"yk" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/turf/open/floor/plating, -/area/mine/living_quarters) +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"yr" = ( +/turf/closed/wall/r_wall, +/area/mine/laborcamp) +"zn" = ( +/obj/machinery/door/airlock/external{ + glass = 1; + name = "Mining External Airlock"; + opacity = 0; + req_access_txt = "0" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"zo" = ( +/obj/machinery/computer/prisoner{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"zO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/machinery/door/airlock/security/glass{ + name = "Labor Camp Monitoring"; + req_access_txt = "2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"zX" = ( +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 1; + pixel_y = 9 + }, +/obj/item/pen, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "Aw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -3597,6 +3782,59 @@ }, /turf/open/floor/plasteel, /area/mine/production) +"AU" = ( +/obj/structure/table, +/obj/item/restraints/handcuffs, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"AW" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Be" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/obj/structure/cable, +/obj/effect/turf_decal/tile/brown{ + dir = 4 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/production) +"Bx" = ( +/obj/machinery/vending/security, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Co" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Cw" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) +"Dh" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "Es" = ( /obj/machinery/door/window/southright, /obj/machinery/shower{ @@ -3624,6 +3862,36 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"FF" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/turf/open/floor/plating, +/area/mine/laborcamp/security) +"Gw" = ( +/obj/structure/cable, +/obj/machinery/camera, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"GI" = ( +/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) +"GJ" = ( +/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) +"Hd" = ( +/turf/closed/wall/r_wall, +/area/mine/laborcamp/security) "Ho" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -3633,21 +3901,57 @@ }, /turf/open/floor/plasteel/white, /area/mine/living_quarters) +"Hx" = ( +/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) "HO" = ( /obj/machinery/atmospherics/pipe/manifold4w/supply, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) +"Iv" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) "IK" = ( /obj/structure/toilet{ dir = 8 }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"Jf" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "JZ" = ( -/obj/structure/lattice/catwalk, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors) +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "Kb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -3656,6 +3960,23 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/mine/living_quarters) +"Kv" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp) +"Lg" = ( +/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) "Lu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 4 @@ -3678,6 +3999,36 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"NC" = ( +/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) +"Pa" = ( +/obj/machinery/computer/secure_data{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Pl" = ( +/obj/effect/turf_decal/tile/brown{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "Pt" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -3692,12 +4043,53 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/mine/eva) -"RO" = ( -/obj/structure/lattice/catwalk, -/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer3{ +"QN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"Rx" = ( +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/mine/production) +"RE" = ( +/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) +"RJ" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"RO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"SJ" = ( +/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) "Tn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3735,6 +4127,13 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"UA" = ( +/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/laborcamp/security) "UQ" = ( /obj/effect/turf_decal/tile/brown, /obj/effect/turf_decal/tile/brown{ @@ -3749,6 +4148,21 @@ /obj/structure/cable, /turf/open/floor/plasteel, /area/mine/production) +"US" = ( +/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) +"Vv" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "VP" = ( /obj/effect/turf_decal/tile/purple{ dir = 1 @@ -3758,6 +4172,21 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"VY" = ( +/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/laborcamp/security) +"We" = ( +/obj/structure/chair/comfy/brown{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "Wp" = ( /obj/docking_port/stationary{ dir = 8; @@ -3821,12 +4250,27 @@ /turf/open/floor/plasteel, /area/mine/production) "YA" = ( -/obj/structure/lattice/catwalk, +/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ dir = 4 }, -/turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/mine/living_quarters) +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) +"YY" = ( +/obj/machinery/camera{ + c_tag = "Crew Area"; + dir = 1; + network = list("mine") + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp/security) "Zf" = ( /obj/machinery/door/airlock{ id_tag = "miningbathroom"; @@ -3840,6 +4284,12 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"Zn" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/mine/laborcamp) (1,1,1) = {" aa @@ -7930,10 +8380,10 @@ aj aj aj aj -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -8186,14 +8636,14 @@ aj aj aj aj -aj -aj -aj -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab +ab +ab +ab aj aj aj @@ -8442,16 +8892,16 @@ ab 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 @@ -8691,26 +9141,26 @@ aD bZ aj aj -aD +GJ aj ab ai ai +ab 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 @@ -8953,20 +9403,20 @@ aj 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 +ab aj aj aj @@ -9200,30 +9650,30 @@ aq bj az az -aq +yr +Hd +Hd +Hd +FF +FF +FF ca -ca -ca -aj -aj -aj -ai ad ai -ai -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 +ab aj aj aj @@ -9454,32 +9904,32 @@ az az az az +su az az -az -aq +yr cb bh cG -aj -aj -aj -aj +bh +We +qt +ca ai ab +VY +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 @@ -9710,33 +10160,33 @@ az az aU bb -az -az -az -by +tZ +hN +Iv +Iv bL cc bw -cG -aj -aj -aj -aj -aj +Hx +bh +ch +bh +ca +ab +ab +UA +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 @@ -9963,37 +10413,37 @@ ay aq aE az -az -az -az -az +Kv +tZ +tZ +Zn aQ bk az -by -aq +az +yr cd -ci -cG -aj -aj -aj -aj +ch +GI +bh +ch +bM +ca +FF +FF +uJ +FF +ca +ab +ab +ab +ab +ab +NC +ab +ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -10226,31 +10676,31 @@ az bc aq bl -aq -bA -aq -aq -aq -aq -aj -aj -aj +yr +yr +yr +Hd +Gw +QN +oW +ch +Vv +gn +bh +bh +yk +ju +ca +ab +ab +ab +ab +cR +US +cR ab ab ab -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj -aj aj aj aj @@ -10483,30 +10933,30 @@ aq bd aq bl -aq +yr by -aq +pV ch -cz -aq -aj -aj -aj -ab -ab -ab +ch +iM +sa +sa +sa +vW +sa +sa RO +YY +ca +ab +ab +ab +ab +cR +dZ +cR ab ab -aj -aj -aj -ai -ai -aj -aj -aj -aj aj aj aj @@ -10740,28 +11190,28 @@ aW be aW bm -aq +yr bB bM cf -cA -aq -aj -aj -ab -ad -ai -JZ +ch +AW +RJ +jh +AU +Bx +Dh +bM YA JZ -ai -ab -ab -ab -ad -ai -ai -ai +ca +cM +cM +xi +cM +cR +oL +cR aj aj aj @@ -10997,28 +11447,28 @@ aq aq aq aq -aq -aq -aq +yr +yr +Hd cg cB -aq -aj +bh +uG cQ cQ cQ cQ -cR +sM zO -cR +sM cM +Lg +dZ +Co +kO +eL +Pl cR -cR -cR -cM -ai -ai -aj aj aj aj @@ -11255,27 +11705,27 @@ aX aD aD aD -aD -aq -ch +aw +FF +zo cC -aq -aj +Pa +zX cQ dg dg cQ -dZ -gW -dZ +up +Jf +xU cM fa -fo -fx -cM -ab -aj -aj +dZ +dZ +dZ +dZ +dZ +cR aj aj aj @@ -11512,27 +11962,27 @@ aD aD aD aD -aD -aq -aq -aq -aq -aj +aw +FF +FF +FF +FF +FF cQ dh dx cQ ea -gW +Cw ek cM fb dZ fy +fy +dZ +SJ cR -ab -aj -aj aj aj aj @@ -11785,11 +12235,11 @@ eK eQ ef Aw -fz +fy +fy +dZ +dZ cR -ab -aj -aj aj aj aj @@ -12042,11 +12492,11 @@ eL cM fc gW -fA -cR -ab -ai -ai +dZ +dZ +dZ +eM +cM aj aj aj @@ -12300,11 +12750,11 @@ cM fd fq fB +fB +fB +ku cM ai -ad -ai -ai ab aj aj @@ -18717,7 +19167,7 @@ bq bq bq bq -br +ia cH eB cD @@ -18974,15 +19424,15 @@ cO cX ck dJ -dT -bP +ia +cn ez bP eS bq ab -aj -aj +ab +ab aj aj aj @@ -19231,16 +19681,16 @@ Uh Uh Uh Uh -Uh -Uh +kI +Be eC eP eT bq ab -aj -aj -aj +ab +ab +ab aj aj aj @@ -19486,20 +19936,20 @@ cF cI cP cn +Rx bP -bP -bP +ia gd eD bP eU -br +bq +bq +bq +bq +po +ab ab -aj -aj -aj -aj -aj aj aj aj @@ -19745,18 +20195,18 @@ bq cZ ds dK -dU -cF +ia +bP eE -cn +bP eV br +wj +dU +br ab -aj -aj -aj -aj -aj +ab +ai aj aj aj @@ -20000,21 +20450,21 @@ bf cK bq bq -br -bq -dV -el -eF -dV -bq +ia bq +ia +bP +eE +bP +sj +sH +lO +sj +zn ab ab -aj -aj -aj -aj -aj +ai +ai aj aj aj @@ -20260,18 +20710,18 @@ da du dL cH -ck -eG -cD +dT +eE bP +cH +br +jV +RE br ab ab -aj -aj -aj -aj -aj +ab +ai aj aj aj @@ -20522,13 +20972,13 @@ eH cF eW bq +bq +bq +bq +po +ab ab ab -aj -aj -aj -aj -aj aj aj aj @@ -20781,11 +21231,11 @@ eX bq ab ab -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab aj aj aj @@ -21038,11 +21488,11 @@ eY bq ab ab -aj -aj -aj -aj -aj +ab +ab +ab +ab +ab aj aj aj @@ -21295,10 +21745,10 @@ eY bq ab ab -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -21553,10 +22003,10 @@ bq ab ab ab -aj -aj -aj -aj +ab +ab +ab +ab aj aj aj @@ -21810,10 +22260,10 @@ bq ab ab ab -aj -aj -aj -aj +ab +ab +ab +ab ab aj aj @@ -22067,10 +22517,10 @@ ab ab ab ab -aj -aj ab -aj +ab +ab +ab aj aj aj @@ -22324,9 +22774,9 @@ ab ab ab ab -aj -aj -aj +ab +ab +ab aj aj aj @@ -22581,8 +23031,8 @@ ab ab ab ab -aj -aj +ab +ab ab aj aj @@ -22838,8 +23288,8 @@ aj ab ab ab -aj -aj +ab +ab ab aj aj @@ -23095,7 +23545,7 @@ ai ab ab ab -aj +ab ab ab ab @@ -23352,7 +23802,7 @@ ai ai ab ab -aj +ab ab ab ab @@ -23609,7 +24059,7 @@ ai ai ai 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 00000000000..f04f8e1a3b2 --- /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 +"} diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 5642af7d2d9..b1ad18c8823 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -124,6 +124,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 @@ -522,6 +526,10 @@ suffix = "kilo" name = "labour shuttle (Kilo)" +/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 fca107e08a2..8b26d0cd20a 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -312,6 +312,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 612381fd7c2..6607a0e8ea9 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -49,6 +49,13 @@ 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 9cf6d015a22..d9627c93e6d 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -310,3 +310,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 a1ba493d466..f8dca6735f7 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -82,6 +82,14 @@ 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 diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 4dc2a216d9f..02df514908e 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -202,7 +202,7 @@ roundstart_template = SSmapping.shuttle_templates[sid] if(!roundstart_template) - CRASH("Invalid path ([roundstart_template]) passed to docking port.") + CRASH("Invalid path ([sid]/[roundstart_template]) passed to docking port.") if(roundstart_template) SSshuttle.action_load(roundstart_template, src) @@ -786,8 +786,8 @@ current_engines = max(0,current_engines + mod) if(in_flight()) var/delta_coeff = engine_coeff / old_coeff - modTimer(delta_coeff) - + modTimer(delta_coeff) + /obj/docking_port/mobile/proc/count_engines() . = 0 for(var/thing in shuttle_areas)