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 3118ad3f5f..1bfb337d99 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 @@ -154,13 +154,7 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "cX" = ( -/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" - }, +/obj/structure/closet/secure_closet/miner, /turf/open/floor/plasteel, /area/mine/living_quarters) "dk" = ( @@ -267,9 +261,13 @@ /turf/open/floor/plasteel, /area/mine/living_quarters) "eS" = ( -/obj/structure/table, -/obj/item/gps/mining, -/obj/item/gps/mining, +/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) "fm" = ( @@ -427,7 +425,6 @@ /obj/effect/turf_decal/tile/brown{ dir = 4 }, -/obj/structure/displaycase, /turf/open/floor/plasteel, /area/mine/living_quarters) "hP" = ( @@ -773,7 +770,8 @@ /turf/open/floor/plasteel, /area/mine/laborcamp/security) "nH" = ( -/obj/structure/displaycase, +/obj/machinery/light, +/obj/structure/closet/wardrobe/miner, /turf/open/floor/plasteel, /area/mine/living_quarters) "nI" = ( @@ -1086,6 +1084,7 @@ /obj/effect/turf_decal/tile/brown{ dir = 1 }, +/obj/effect/turf_decal/tile/brown, /turf/open/floor/plasteel, /area/mine/living_quarters) "re" = ( @@ -1181,9 +1180,6 @@ name = "Station Intercom (General)"; pixel_x = 28 }, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{ dir = 8 }, @@ -1279,12 +1275,8 @@ /turf/open/floor/plasteel, /area/mine/production) "uG" = ( -/obj/structure/table, -/obj/item/clothing/glasses/meson, -/obj/item/storage/bag/ore, -/obj/item/pickaxe, -/obj/item/mining_scanner, -/obj/item/flashlight, +/obj/structure/ore_box, +/obj/effect/turf_decal/box, /turf/open/floor/plasteel, /area/mine/living_quarters) "uI" = ( @@ -1758,15 +1750,6 @@ "Cd" = ( /turf/closed/wall, /area/mine/production) -"Cg" = ( -/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) "Cj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 @@ -1870,7 +1853,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/chair, /turf/open/floor/plasteel, /area/mine/living_quarters) "Dv" = ( @@ -1880,12 +1862,6 @@ }, /turf/open/floor/plating, /area/mine/laborcamp/security) -"DN" = ( -/obj/machinery/computer/shuttle/mining/common{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "Ed" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -2028,27 +2004,6 @@ }, /turf/open/floor/plating, /area/mine/laborcamp) -"Hk" = ( -/obj/docking_port/stationary{ - area_type = /area/lavaland/surface/outdoors; - 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) -"Hm" = ( -/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) "Ho" = ( /obj/machinery/door/airlock{ name = "Restroom" @@ -2121,12 +2076,6 @@ }, /turf/open/floor/plasteel/white, /area/mine/living_quarters) -"If" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/plasteel, -/area/mine/living_quarters) "Ii" = ( /obj/structure/table, /obj/item/storage/box/donkpockets, @@ -2757,9 +2706,6 @@ /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) "Pq" = ( @@ -2882,7 +2828,6 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/structure/chair, /turf/open/floor/plasteel, /area/mine/living_quarters) "Rv" = ( @@ -3399,15 +3344,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3, /turf/open/floor/plasteel, /area/mine/living_quarters) -"Zw" = ( -/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) "ZF" = ( /obj/machinery/telecomms/relay/preset/mining, /obj/machinery/light/small{ @@ -4330,10 +4266,10 @@ VT VT VT VT -Lm -Lm -Lm -Lm +VT +VT +VT +VT VT VT VT @@ -4386,14 +4322,14 @@ VT VT VT VT -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +VT +VT +VT +VT +VT +VT +VT +VT VT VT VT @@ -4442,15 +4378,15 @@ wz VT VT VT +VT +VT +VT +VT +VT Lm Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +VT +VT Lm VT VT @@ -4499,17 +4435,17 @@ wz wz VT VT +VT +VT Lm +VT +VT +VT Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +VT +VT +VT +VT Lm VT VT @@ -4555,18 +4491,18 @@ Lm wz wz Lm +VT +VT +VT Lm Lm Lm Lm Lm -Lm -Lm -Lm -Lm -Lm -Lm -Lm +VT +VT +VT +VT VT VT VT @@ -4612,6 +4548,8 @@ VT VT wz Lm +VT +VT Lm Lm Lm @@ -4620,10 +4558,8 @@ Lm Lm Lm Lm -Lm -Lm -Lm -Lm +VT +VT VT VT VT @@ -4669,6 +4605,7 @@ VT VT Lm Lm +VT Lm Lm Lm @@ -4678,8 +4615,7 @@ Lm Lm Lm Lm -Lm -Lm +VT VT VT VT @@ -4725,12 +4661,12 @@ my VT VT VT +VT +VT Lm Lm -Lm -Lm -Lm -Lm +VT +VT Lm Lm Lm @@ -4786,10 +4722,10 @@ wz Lm Lm Lm +VT Lm Lm Lm -Hk Lm Lm Lm @@ -4843,11 +4779,11 @@ wz Lm Lm Lm +VT +Lm +Lm Lm Lm -KV -Zw -KV Lm Lm Lm @@ -4902,9 +4838,9 @@ Lm Lm Lm Lm -KV -Ag -KV +Lm +Lm +Lm Lm Lm VT @@ -4959,9 +4895,9 @@ VN VN XX VN -KV -Hm -KV +VN +VN +VN VT VT VT @@ -5013,12 +4949,12 @@ pu bn VN zy -If -DN -If -FE +Ag +Ag +Ag +Ag qZ -KV +VN VT VT VT @@ -5074,8 +5010,8 @@ Ag Ag Ag Ag -Ag -KV +cX +VN VT VT VT @@ -5132,7 +5068,7 @@ uG uG Ag cX -KV +VN VT VT VT @@ -5188,8 +5124,8 @@ KO uG uG Ag -Ag -KV +cX +VN VT VT VT @@ -5245,7 +5181,7 @@ RP Ag Ag Ag -oy +nH VN VT VT @@ -5300,8 +5236,8 @@ VN Pp sx eS -Cg -nH +Ag +Ag hH VN wz diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index a2f0026842..02d5d9b065 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -55549,18 +55549,6 @@ /obj/structure/grille, /turf/open/space/basic, /area/space/nearstation) -"iDS" = ( -/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) "iEJ" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod One" @@ -57124,15 +57112,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) -"nGI" = ( -/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) "nLu" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -60202,17 +60181,6 @@ /obj/item/coin/gold, /turf/open/floor/plasteel, /area/crew_quarters/fitness) -"xfS" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/computer/shuttle/mining/common{ - dir = 4 - }, -/turf/open/floor/plasteel/white/corner{ - dir = 1 - }, -/area/hallway/secondary/entry) "xgk" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -60535,15 +60503,6 @@ /obj/item/instrument/trombone, /turf/open/floor/wood, /area/crew_quarters/theatre) -"xQG" = ( -/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) "xSW" = ( /obj/effect/turf_decal/tile/red{ dir = 1 @@ -69068,7 +69027,7 @@ aaa aaa aoV aaa -iDS +aaa aaa aaa aoV @@ -69323,11 +69282,11 @@ aaa aaa aaa aaa -asE -asE -nGI -asE -asE +aaa +aaa +aaa +aaa +aaa aoV aaa aaa @@ -69581,9 +69540,9 @@ aaa aaa aaa aaf -awW -auP -awW +aaa +aaa +aaa aaf kls aaa @@ -69839,8 +69798,8 @@ aaa aaa arB arB -xQG -asE +arB +arB aAC aaf aaa @@ -70095,7 +70054,7 @@ aaa aaa aaa arB -xfS +awZ ayk awW aAD @@ -73439,7 +73398,7 @@ ayl aIK ayl beM -asE +arB aaa aaa aaa diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 54b5a9c221..82ac8604ef 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -463,10 +463,24 @@ "aaS" = ( /turf/closed/wall/mineral/plastitanium, /area/construction/mining/aux_base) -"abe" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/end{ - dir = 1 +"aaT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"aaU" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/hallway/secondary/entry) +"aaV" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -494,15 +508,6 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) -"abq" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "abs" = ( /obj/docking_port/stationary{ dwidth = 1; @@ -126823,15 +126828,6 @@ }, /turf/open/floor/plasteel, /area/science/research/abandoned) -"mvx" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "mxm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/circuit/green, @@ -126841,17 +126837,6 @@ /obj/item/assembly/signaler, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) -"mLI" = ( -/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) "mPj" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -126914,28 +126899,10 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/plasteel, /area/maintenance/port/fore) -"nQR" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/computer/shuttle/mining/common, -/turf/open/floor/plasteel, -/area/hallway/secondary/entry) "nSh" = ( /obj/machinery/atmospherics/pipe/simple/general/hidden, /turf/closed/wall/r_wall, /area/maintenance/disposal/incinerator) -"nSS" = ( -/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) "oHk" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -127597,17 +127564,6 @@ }, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) -"xdp" = ( -/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/pipe/simple/supply/hidden{ dir = 4 @@ -159669,7 +159625,7 @@ aaa aaa aaa aaa -rqh +aaa rqh aad aad @@ -159925,8 +159881,8 @@ aaa aaa aaa aaa -aaO -aaO +aaa +aaa aaO aaO abf @@ -160181,11 +160137,11 @@ oZp aaa aaa aaa -xdp -mLI -mvx -nSS -abe +aaa +aaa +aaa +aaO +aaT abp abC abC @@ -160439,11 +160395,11 @@ aaa aaa aaa aaa +aaa +aaa aaO -aaO -aaO -nQR -abq +aaU +aaV abD abD abZ @@ -160697,7 +160653,7 @@ aaa aaa aaa aaa -rqh +aaa aaO aaO abf @@ -160954,7 +160910,7 @@ aaa aaa aaa aaa -rqh +aaa rqh aad aad diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index db9a620ad6..9f0c1026d4 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2291,6 +2291,10 @@ }, /turf/open/floor/plating, /area/crew_quarters/fitness/recreation) +"aeD" = ( +/obj/machinery/door/airlock/external, +/turf/open/floor/plating, +/area/hallway/primary/port) "aeE" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -3112,6 +3116,9 @@ }, /turf/open/floor/plasteel, /area/security/prison) +"afQ" = ( +/turf/open/floor/plating, +/area/hallway/primary/port) "afR" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -3180,6 +3187,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/dark, /area/ai_monitored/security/armory) +"afZ" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/hallway/primary/port) "aga" = ( /obj/effect/turf_decal/tile/neutral{ dir = 1 @@ -3658,6 +3669,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/prison) +"agQ" = ( +/obj/item/electronics/airlock, +/turf/open/floor/plating, +/area/hallway/primary/port) "agR" = ( /obj/machinery/airalarm{ dir = 4; @@ -4264,6 +4279,11 @@ icon_state = "platingdmg1" }, /area/maintenance/fore) +"ahT" = ( +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/hallway/primary/port) "ahU" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, @@ -4780,6 +4800,14 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"aiT" = ( +/obj/effect/decal/cleanable/oil{ + icon_state = "floor5" + }, +/turf/open/floor/plating{ + icon_state = "panelscorched" + }, +/area/hallway/primary/port) "aiU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/turf_decal/tile/neutral{ @@ -4800,6 +4828,11 @@ }, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"aiW" = ( +/turf/open/floor/plating{ + icon_state = "platingdmg1" + }, +/area/hallway/primary/port) "aiX" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -4901,6 +4934,14 @@ /obj/item/restraints/handcuffs/cable/pink, /turf/open/floor/plating, /area/maintenance/port/fore) +"ajk" = ( +/obj/structure/shuttle/engine/propulsion/right{ + dir = 4 + }, +/turf/open/floor/plating{ + icon_state = "platingdmg3" + }, +/area/hallway/primary/port) "ajl" = ( /obj/item/soap/deluxe, /obj/item/storage/secure/safe{ @@ -4992,6 +5033,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/warden) +"ajs" = ( +/obj/item/stack/sheet/metal/ten, +/turf/open/floor/plating, +/area/hallway/primary/port) "ajt" = ( /obj/structure/closet{ name = "Evidence Closet 5" @@ -5012,6 +5057,10 @@ }, /turf/open/floor/plasteel/dark, /area/security/warden) +"aju" = ( +/obj/item/stack/sheet/mineral/wood/twenty, +/turf/open/floor/plating, +/area/hallway/primary/port) "ajv" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 @@ -6872,6 +6921,11 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/fore) +"amv" = ( +/obj/item/stack/sheet/metal/ten, +/obj/item/wrench, +/turf/open/floor/plating, +/area/hallway/primary/port) "amw" = ( /obj/structure/window/reinforced, /obj/machinery/door/window/eastright{ @@ -6908,6 +6962,10 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel/dark, /area/crew_quarters/fitness/recreation) +"amB" = ( +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/plating, +/area/hallway/primary/port) "amC" = ( /obj/structure/chair{ dir = 4 @@ -33789,16 +33847,6 @@ }, /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) -"bnP" = ( -/obj/machinery/door/airlock/external{ - name = "Common Mining Dock" - }, -/turf/open/floor/plating, -/area/hallway/primary/port) "bnR" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -34933,25 +34981,6 @@ }, /turf/open/floor/plasteel, /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) -"bqi" = ( -/obj/structure/sign/warning/docking, -/turf/closed/wall, -/area/hallway/primary/port) "bqj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, @@ -81712,19 +81741,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/crew_quarters/cryopod) -"eQf" = ( -/obj/machinery/computer/shuttle/mining/common{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/plating, -/area/hallway/primary/port) "eZe" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -97318,9 +97334,9 @@ bjX blU baE baE -bnM -bnM -bnM +baE +baE +baE baE baE jPu @@ -97573,13 +97589,13 @@ bgw bix bjY blV -bqi -bqf -bqf -bqf -bqf -bqf -bqi +baE +afQ +afQ +afQ +afZ +afQ +baE djW bNd alK @@ -97830,13 +97846,13 @@ bgx biy bjZ blW -bnM -bqf -bqf -bqf -bqf -bqf -bnM +baE +afZ +afQ +ajs +afQ +afQ +baE bBf kQP bzx @@ -98087,13 +98103,13 @@ bgy biz bka blX -bnM -bqf -bqf -bqf -bqf -bqf -bnM +baE +afQ +afQ +afQ +afQ +afQ +baE bBf bCL bEq @@ -98344,13 +98360,13 @@ bgz biA bnR blY -bnP -bqg -bqf -bqf -bqf -bqf -bnM +aeD +agQ +afQ +afQ +afQ +afQ +baE rNX jBe bzx @@ -98601,13 +98617,13 @@ bgA biz bkb blZ -eQf -bqf -bqf -bqf -bqf -bqf -bnM +baE +ahT +afQ +afQ +aju +afQ +baE bBh xmb iSt @@ -98858,13 +98874,13 @@ bpt bcW bkc bma -bnM -bqf -bqf -bqf -bqf -bqf -bnM +baE +ahT +aiW +afQ +amv +afQ +baE bBf bCM bzx @@ -99115,13 +99131,13 @@ bbK bcW dhP bqd -bqi -bqf -bqf -bqf -bqf -bqf -bqi +baE +aiT +ajk +afQ +amB +afQ +baE djW bsx xfI @@ -99374,9 +99390,9 @@ bkd bmb baE baE -bnM baE -bnM +baE +baE baE baE bBf diff --git a/_maps/shuttles/mining_common_meta.dmm b/_maps/shuttles/mining_common_meta.dmm deleted file mode 100644 index f04f8e1a3b..0000000000 --- a/_maps/shuttles/mining_common_meta.dmm +++ /dev/null @@ -1,124 +0,0 @@ -//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 8400b6fa5c..32c879e2d2 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -293,10 +293,6 @@ 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/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index c212c22c98..f10229f4bf 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -87,14 +87,6 @@ return . = ..() -/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 = "lavaland_common_away;commonmining_home" - /**********************Mining car (Crate like thing, not the rail car)**************************/ /obj/structure/closet/crate/miningcar