diff --git a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm index 5bc10b30f0..9ef45ab30a 100644 --- a/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm +++ b/_maps/RandomRuins/StationRuins/Lavaland/Mining_Station/Mining_Station_Public_01.dmm @@ -153,10 +153,6 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) -"cX" = ( -/obj/structure/closet/secure_closet/miner, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "dk" = ( /obj/structure/table, /obj/item/stack/packageWrap, @@ -398,6 +394,13 @@ }, /turf/open/floor/plating, /area/mine/laborcamp/security) +"he" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "hf" = ( /obj/item/kirbyplants/random, /turf/open/floor/plasteel, @@ -417,16 +420,6 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"hH" = ( -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "hP" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/atmos_waste{ @@ -503,6 +496,14 @@ }, /turf/open/floor/plasteel, /area/mine/production) +"ja" = ( +/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) "jf" = ( /obj/structure/table, /obj/item/storage/firstaid/regular, @@ -769,11 +770,6 @@ /obj/effect/turf_decal/tile/red, /turf/open/floor/plasteel, /area/mine/laborcamp/security) -"nH" = ( -/obj/machinery/light, -/obj/structure/closet/wardrobe/miner, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "nI" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{ @@ -841,6 +837,12 @@ /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/mine/production) +"nS" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "nX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -1275,8 +1277,12 @@ /turf/open/floor/plasteel, /area/mine/production) "uG" = ( -/obj/structure/ore_box, -/obj/effect/turf_decal/box, +/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) "uI" = ( @@ -1439,6 +1445,15 @@ }, /turf/open/floor/plasteel, /area/mine/living_quarters) +"wQ" = ( +/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) "wV" = ( /turf/closed/mineral/random/volcanic, /area/lavaland/surface/outdoors/explored) @@ -1536,6 +1551,14 @@ }, /turf/open/floor/plasteel/freezer, /area/mine/living_quarters) +"yZ" = ( +/obj/docking_port/stationary/public_mining_dock{ + dir = 8; + id = "lavaland_common_away"; + name = "Mining Station Public Wing" + }, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "zh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -1644,6 +1667,13 @@ }, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/mine/production) +"AC" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "AH" = ( /obj/machinery/cryopod{ dir = 4 @@ -1719,6 +1749,12 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/mine/living_quarters) +"By" = ( +/obj/structure/chair{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "BD" = ( /obj/machinery/door/airlock/maintenance{ name = "Mining Station Maintenance"; @@ -1843,6 +1879,7 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "Dr" = ( +/obj/structure/chair, /obj/structure/extinguisher_cabinet{ pixel_x = -5; pixel_y = 30 @@ -1850,9 +1887,6 @@ /obj/effect/turf_decal/tile/purple{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, /turf/open/floor/plasteel, /area/mine/living_quarters) "Dv" = ( @@ -2695,17 +2729,12 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "Pp" = ( -/obj/machinery/camera{ - c_tag = "Public Shuttle Lobby"; - network = list("mine") - }, -/obj/effect/turf_decal/tile/brown{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown, -/obj/effect/turf_decal/tile/brown{ - dir = 4 +/obj/structure/table, +/obj/item/gps/mining{ + pixel_x = 3; + pixel_y = 5 }, +/obj/item/gps/mining, /turf/open/floor/plasteel, /area/mine/living_quarters) "Pq" = ( @@ -2750,6 +2779,10 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/white, /area/mine/laborcamp) +"Qd" = ( +/obj/structure/displaycase, +/turf/open/floor/plasteel, +/area/mine/living_quarters) "Qi" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -2825,9 +2858,13 @@ /turf/open/floor/plasteel, /area/mine/laborcamp) "Ru" = ( +/obj/structure/chair, /obj/machinery/newscaster{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/plasteel, /area/mine/living_quarters) "Rv" = ( @@ -3019,13 +3056,13 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /mob/living/simple_animal/bot/secbot/beepsky{ desc = "Powered by the tears and sweat of laborers."; name = "Prison Ofitser" }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/open/floor/plasteel, /area/mine/laborcamp/security) "Un" = ( @@ -3241,10 +3278,6 @@ }, /turf/open/floor/plating, /area/mine/living_quarters) -"XX" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/closed/wall, -/area/mine/living_quarters) "Ya" = ( /turf/closed/wall/r_wall, /area/mine/laborcamp) @@ -4211,9 +4244,9 @@ VT VT VT VT -VT -VT -VT +Lm +Lm +Lm VT VT VT @@ -4266,12 +4299,12 @@ VT VT VT VT -VT -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4322,15 +4355,15 @@ VT VT VT VT -VT -VT -VT -VT -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4379,16 +4412,16 @@ VT VT VT VT -VT -VT -VT -VT Lm Lm -VT -VT Lm -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4435,17 +4468,17 @@ wz wz VT VT -VT -VT Lm -VT -VT -VT Lm -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm +Lm Lm VT VT @@ -4492,18 +4525,18 @@ wz wz Lm VT -VT -VT Lm Lm Lm Lm Lm -VT -VT -VT -VT -VT +Lm +Lm +Lm +Lm +Lm +Lm +Lm VT VT VT @@ -4549,7 +4582,6 @@ VT wz Lm VT -VT Lm Lm Lm @@ -4558,8 +4590,9 @@ Lm Lm Lm Lm -VT -VT +Lm +Lm +Lm VT VT VT @@ -4615,7 +4648,7 @@ Lm Lm Lm Lm -VT +Lm VT VT VT @@ -4662,11 +4695,11 @@ VT VT VT VT -VT Lm Lm -VT -VT +Lm +Lm +Lm Lm Lm Lm @@ -4722,10 +4755,10 @@ wz Lm Lm Lm -VT Lm Lm Lm +yZ Lm Lm Lm @@ -4772,18 +4805,18 @@ Gt Dv my VT +ja VT VT -VT +wz wz Lm Lm Lm -VT -Lm -Lm -Lm Lm +KV +he +KV Lm Lm Lm @@ -4833,14 +4866,14 @@ VT VT Lm Lm +wz +wz Lm Lm Lm -Lm -Lm -Lm -Lm -Lm +KV +Ag +KV Lm Lm VT @@ -4893,11 +4926,11 @@ Lm VN VN VN -XX -VN -VN -VN +KV VN +KV +AC +KV VT VT VT @@ -4949,12 +4982,12 @@ pu bn VN zy -Ag -Ag -Ag +By +nS +By Ag qZ -VN +KV VT VT VT @@ -5010,8 +5043,8 @@ Ag Ag Ag Ag -cX -VN +Ag +KV VT VT VT @@ -5067,8 +5100,8 @@ Ag uG uG Ag -cX -VN +eS +KV VT VT VT @@ -5124,8 +5157,8 @@ KO uG uG Ag -cX -VN +Ag +KV VT VT VT @@ -5181,7 +5214,7 @@ RP Ag Ag Ag -nH +oy VN VT VT @@ -5235,10 +5268,10 @@ oy VN Pp sx -eS -Ag -Ag -hH +Pp +wQ +Qd +Qd VN wz Lm diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index df4ab2bc72..f651d1df7c 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -51206,15 +51206,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/exit) -"cyt" = ( -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/airlock/external{ - name = "Port Docking Bay 4" - }, -/turf/open/floor/plating, -/area/hallway/secondary/entry) "cyu" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -55560,6 +55551,18 @@ /obj/item/coin/silver, /turf/open/floor/plating, /area/maintenance/starboard/fore) +"iWK" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -5; + pixel_y = 30 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "iYE" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -56101,11 +56104,15 @@ }, /turf/open/floor/plasteel/dark, /area/hallway/primary/central) -"kls" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/open/space, -/area/space/nearstation) +"kiY" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "kmw" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -56616,6 +56623,15 @@ }, /turf/open/floor/plasteel, /area/security/processing) +"lBd" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/structure/chair, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "lBz" = ( /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ @@ -56901,6 +56917,17 @@ icon_state = "wood-broken5" }, /area/maintenance/bar) +"mqo" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "mqZ" = ( /obj/item/reagent_containers/glass/beaker, /turf/open/floor/plating, @@ -58149,6 +58176,15 @@ /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"pFY" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/item/kirbyplants{ + icon_state = "plant-06" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pHl" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -58391,6 +58427,16 @@ }, /turf/open/floor/mineral/titanium/blue, /area/crew_quarters/toilet) +"qtw" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Port Docking Bay 4" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "qtH" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 4 @@ -58754,6 +58800,12 @@ /obj/item/clothing/under/dress/sundress, /turf/open/floor/plasteel, /area/crew_quarters/fitness) +"rsp" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "rtl" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -59012,6 +59064,18 @@ }, /turf/open/floor/plasteel, /area/engine/gravity_generator) +"rZQ" = ( +/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) "saK" = ( /obj/structure/closet/crate, /obj/item/target/alien, @@ -59260,6 +59324,19 @@ }, /turf/open/floor/plasteel, /area/hydroponics) +"sJw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Bay Mining Dock"; + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJx" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -59602,6 +59679,20 @@ }, /turf/open/floor/plasteel, /area/security/brig) +"tHy" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/item/kirbyplants{ + icon_state = "applebush" + }, +/turf/open/floor/plasteel/white/corner{ + dir = 1 + }, +/area/hallway/secondary/entry) "tJi" = ( /obj/machinery/airalarm{ dir = 4; @@ -60163,8 +60254,8 @@ /turf/closed/wall/r_wall, /area/engine/gravity_generator) "uRn" = ( -/mob/living/simple_animal/opossum, /obj/structure/chair/stool, +/mob/living/simple_animal/opossum, /turf/open/floor/carpet/royalblue, /area/maintenance/starboard/aft) "uRS" = ( @@ -60783,6 +60874,14 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/pool) +"wjd" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wje" = ( /obj/structure/rack, /obj/item/instrument/banjo, @@ -68460,7 +68559,7 @@ aaa aaa aaa aaa -aaa +gDl aaa aaa aaa @@ -68969,10 +69068,10 @@ aaa aaa aaa aaa +rZQ aaa aaa -aaa -aae +aoV aaa aaa aaa @@ -69224,11 +69323,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +kiY +awW +aaf aaa aaa aaa @@ -69481,11 +69580,11 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +awW +auP +awW +aaf aaa aaa aaa @@ -69738,11 +69837,11 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa +arB +awW +qtw +awW +arB aaa aaa aaa @@ -69995,12 +70094,12 @@ aaa aaa aaa aaa -aoV -aaa -aaa -aaa -aaa -aoV +arB +tHy +ayl +sJw +arB +aaf aaa aaa aaa @@ -70252,12 +70351,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aoV +awW +lBd +ayl +rsp +awW +aaf aaa aaa aaa @@ -70509,15 +70608,15 @@ aaa aaa aaa aaa +awW +lBd +ayl +wjd +awW aaf aaa aaa aaa -aaf -kls -aaa -aaa -aaa aaa aaa aaa @@ -70767,9 +70866,9 @@ aaa aaa aaa arB -arB -arB -arB +mqo +ayn +pFY aAC aaf aaa @@ -71024,7 +71123,7 @@ aaa aaa aaa arB -awZ +iWK ayk awW aAD @@ -71285,7 +71384,7 @@ awZ ayl beK auP -cyt +cyu cyd aaa aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 891b238f11..0ac49d7328 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -660,6 +660,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "abr" = ( @@ -1484,9 +1485,6 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ - dir = 10 - }, /obj/machinery/camera{ c_tag = "Arrivals Dock - Fore"; dir = 8; @@ -1495,6 +1493,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "acX" = ( @@ -66630,6 +66631,13 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/library) +"chT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "chV" = ( /obj/machinery/newscaster{ pixel_x = -32 @@ -125416,6 +125424,12 @@ }, /turf/open/floor/plasteel/white, /area/science/misc_lab) +"fer" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "fhE" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -125528,6 +125542,12 @@ }, /turf/open/floor/engine, /area/science/mixing) +"gfJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "gmj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/closed/wall/r_wall, @@ -125689,6 +125709,14 @@ /obj/effect/landmark/start/cyborg, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat_interior) +"hzR" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "hAf" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -125847,6 +125875,21 @@ }, /turf/open/floor/plating, /area/engine/atmos) +"iCO" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock - Public Mining"; + dir = 8; + name = "arrivals camera" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "iIl" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -125943,6 +125986,13 @@ }, /turf/open/floor/plasteel, /area/maintenance/solars/port/aft) +"iUI" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/chair{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "jdx" = ( /obj/structure/lattice, /obj/structure/grille, @@ -126193,6 +126243,10 @@ }, /turf/open/space, /area/engine/atmos) +"kmz" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kqo" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -126624,6 +126678,18 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"mVW" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/airlock/external{ + name = "External Docking Port" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mWZ" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -126635,6 +126701,17 @@ }, /turf/open/floor/engine, /area/science/mixing) +"naC" = ( +/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) "nbi" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/r_wall, @@ -126962,6 +127039,14 @@ /obj/effect/landmark/start/paramedic, /turf/open/floor/plasteel/white, /area/medical/storage) +"pIl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pQm" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ @@ -127061,6 +127146,13 @@ /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) +"qEF" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "qUn" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/tile/neutral{ @@ -127633,6 +127725,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/circuit) +"wlT" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wmL" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -127654,6 +127755,15 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"wpx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden{ + dir = 10 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wum" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 @@ -127738,6 +127848,15 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) +"xaL" = ( +/obj/effect/turf_decal/delivery, +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "xcU" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -159602,13 +159721,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aaO +aaO +abf +aaO +aaO aad aad aad @@ -159859,13 +159978,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad +aaa +aaO +qEF +xaL +hzR +aaO aad aaa aaa @@ -160116,13 +160235,13 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa aaO aaO +aaO +abe +abC +gfJ +aaO abf aaO aaO @@ -160372,18 +160491,18 @@ hZh hZh hZh hZh -aaa -aaa -aaa -aaa -aaa -aaa -aaO -abe +naC +mVW +kmz +mVW +acb +fer +aiT +abZ abp abC abC -abZ +abC abC abC acV @@ -160630,19 +160749,19 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa +aaO +aaO aaO vcs +wpx +pIl +wlT abq -abD -abD -abZ -abD -abD +chT +chT +chT +chT +chT acW adr adr @@ -160887,12 +161006,12 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa +aad aaa aaO +agk +iCO +iUI aaO abf aaO @@ -161144,14 +161263,14 @@ hZh hZh hZh aaa -aaa -aaa -aaa -aaa -aaa -qgU aad aad +aaO +aaO +abf +aaO +aaO +aad aaa aaa aad @@ -161402,12 +161521,12 @@ hZh hZh aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aad +aad +aad +aad +aad +aad aad aad aad diff --git a/_maps/map_files/LambdaStation/lambda.dmm b/_maps/map_files/LambdaStation/lambda.dmm index b87c755979..a219a333f1 100644 --- a/_maps/map_files/LambdaStation/lambda.dmm +++ b/_maps/map_files/LambdaStation/lambda.dmm @@ -63034,6 +63034,19 @@ /obj/item/assembly/flash/handheld, /turf/open/floor/plating, /area/storage/tech) +"cYI" = ( +/obj/docking_port/stationary{ + dir = 2; + dwidth = 3; + height = 5; + icon_state = "pinonfar"; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "dcB" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -63774,6 +63787,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/cargo) +"etv" = ( +/obj/machinery/door/airlock/external/glass, +/obj/structure/fans/tiny, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "euD" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -68221,6 +68242,20 @@ /obj/machinery/power/grounding_rod, /turf/open/floor/plating/airless, /area/engine/engineering) +"mnL" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/computer/shuttle/mining/common{ + dir = 8 + }, +/obj/machinery/camera{ + c_tag = "Arrivals Dock Public Mining"; + dir = 1; + name = "arrivals camera" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mqh" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -69098,16 +69133,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) -"ohk" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/light, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "ojZ" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -69418,6 +69443,11 @@ }, /turf/open/floor/plating, /area/maintenance/port) +"oTI" = ( +/obj/machinery/door/airlock/external/glass, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "oUp" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/metal/fifty, @@ -69460,6 +69490,16 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/toilet/auxiliary) +"oVP" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "oXg" = ( /obj/structure/cable{ icon_state = "4-8" @@ -69905,6 +69945,14 @@ }, /turf/open/floor/plasteel, /area/engine/break_room) +"pPG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pRv" = ( /obj/machinery/air_sensor{ id_tag = "tox_sensor" @@ -103741,10 +103789,10 @@ nNI ngo bQW nNI -aav -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -103996,15 +104044,15 @@ gLI ifC jEO uYv -ohk +uYv +uYv +jEO +jEO +cIu +nNI +xMt +xMt nNI -aab -aav -aab -aab -aab -aab -aab aab aab aab @@ -104253,16 +104301,16 @@ rEw iiC jMW rEw +rEw +rEw +rEw +rEw cwD -xMt -aab -aav -aab -aab -aab -aab -aab -aab +oTI +cxe +cVf +etv +cYI aab aab aab @@ -104510,15 +104558,15 @@ cvp iqD jto jto -cvI +jto +jto +pPG +oVP +mnL +nNI xMt -aab -aav -aab -aab -aab -aab -aab +xMt +nNI aab aab aab @@ -104769,10 +104817,10 @@ xMt cWd nNI nNI -aab -aav -aab -aab +nNI +xMt +xMt +nNI aab aab aab @@ -105027,7 +105075,7 @@ cJk nNI aab aab -aav +aab aab aab aab diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index be1b5ba779..ce62317294 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24164,12 +24164,12 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "aVt" = ( -/obj/item/kirbyplants{ - icon_state = "plant-13" - }, /obj/effect/turf_decal/stripes/line{ dir = 9 }, +/obj/item/kirbyplants{ + icon_state = "plant-20" + }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aVu" = ( @@ -24941,10 +24941,9 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWV" = ( -/obj/structure/sign/warning/vacuum/external{ - pixel_y = -32 +/obj/effect/turf_decal/stripes/corner{ + dir = 2 }, -/obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aWW" = ( @@ -81819,6 +81818,16 @@ }, /turf/open/floor/plasteel/dark, /area/engine/break_room) +"kHw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/table, +/obj/item/gps{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "kJW" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -81876,6 +81885,15 @@ }, /turf/open/floor/plasteel, /area/science/circuit) +"lcv" = ( +/obj/machinery/door/airlock/external{ + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "llb" = ( /obj/structure/table/reinforced, /obj/item/integrated_circuit_printer, @@ -81895,6 +81913,13 @@ /obj/item/multitool, /turf/open/floor/plasteel/white, /area/science/circuit) +"lvm" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/computer/shuttle/mining/common{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "lws" = ( /obj/structure/chair/office/dark{ dir = 8 @@ -82009,6 +82034,12 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/entry) +"mdt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "mjJ" = ( /obj/machinery/nuclearbomb/beer{ pixel_x = 2; @@ -82379,6 +82410,21 @@ }, /turf/open/floor/plating, /area/maintenance/port/fore) +"pAD" = ( +/turf/open/floor/plating, +/area/hallway/secondary/entry) +"pBY" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space, +/area/space) "pCV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -82594,6 +82640,16 @@ }, /turf/open/floor/plasteel, /area/engine/atmos) +"rta" = ( +/obj/machinery/door/airlock/external{ + dir = 2; + name = "Public Mining Dock" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "rzX" = ( /obj/structure/chair/office/light{ dir = 1; @@ -82892,6 +82948,12 @@ /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) +"ulG" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "upN" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -83040,6 +83102,15 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space) +"vMG" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/kirbyplants{ + icon_state = "plant-05" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "vYs" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, @@ -91679,13 +91750,13 @@ aaf aaf aaa aaa +aaf aaa aaa -aaf -aaf -aaf -aaf -aaf +aaa +aaa +aaa +pBY aaa aaa aaa @@ -91936,16 +92007,16 @@ aaa aaa aaa aaa -aaa -aaa -aaf -aaa -aaa -aaa aaf aaf aaf aaf +aaf +aVs +rta +aVs +aaf +aaf aaa aaa aaa @@ -92195,12 +92266,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf aaa aaf +aVs +pAD +aVs aaa aaf aaa @@ -92456,7 +92527,7 @@ aRA aRA aRA aVs -aVs +lcv aVs aVs aaf @@ -92713,10 +92784,10 @@ wOY aSH aUb aVt -aWT +mdt +vMG aVs aaf -aaf aaa aaa aaa @@ -92970,9 +93041,9 @@ abu bsk aUc aVu -aWU -aYC -aaa +bvF +lvm +aVs aaf aaa aaa @@ -93227,10 +93298,10 @@ wOY aSI aRA aVv -aWU +bvF +ulG aVs aaf -aaf aaa aaa aaa @@ -93485,8 +93556,8 @@ aRA aRA cZf aWV -aRA -aaa +kHw +aVs aaa aaa aaa diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index ed7abba3d6..056e27b982 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -32021,23 +32021,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/science) -"bwq" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) -"bwr" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/public/glass{ - name = "Monastery Transit" - }, -/obj/machinery/atmospherics/pipe/simple/cyan/hidden, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "bws" = ( /obj/structure/closet, /obj/item/stack/cable_coil/random, @@ -32812,9 +32795,6 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "bxY" = ( -/obj/machinery/light/small{ - dir = 1 - }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bxZ" = ( @@ -33559,6 +33539,9 @@ network = list("monastery"); pixel_x = 28 }, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/plasteel/white, /area/hallway/secondary/entry) "bzC" = ( @@ -53109,6 +53092,16 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"deJ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/gps/mining{ + gpstag = "MINE_PUB" + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "dgg" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -56534,12 +56527,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/entry) -"kIc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plasteel/white{ - heat_capacity = 1e+006 - }, -/area/hallway/secondary/entry) "kIo" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -58350,6 +58337,18 @@ }, /turf/open/floor/plating, /area/quartermaster/miningdock) +"oQm" = ( +/obj/docking_port/stationary{ + dir = 8; + dwidth = 3; + height = 5; + id = "commonmining_home"; + name = "SS13: Common Mining Dock"; + roundstart_template = /datum/map_template/shuttle/mining_common/meta; + width = 7 + }, +/turf/open/space/basic, +/area/space) "oRX" = ( /obj/structure/closet, /turf/open/floor/plating, @@ -58645,6 +58644,15 @@ }, /turf/open/floor/plasteel/white/corner, /area/hallway/secondary/exit/departure_lounge) +"pqP" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "prQ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -58707,9 +58715,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/chemistry) -"pyw" = ( -/turf/open/space/basic, -/area/hallway/secondary/entry) "pzF" = ( /mob/living/simple_animal/opossum, /turf/open/floor/wood, @@ -58751,6 +58756,15 @@ }, /turf/open/floor/plasteel/dark, /area/science/explab) +"pEH" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/chair/comfy{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "pEL" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -59281,6 +59295,15 @@ }, /turf/open/floor/engine, /area/engine/engineering) +"qRm" = ( +/obj/machinery/door/airlock/external{ + name = "Port Docking Bay 2" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/turf/open/floor/plating, +/area/hallway/secondary/entry) "qTV" = ( /obj/item/radio/intercom{ name = "Station Intercom (General)"; @@ -59997,6 +60020,14 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"sIK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/flashlight, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "sJp" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/turf_decal/stripes/line, @@ -61493,6 +61524,18 @@ }, /turf/open/floor/plasteel, /area/engine/engineering) +"wjQ" = ( +/obj/machinery/computer/shuttle/mining/common{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) "wkZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 @@ -80466,7 +80509,7 @@ aaa aaa aaa aaa -pyw +aaa bsl btL aZx @@ -80723,7 +80766,7 @@ aaa aaa aaa aaa -pyw +aaa aZx bcX aZx @@ -81759,7 +81802,7 @@ aaa aaa aaa aaa -aaa +oQm aaa aaa aaa @@ -82015,9 +82058,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +pqP +aZx aaa aaa aaa @@ -82272,9 +82315,9 @@ aZx aaa aaa aaa -aaa -aaa -aaa +aZx +bcX +aZx aaa aaa aaa @@ -82526,12 +82569,12 @@ aZx bno bon aZx -aaa -aaa -aaa -aaa -aaa -aaa +aZx +aZx +aZx +aZx +qRm +aZx aaa aaa aht @@ -82781,15 +82824,15 @@ bbQ bcX bdV bnp -bon +baK +pEH +deJ +sIK +wjQ +pEH +bbR aZx aaa -aaa -aaa -aaa -aaa -aaa -aaa aht bBV bDf @@ -83038,15 +83081,15 @@ jzz aZx jzz bnp -bon -aZx -aZx -aZx -aZx -aZx +baK +baK +baK +baK +baK +baK +baK aZx aaa -aht bAI abI abI @@ -83296,14 +83339,14 @@ bbR bbR bnp baK -bbR -bbR -bbR -bbR -bbR +baK +baK +baK +baK +baK +baK +aZx aZx -kIc -kIc bAJ bBX bBX @@ -83558,7 +83601,7 @@ baK baK baK baK -aZx +baK bxY bzz kGe @@ -83815,7 +83858,7 @@ bbT bbT bbT bbT -bwq +bbT bxZ bzA bAK @@ -84072,7 +84115,7 @@ bqS bsm btN bfY -bwr +bfY bya bzB bAL diff --git a/_maps/shuttles/mining_common_kilo.dmm b/_maps/shuttles/mining_common_kilo.dmm new file mode 100644 index 0000000000..96208b7d4b --- /dev/null +++ b/_maps/shuttles/mining_common_kilo.dmm @@ -0,0 +1,180 @@ +//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, +/obj/item/storage/toolbox/emergency, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"d" = ( +/obj/machinery/computer/shuttle/mining/common, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"e" = ( +/obj/structure/table, +/obj/item/radio, +/obj/item/radio/intercom{ + pixel_y = 22 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"f" = ( +/obj/effect/turf_decal/stripes/end{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"g" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"h" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"i" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"j" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"k" = ( +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"l" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/valve{ + dir = 8 + }, +/turf/open/floor/mineral/titanium/yellow, +/area/shuttle/mining) +"m" = ( +/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 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/shuttle/mining) +"n" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 1 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"o" = ( +/obj/structure/closet/crate, +/obj/effect/turf_decal/delivery, +/obj/machinery/airalarm{ + dir = 4; + pixel_x = -22 + }, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"p" = ( +/obj/effect/spawner/structure/window/shuttle, +/obj/structure/shuttle/engine/heater, +/turf/open/floor/plating, +/area/shuttle/mining) +"q" = ( +/obj/structure/ore_box, +/obj/effect/turf_decal/delivery, +/turf/open/floor/mineral/plastitanium, +/area/shuttle/mining) +"r" = ( +/obj/structure/sign/warning/fire, +/turf/closed/wall/mineral/titanium, +/area/shuttle/mining) +"s" = ( +/obj/structure/shuttle/engine/propulsion/burst, +/turf/open/floor/plating/airless, +/area/shuttle/mining) + +(1,1,1) = {" +a +a +b +i +b +a +a +"} +(2,1,1) = {" +a +c +f +j +n +o +r +"} +(3,1,1) = {" +b +d +g +k +n +p +s +"} +(4,1,1) = {" +a +e +h +l +n +q +r +"} +(5,1,1) = {" +a +a +b +m +b +a +a +"} 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 +"} diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 2fa48582f7..9a1c770417 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -297,6 +297,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/snow_taxi name = "Snow Taxi (Computer Board)" build_path = /obj/machinery/computer/shuttle/snow_taxi diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index cae9f5b742..6fea45d491 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -79,6 +79,15 @@ no_destination_swap = TRUE var/static/list/dumb_rev_heads = list() + /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 = "commonmining_home;lavaland_common_away;landing_zone_dock;mining_public" + + /obj/machinery/computer/shuttle/mining/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) if(is_station_level(user.z) && user.mind && is_head_revolutionary(user) && !(user.mind in dumb_rev_heads)) to_chat(user, "You get a feeling that leaving the station might be a REALLY dumb idea...")