From 7111c4391f59c30d6f95a24171b8596040213aae Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 30 Jul 2016 20:14:51 -0500 Subject: [PATCH 1/3] Adds disguting tumours to meta and box, lets RD and engineering build in those tumours --- _maps/map_files/MetaStation/MetaStation.dmm | 2354 +++++++++-------- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 1929 +++++++------- code/game/area/Space_Station_13_areas.dm | 4 + code/modules/mining/mine_items.dm | 70 +- 4 files changed, 2228 insertions(+), 2129 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 0b7a3184c44..ab00758cc74 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -77590,9 +77590,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/plasteel/warning/corner{ - dir = 2 - }, +/turf/open/floor/plasteel/floorgrime, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -78688,9 +78686,7 @@ name = "\improper Toxins Lab" }) "cER" = ( -/turf/open/floor/plasteel/warning/corner{ - dir = 8 - }, +/turf/open/floor/plasteel/floorgrime, /area/toxins/mixing{ name = "\improper Toxins Lab" }) @@ -87073,12 +87069,13 @@ name = "\improper Toxins Lab" }) "cSM" = ( +/obj/structure/lattice/catwalk, /obj/structure/cable{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, -/obj/structure/lattice/catwalk, /turf/open/space, /area/solar/starboard) "cSN" = ( @@ -90435,17 +90432,16 @@ /turf/open/floor/plating, /area/shuttle/supply) "cZb" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 4 }, -/area/shuttle/supply) +/turf/open/floor/plasteel/floorgrime, +/area/toxins/mixing{ + name = "\improper Toxins Lab" + }) "cZc" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/supply) +/turf/closed/wall, +/area/mining_construction) "cZd" = ( /obj/structure/shuttle/engine/propulsion, /turf/open/floor/plating, @@ -90535,21 +90531,12 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "cZs" = ( -/turf/open/floor/plasteel/shuttle, -/turf/closed/wall/shuttle/interior{ - icon_state = "swall_f10" - }, -/area/shuttle/transport) +/obj/machinery/door/airlock/research, +/turf/open/floor/plasteel, +/area/mining_construction) "cZt" = ( -/obj/structure/shuttle/engine/propulsion{ - icon_state = "propulsion"; - dir = 4 - }, -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 - }, -/area/shuttle/transport) +/turf/open/floor/plasteel, +/area/mining_construction) "cZu" = ( /obj/structure/closet/crate, /turf/open/floor/mineral/titanium/blue, @@ -90561,20 +90548,24 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "cZw" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 +/turf/open/floor/plasteel/warning{ + dir = 4 }, -/area/shuttle/transport) +/area/mining_construction) "cZx" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/abandoned) +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "cZy" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 +/obj/machinery/button/door{ + id = "mining_base"; + name = "blast doors"; + pixel_x = 4; + pixel_y = 28 }, -/area/shuttle/abandoned) +/turf/open/floor/plasteel/warning{ + dir = 8 + }, +/area/mining_construction) "cZz" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/abandoned) @@ -90584,8 +90575,11 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "cZB" = ( -/turf/closed/wall/mineral/titanium/nodiagonal, -/area/shuttle/abandoned) +/obj/machinery/door/poddoor{ + id = "mining_base" + }, +/turf/open/floor/plating, +/area/mining_construction) "cZC" = ( /obj/machinery/door/airlock/shuttle{ name = "recovery shuttle external airlock" @@ -90613,23 +90607,23 @@ }, /area/atmos) "cZE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc2"; - dir = 2 +/obj/machinery/light{ + dir = 8 }, -/area/shuttle/abandoned) +/turf/open/floor/plasteel, +/area/mining_construction) "cZF" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 +/turf/open/floor/plasteel/warning{ + dir = 8 }, -/area/shuttle/abandoned) +/area/mining_construction) "cZG" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 +/obj/machinery/door/airlock/engineering{ + name = "Construction Area"; + req_access_txt = "32" }, -/area/shuttle/abandoned) +/turf/open/floor/plasteel, +/area/mining_construction) "cZH" = ( /obj/structure/shuttle/engine/propulsion{ icon_state = "propulsion_l"; @@ -90651,17 +90645,15 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cZJ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 9 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "cZK" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 1 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "cZL" = ( /obj/structure/mirror{ pixel_x = 28; @@ -90874,17 +90866,14 @@ /turf/open/floor/plating/airless, /area/shuttle/abandoned) "daa" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 5 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "dab" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 - }, -/area/shuttle/abandoned) +/obj/machinery/computer/shuttle/mining, +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "dac" = ( /obj/machinery/door/airlock/shuttle{ name = "bathroom" @@ -91113,10 +91102,10 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "dau" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2" +/turf/open/floor/plating/warnplate{ + dir = 8 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "dav" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/decal/cleanable/dirt{ @@ -91150,11 +91139,10 @@ /turf/open/floor/plasteel/bot, /area/shuttle/abandoned) "daz" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 4 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "daA" = ( /obj/machinery/door/airlock/shuttle{ name = "bathroom" @@ -91190,17 +91178,25 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "daD" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc4"; - dir = 2 +/obj/docking_port/stationary{ + area_type = /area/shuttle/auxillary_base; + dir = 8; + dwidth = 3; + height = 5; + id = "mining_base"; + name = "auxillary mining base"; + turf_type = /turf/open/floor/plating; + width = 7 }, -/area/shuttle/abandoned) +/turf/open/floor/plating/warnplate{ + dir = 4 + }, +/area/shuttle/auxillary_base) "daE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 - }, -/area/shuttle/abandoned) +/obj/item/device/assault_pod/mining, +/obj/structure/table, +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "daF" = ( /obj/machinery/door/airlock/shuttle{ name = "recovery shuttle interior airlock" @@ -91216,11 +91212,9 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "daG" = ( -/turf/closed/wall/shuttle{ - icon_state = "swallc3"; - dir = 2 - }, -/area/shuttle/abandoned) +/obj/machinery/computer/shuttle/auxillary_base, +/turf/closed/wall, +/area/shuttle/auxillary_base) "daH" = ( /obj/machinery/door/airlock/shuttle{ name = "cargo bay" @@ -91666,11 +91660,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "dby" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s5"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 10 }, -/area/shuttle/abandoned) +/area/shuttle/auxillary_base) "dbz" = ( /obj/machinery/vending/snack{ pixel_x = -1; @@ -91772,11 +91765,8 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "dbL" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s9"; - dir = 2 - }, -/area/shuttle/abandoned) +/turf/open/floor/plating/warnplate, +/area/shuttle/auxillary_base) "dbM" = ( /obj/item/weapon/storage/bag/plants/portaseeder, /obj/structure/table, @@ -92215,22 +92205,29 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "dcy" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 6 }, -/area/shuttle/escape) +/area/shuttle/auxillary_base) "dcz" = ( /obj/structure/grille, /obj/structure/window/shuttle, /turf/open/floor/plating, /area/shuttle/escape) "dcA" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1; + d2 = 2 }, -/area/shuttle/escape) +/obj/machinery/power/apc{ + dir = 8; + name = "Base Construction APC"; + pixel_x = -25; + pixel_y = 3 + }, +/turf/open/floor/plasteel, +/area/mining_construction) "dcB" = ( /obj/machinery/door/airlock/shuttle{ name = "Emergency Shuttle Airlock" @@ -92263,17 +92260,25 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dcE" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall8"; - dir = 2 +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, -/area/shuttle/escape) +/turf/open/floor/plasteel, +/area/mining_construction) "dcF" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall3"; - dir = 2 +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" }, -/area/shuttle/escape) +/turf/open/space, +/area/solar/starboard) "dcG" = ( /obj/structure/tank_dispenser/oxygen{ layer = 2.7; @@ -92367,17 +92372,27 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dcJ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall4"; - dir = 2 +/obj/machinery/door/airlock/engineering{ + name = "Construction Area"; + req_access_txt = "32" }, -/area/shuttle/escape) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, +/turf/open/floor/plating, +/area/mining_construction) "dcK" = ( -/obj/structure/sign/bluecross_2, -/turf/closed/wall/shuttle{ - icon_state = "swall2" +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/area/shuttle/escape) +/turf/open/floor/plasteel, +/area/mining_construction) "dcL" = ( /obj/structure/table, /obj/item/stack/medical/gauze, @@ -92532,20 +92547,17 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ddc" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1" - }, -/area/shuttle/escape) +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/mining_construction) "ddd" = ( /obj/structure/sign/nosmoking_2, /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "dde" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 - }, -/area/shuttle/escape) +/obj/docking_port/mobile/auxillary_base, +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "ddf" = ( /obj/structure/chair, /turf/open/floor/mineral/titanium, @@ -92602,11 +92614,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ddn" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 +/turf/open/floor/plasteel/warning{ + dir = 1 }, -/area/shuttle/escape) +/area/mining_construction) "ddo" = ( /obj/structure/sign/bluecross_2, /turf/closed/wall/mineral/titanium, @@ -92815,11 +92826,8 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ddO" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall15"; - dir = 2 - }, -/area/shuttle/escape) +/turf/open/floor/plating, +/area/space) "ddP" = ( /obj/structure/table, /obj/item/weapon/restraints/handcuffs{ @@ -92959,10 +92967,14 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "dem" = ( -/turf/closed/wall/shuttle{ - icon_state = "diagonalWall3" +/obj/structure/lattice/catwalk, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/area/shuttle/escape) +/turf/open/space, +/area/solar/starboard) "den" = ( /obj/structure/table, /obj/item/weapon/folder/red{ @@ -127806,19 +127818,8 @@ bVE aaf aaf aaf -aaf -aaf aaa aaa -aaf -aaa -aaa -aaf -aaf -aaf -aaa -aaf -aaf aaa aaa aaf @@ -127836,11 +127837,22 @@ aaa aaa aaa aaa +aaf +aaf aaa aaa +aaf aaa aaa +aaf +aaf +aaf aaa +aaf +aaf +aaa +aaa +aaf aaa aaa aaa @@ -128063,6 +128075,25 @@ bVE aaa aaf aaa +aaa +aaa +aaa +aaa +aaa +aaf +aaa +aaa +aaa +aaf +aaf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaf aaf aai @@ -128111,25 +128142,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (135,1,1) = {" aaa @@ -128320,6 +128332,25 @@ aaa aaa aaf aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaf +aaf +aaf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aqJ aaa aaa @@ -128368,25 +128399,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (136,1,1) = {" aaa @@ -128577,6 +128589,25 @@ aaf aaf aaf aaf +aaa +aaa +aaa +aaa +aaf +aaa +aaa +aaf +aaf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aob aaf cUr @@ -128625,25 +128656,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (137,1,1) = {" aaa @@ -128813,7 +128825,7 @@ czX bZQ bVE cCW -cDR +cZb cER bVE cce @@ -128834,6 +128846,25 @@ aaa aaa aaa aaa +aaa +aaa +aaf +aaa +aaa +aaa +aaa +aaf +aaf +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aqJ aaa cUr @@ -128882,25 +128913,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (138,1,1) = {" aaa @@ -129068,12 +129080,12 @@ bVE bVE ciY cfy -cBP -cCX -cDS -cAK -cBP -cBP +bVE +bVE +cZb +cER +bVE +bVE cHG cgG cQO @@ -129090,7 +129102,26 @@ cQn cRP cRP cSM -aaa +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +cSM +dem aaf aaf cUr @@ -129116,25 +129147,6 @@ aaa aaa aaa aaa -aac -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa @@ -129325,12 +129337,12 @@ cyn cKw czY bVE -cBP -cSV -cDT -cES -cFC -cBP +bZQ +bVE +cZb +cER +bVE +bZQ bVE bVE bVE @@ -129345,9 +129357,28 @@ cQm cQm cQm aaa +aaf +aaf +aaf +aaf aaa -cSN aaa +dcF +aaf +aaa +aaf +aaa +aaa +aaa +aaa +aaf +aaa +aaa +aaa +aaa +aaf +aaf +cUs aaf aaa cUr @@ -129396,25 +129427,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (140,1,1) = {" aaa @@ -129582,29 +129594,48 @@ bZQ bVE bVE bVE -cSL -cCZ -cDU -cDb -cFD -cBP -aaf -aaf +bZQ +bVE +cZb +cER bVE bVE -chM -bVE -cNb -cNb -cNb -cNb -cNb +cZc +cZc +cZc +cZG +cZG +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +cZc +dcJ +cZc +cZc +cZc +cZc +ddO +ddO aaf aaf aaf aaf -cSN aaa +aaa +aaa +aaa +cUs aaf aaa cUr @@ -129653,25 +129684,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (141,1,1) = {" aaa @@ -129838,21 +129850,41 @@ cxn cyo czl bZQ -cAY -cBR -cCZ -cDV -cDb -cFE -cBP -aaf -aaa -aaf bVE -cLq +bZQ bVE +cZb +cER +cER +cER +cZs +cZt +cZE +cZt +cZt +cZt +cZt +cZt +cZt +cZE +cZt +cZt +cZt +cZt +cZt +cZt +cZE +cZt +dcA +dcE +dcK +cZt +cZt +ddc +cZc +cZc +cZc aaa -aaf aaa aaa aaa @@ -129860,8 +129892,7 @@ aaa aaa aaf aaf -cSN -aaa +cUs aaf aaa aaf @@ -129910,25 +129941,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (142,1,1) = {" aaa @@ -130096,29 +130108,48 @@ bVE bVE czZ bVE -cBS -cCZ -cDW -cBP -cFF -cBP -aaf -aaa -aaf -bVE -chM +bZQ bVE +cZb +cER +cER +cER +cZs +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZw +cZt +cZt +cZc +aaa +aaa +aaa +aaa aaa aaf aaf -aaf -aaf -aaf -aaf -aaf aaa -cSO -cRP +cUs cRP cTZ cUs @@ -130167,25 +130198,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (143,1,1) = {" aaa @@ -130353,23 +130365,42 @@ bZQ bVE cAa bVE -cSU -cDa -cDX -cDb -cFG -cGM +bZQ +bVE +cDR +cER +cER +cER +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZJ +dau +dau +dau +dau +dau +dby +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaf aaa aaa -acn -cLr -acn -aaa -aaf -aaa -aaa -aaa aaa aaa aaf @@ -130424,25 +130455,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (144,1,1) = {" aaa @@ -130610,15 +130622,39 @@ cyp bVE cAb bVE -cBU -cDb -cDb cBP -aoa -bnn -aaf -aaa -aaa +cCX +cDS +cAK +cBP +cBP +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZK +cZx +cZx +cZx +cZx +cZx +dbL +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaf aaa @@ -130626,11 +130662,6 @@ aaa aaf aaa aaa -aaf -aaa -aaa -aaf -aaa aaa aaa aaf @@ -130681,25 +130712,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (145,1,1) = {" aaa @@ -130867,29 +130879,48 @@ bVE bVE cAa bVE -aaf -aaf -aaf -aoa -aoa -aoa -aaf -aaf -aaf -aaf -aaf +cBP +cSV +cDT +cES +cFC +cBP +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZK +cZx +cZx +cZx +cZx +cZx +dbL +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaa aaf aaf aaf aaa aaa -aaf -aaf -aaf -aaf -aaf aaa -aaf +aaa +aaa aaf aaf cUr @@ -130938,25 +130969,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (146,1,1) = {" aaa @@ -131123,27 +131135,46 @@ aaf aaa aaf acn -aaf -aaf -aaa -aaf -aaf -aaf -aaf -aaf -aaa -aaa -aaa -aaa +cBP +cSL +cCZ +cDU +cDb +cFD +cBP +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZK +cZx +cZx +cZx +cZx +cZx +dbL +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +ddc +cZc aaa aaf aaf aaa aaa aaa -aaf -aaf -aaa aaa aaa aaa @@ -131195,25 +131226,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (147,1,1) = {" aaa @@ -131380,26 +131392,45 @@ aaf aaf aaf acn +cBP +cBR +cCZ +cDV +cDb +cFE +cBP +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +daa +daz +daz +daD +daz +daz +dcy +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa aaa aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -aaa -aaf -aaa aaa aaa aaa @@ -131452,25 +131483,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (148,1,1) = {" aaa @@ -131637,11 +131649,40 @@ aaf aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +cBP +cBS +cCZ +cDW +cBP +cFF +cBP +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +dab +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaf aaa aaa @@ -131651,16 +131692,6 @@ aaa aaa aaa aaa -aaf -aaa -aaa -aaf -aaf -aaa -aaf -aaa -aaa -aaa aai aaa cUr @@ -131709,25 +131740,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (149,1,1) = {" aaa @@ -131894,12 +131906,42 @@ aaf aaa aaa aaa -aaa -aaa -aaa -aaa -aaf -aaf +cBP +cSU +cDa +cDX +cDb +cFG +cGM +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaa +aaa aaa aaa aaa @@ -131907,17 +131949,6 @@ aaa aaa aaa aaa -aaf -aaf -aaf -aaf -aqJ -aob -aob -aob -aqJ -aob -aqJ aob aaa aaa @@ -131966,25 +131997,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (150,1,1) = {" aaa @@ -132151,12 +132163,40 @@ aaf aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaf +cBP +cBU +cDb +cDb +cBP +aoa +bnn +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -132165,15 +132205,6 @@ aaa aaa aaa aaa -aaf -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa aaa aob aqJ @@ -132223,25 +132254,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (151,1,1) = {" aaa @@ -132409,21 +132421,40 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaf -aaa +aaf +aoa +aoa +aoa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaf aaa aaa aaa @@ -132480,25 +132511,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (152,1,1) = {" aaa @@ -132666,22 +132678,41 @@ aaf aaa aaa aaa -aaa -aaa +aaf aaa aaf aaf aaf -aaa -aaa -aaa -aaa -aaa +aaf +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaf -aaf -aaa -aaa aaa aaa aaa @@ -132737,25 +132768,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (153,1,1) = {" aaa @@ -132929,33 +132941,33 @@ aaf aaf aaa aaf -aaf -aaf -aaf -aaf -aaf -aaf -aaf -aac -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +daE +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -133186,33 +133198,33 @@ aaa aaf aaf aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +daG +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +dde +ddn +cZt +cZc aaa aaa aaa @@ -133443,33 +133455,33 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -133700,33 +133712,33 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -133957,36 +133969,36 @@ aaa aaa aaf aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf aaa aaa aaa @@ -134214,35 +134226,35 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +ddc +cZc +aaf +aaf aaa aaa aaa @@ -134471,35 +134483,35 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaf +aaf aaa aaa aaa @@ -134728,34 +134740,34 @@ aaa aaf aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaf aaa aaa aaa @@ -134985,35 +134997,35 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaf +aaf aaa aaa aaa @@ -135242,34 +135254,34 @@ aaf aaf aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc +aaf aaa aaa aaa @@ -135499,33 +135511,33 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -135756,33 +135768,33 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +ddc +cZc aaa aaa aaa @@ -136013,33 +136025,33 @@ aaa aaa aaf aaf -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +cZx +ddn +cZt +cZc aaa aaa aaa @@ -136270,33 +136282,33 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZy +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZF +cZt +cZt +cZc aaa aaa aaa @@ -136527,34 +136539,34 @@ aaa aaa aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +cZc +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZB +cZc +cZc +cZc +aaf aaa aaa aaa @@ -136785,33 +136797,33 @@ aaa aaf aaa aaa +aaf +aaf aaa aaa aaa aaa +aaf +aaa +aaa +aaf +aaf +aaf +aaf +aaf aaa aaa aaa +aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf +aaf +aaf +aaf +aaf +aaf aaa aaa aaa @@ -137040,6 +137052,8 @@ aaa aaa aaa aaf +aaf +aaf aaa aaa aaa @@ -137052,20 +137066,18 @@ aaa aaa aaa aaa +aaf +aaa +aaf +aaf aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf +aaf aaa aaa aaa @@ -137313,7 +137325,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 6f9c860ea8c..5693f5912ab 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -5982,11 +5982,10 @@ /turf/open/floor/plating, /area/maintenance/auxsolarstarboard) "amx" = ( -/obj/structure/chair{ - dir = 1 +/turf/open/floor/plating/warnplate{ + dir = 5 }, -/turf/open/floor/plating, -/area/maintenance/fsmaint2) +/area/shuttle/auxillary_base) "amy" = ( /obj/structure/chair/stool{ pixel_y = 8 @@ -7788,9 +7787,8 @@ /turf/open/floor/plating, /area/maintenance/fsmaint2) "aqB" = ( -/obj/effect/decal/cleanable/cobweb2, -/turf/open/floor/plating, -/area/maintenance/fsmaint2) +/turf/open/floor/plating/warnplate, +/area/shuttle/auxillary_base) "aqC" = ( /obj/machinery/computer/slot_machine{ balance = 15; @@ -8628,8 +8626,9 @@ /turf/open/floor/plating, /area/maintenance/fsmaint2) "asB" = ( -/turf/closed/wall, -/area/maintenance/electrical) +/obj/machinery/door/airlock/research, +/turf/open/floor/plasteel, +/area/mining_construction) "asC" = ( /turf/open/floor/plasteel/airless, /area/space/nearstation) @@ -9010,11 +9009,9 @@ /turf/open/floor/plating, /area/maintenance/fsmaint2) "atB" = ( -/obj/machinery/door/airlock/maintenance{ - req_access_txt = "12" - }, -/turf/open/floor/plating, -/area/maintenance/fsmaint2) +/obj/machinery/light, +/turf/open/floor/plasteel, +/area/mining_construction) "atC" = ( /obj/item/stack/rods{ amount = 50 @@ -9493,6 +9490,11 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, /turf/open/floor/plating, /area/maintenance/fsmaint2) "auI" = ( @@ -11112,12 +11114,9 @@ /turf/open/floor/plating, /area/maintenance/fpmaint2) "ayj" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/docking_port/mobile/auxillary_base, /turf/open/floor/plating, -/area/maintenance/electrical) +/area/shuttle/auxillary_base) "ayk" = ( /turf/open/floor/plasteel/warning, /area/hallway/secondary/entry) @@ -12133,49 +12132,30 @@ name = "\improper Garden" }) "aAy" = ( -/obj/machinery/power/smes{ - charge = 0 - }, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/turf/open/floor/plating, -/area/maintenance/electrical) +/turf/closed/wall, +/area/mining_construction) "aAz" = ( -/obj/machinery/computer/monitor{ - name = "backup power monitoring console" - }, -/obj/structure/cable{ - icon_state = "0-4"; - d2 = 4 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/electrical) -"aAA" = ( -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8"; +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK"; pixel_x = 0 }, /turf/closed/wall, -/area/maintenance/electrical) -"aAB" = ( -/obj/machinery/power/smes{ - charge = 0 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/area/mining_construction) +"aAA" = ( +/obj/machinery/door/poddoor{ + id = "mining_base" }, /turf/open/floor/plating, -/area/maintenance/electrical) +/area/mining_construction) +"aAB" = ( +/obj/machinery/door/poddoor{ + id = "mining_base" + }, +/turf/closed/wall, +/area/mining_construction) "aAC" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -12655,9 +12635,14 @@ /turf/open/floor/plating, /area/maintenance/fsmaint2) "aBF" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/fsmaint2) +/obj/machinery/button/door{ + id = "mining_base"; + name = "blast doors"; + pixel_x = 4; + pixel_y = 28 + }, +/turf/open/floor/plasteel, +/area/mining_construction) "aBG" = ( /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 8; @@ -13181,17 +13166,16 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/black, /area/chapel/main) "aCQ" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden{ +/turf/open/floor/plasteel/warning{ dir = 4 }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/plasteel/black, -/area/chapel/main) +/area/mining_construction) "aCR" = ( /turf/closed/wall, /area/chapel/main) @@ -13199,8 +13183,8 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/arrival) "aCT" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/arrival) +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "aCU" = ( /obj/machinery/door/airlock/shuttle{ name = "Arrivals Shuttle Airlock" @@ -13213,19 +13197,13 @@ /turf/open/floor/plating, /area/shuttle/arrival) "aCW" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ - dir = 2; - icon_state = "swall_f10"; - layer = 2 +/turf/open/floor/plasteel/warning{ + dir = 8 }, -/area/shuttle/arrival) +/area/mining_construction) "aCX" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 - }, -/area/shuttle/arrival) +/turf/open/floor/plasteel, +/area/mining_construction) "aCY" = ( /obj/machinery/computer/security, /obj/structure/reagent_dispensers/peppertank{ @@ -13887,11 +13865,11 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "aEp" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall11"; - dir = 2 +/obj/machinery/light{ + dir = 8 }, -/area/shuttle/arrival) +/turf/open/floor/plasteel, +/area/mining_construction) "aEq" = ( /obj/machinery/computer/arcade, /turf/open/floor/mineral/titanium/blue, @@ -14445,11 +14423,14 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "aFD" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall1"; - dir = 2 +/obj/machinery/light{ + dir = 4; + icon_state = "tube1" }, -/area/shuttle/arrival) +/turf/open/floor/plasteel/warning{ + dir = 8 + }, +/area/mining_construction) "aFE" = ( /obj/structure/chair{ dir = 8 @@ -15965,11 +15946,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "aIH" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall2"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 9 }, -/area/shuttle/arrival) +/area/shuttle/auxillary_base) "aII" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber{ on = 1; @@ -16583,12 +16563,10 @@ }, /area/chapel/main) "aKf" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 1 }, -/area/shuttle/arrival) +/area/shuttle/auxillary_base) "aKg" = ( /obj/structure/closet/emcloset, /turf/open/floor/mineral/titanium/blue, @@ -17123,18 +17101,14 @@ /turf/open/floor/plating, /area/shuttle/arrival) "aLt" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 - }, -/area/shuttle/arrival) +/obj/machinery/computer/shuttle/mining, +/turf/open/floor/plating, +/area/shuttle/auxillary_base) "aLu" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 8 }, -/area/shuttle/arrival) +/area/shuttle/auxillary_base) "aLv" = ( /obj/machinery/firealarm{ dir = 8; @@ -37492,11 +37466,10 @@ /turf/open/floor/plating, /area/maintenance/asmaint2) "bEJ" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 4 }, -/area/shuttle/labor) +/area/shuttle/auxillary_base) "bEK" = ( /obj/machinery/computer/security/mining, /obj/machinery/camera{ @@ -52315,12 +52288,20 @@ /turf/open/floor/plating, /area/maintenance/asmaint2) "ckq" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ +/obj/docking_port/stationary{ + area_type = /area/shuttle/auxillary_base; dir = 8; - icon_state = "diagonalWall3" + dwidth = 3; + height = 5; + id = "mining_base"; + name = "auxillary mining base"; + turf_type = /turf/open/floor/plating; + width = 7 }, -/area/shuttle/syndicate) +/turf/open/floor/plating/warnplate{ + dir = 4 + }, +/area/shuttle/auxillary_base) "ckr" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -52882,11 +52863,10 @@ /turf/open/floor/plating, /area/maintenance/aft) "clB" = ( -/obj/machinery/door/airlock/external{ - req_access_txt = "13" - }, +/obj/item/device/assault_pod/mining, +/obj/structure/table, /turf/open/floor/plating, -/area/maintenance/aft) +/area/shuttle/auxillary_base) "clC" = ( /obj/structure/cable{ d1 = 1; @@ -54610,8 +54590,9 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/pod_4) "cpe" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/pod_4) +/obj/machinery/computer/shuttle/auxillary_base, +/turf/closed/wall, +/area/shuttle/auxillary_base) "cpf" = ( /obj/machinery/telecomms/allinone{ intercept = 1 @@ -55221,22 +55202,15 @@ /turf/open/floor/plating, /area/engine/engineering) "cqq" = ( -/turf/open/floor/plating, -/obj/structure/shuttle/engine/propulsion/burst{ - dir = 4 +/turf/open/floor/plating/warnplate{ + dir = 10 }, -/turf/closed/wall/shuttle{ - icon_state = "swall_f5"; - dir = 2 - }, -/area/shuttle/pod_4) +/area/shuttle/auxillary_base) "cqr" = ( -/turf/open/space, -/turf/closed/wall/shuttle{ - icon_state = "swall_f9"; - dir = 2 +/turf/open/floor/plating/warnplate{ + dir = 6 }, -/area/shuttle/pod_4) +/area/shuttle/auxillary_base) "cqs" = ( /obj/structure/sign/fire{ pixel_x = 0; @@ -55704,14 +55678,26 @@ /turf/open/floor/plating, /area/shuttle/escape) "cry" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/escape) -"crz" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall_s10"; - dir = 2 +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1; + d2 = 2 }, -/area/shuttle/escape) +/obj/machinery/power/apc{ + dir = 8; + name = "Base Construction APC"; + pixel_x = -25; + pixel_y = 3 + }, +/turf/open/floor/plasteel, +/area/mining_construction) +"crz" = ( +/obj/machinery/door/airlock/engineering{ + name = "Construction Area"; + req_access_txt = "32" + }, +/turf/open/floor/plating, +/area/mining_construction) "crA" = ( /obj/structure/transit_tube/station{ dir = 8; @@ -58367,11 +58353,14 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cwH" = ( -/turf/open/floor/plasteel/shuttle/white, -/turf/closed/wall/shuttle/interior{ - icon_state = "swall_f5" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2"; + pixel_y = 0 }, -/area/shuttle/escape) +/turf/open/floor/plasteel, +/area/mining_construction) "cwI" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/escape) @@ -58442,23 +58431,46 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cwT" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall13"; - dir = 2 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" }, -/area/shuttle/escape) +/turf/open/floor/plating, +/area/maintenance/fsmaint2) "cwU" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall12"; - dir = 2 +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" }, -/area/shuttle/escape) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, +/turf/open/floor/plating, +/area/maintenance/fsmaint2) "cwV" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall14"; - dir = 2 +/obj/machinery/door/airlock/engineering{ + name = "Construction Area"; + req_access_txt = "32" }, -/area/shuttle/escape) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8"; + pixel_x = 0; + tag = "" + }, +/turf/open/floor/plating, +/area/mining_construction) "cwW" = ( /obj/machinery/status_display, /turf/closed/wall/mineral/titanium, @@ -58558,11 +58570,13 @@ /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "cxl" = ( -/turf/closed/wall/shuttle{ - icon_state = "swall7"; - dir = 2 +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" }, -/area/shuttle/escape) +/turf/open/floor/plasteel, +/area/mining_construction) "cxm" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/escape) @@ -58632,8 +58646,10 @@ /turf/open/floor/plating, /area/shuttle/transport) "cxx" = ( -/turf/closed/wall/mineral/titanium/overspace, -/area/shuttle/transport) +/obj/structure/grille, +/obj/structure/window/fulltile, +/turf/closed/wall, +/area/maintenance/fsmaint2) "cxy" = ( /turf/open/floor/mineral/titanium/blue, /turf/closed/wall/mineral/titanium/interior, @@ -58683,11 +58699,10 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "cxF" = ( -/turf/open/floor/plasteel/shuttle, -/turf/closed/wall/shuttle/interior{ - icon_state = "swall_f10" +/turf/open/floor/plasteel/warning{ + dir = 1 }, -/area/shuttle/transport) +/area/mining_construction) "cxG" = ( /obj/machinery/door/airlock/external{ cyclelinkeddir = 4; @@ -103994,7 +104009,7 @@ aqz aru alP anf -anf +cwT avE anf anf @@ -104235,7 +104250,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaf @@ -104251,7 +104266,7 @@ anf anf asy anf -anf +cwU alP alP anf @@ -104491,7 +104506,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -104508,11 +104523,11 @@ aqA anf alP atz -anf +cwT alP awJ anf -alP +cxx aAv anf aCE @@ -104745,31 +104760,31 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaa -aaa -alP -alP -alP -alP -alP -anf -anf -alP -anf -anf -apE +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +crz +cwV +aAy +aAy +aAy +aAy anf anf aCE @@ -105002,33 +105017,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaa -alO -apD -aEl -anf -arx -anf -anf -alP -alP +aAy +aBF +aCX +aEp +aCX +aCX +aCX +aCX +aCX +aEp +aCX +aCX +aCX +aCX +aCX +aCX +aEp +aCX +cry +cwH +cxl +aCX +aCX atB -alP -alP -alP +aAy +aAy +aAy aCF aDZ aFw @@ -105259,33 +105274,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -alP -anf -anf -arw -asA -asA -anf -alP -awL -anf -anf -apE -aBF +aAz +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCQ +aCX +aCX +aAy aCH aED aFy @@ -105516,33 +105531,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -alO -aoQ -anf -arv -asz -atA -anf -alP -awK -anf -awD -apE -anf +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aIH +aLu +aLu +aLu +aLu +aLu +cqq +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCk aEC aFx @@ -105773,33 +105788,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -alP -alP -alP +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aKf +aCT +aCT +aCT +aCT +aCT aqB -arx -anf -anf -anf -alP -awM -ayg -ayg -ayg -ayg +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCl aEe aFw @@ -106030,33 +106045,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -alP -aoP -alP -alP -apE -alP -atB -alP -alP -awx -aye -ayd -aAc -ayd +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aKf +aCT +aCT +aCT +aCT +aCT +aqB +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCI aEd aFw @@ -106287,33 +106302,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaf -aaf -alP -alP -alP -alP -alP -anf -anf -anf -anf -anf -anf -aty -anf -awx -avI -asA -apE -arx +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aKf +aCT +aCT +aCT +aCT +aCT +aqB +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +atB +aAy aCo aEf aFw @@ -106544,33 +106559,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -alO +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT amx -anf -anf -anf -anf -alP -alP -alP -asB -asB -asB -avo -awx -avH -asB -asB -asB +bEJ +bEJ +ckq +bEJ +bEJ +cqr +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCK aEf aFw @@ -106801,33 +106816,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -alP -alP -alP -alP -alP -anf -alP -aqD -arz -asB -atD -auJ -asB -awQ -avK -azt +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aLt +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX aAy -asB aCN aEf aFw @@ -107058,33 +107073,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaf -aaf -aaf -aaf -alP -anf -alP -aqC -ary -asB -atC -auI -auI -awP -avJ -awO -awO -asB +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCM aEg aFw @@ -107315,33 +107330,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -alP -anf -alP -alP -alP -asB -atE -auI -auI -awT -avM -azv aAA -asB +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCE aEi aFw @@ -107572,32 +107587,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaf -alP -anf -apE -anf -anf -asB -asB -asB -avL -awR -auI -azu -aAz +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX asB aCO aEh @@ -107829,34 +107844,34 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -alP -aoQ -alP -aqE -arA -asB -atG -auL -avN -axa -auI -azw aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX asB -aCQ +aCO aEk aFB aHn @@ -108086,32 +108101,32 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -alP -alP -alP -alP -alP -asB -atF -auK -auJ -awS -auI -awO -awO +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +clB +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX asB aCP aEj @@ -108343,33 +108358,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aae -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaf -aaa -aaa -asB -atH -auM -avO -awU +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cpe +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT ayj -azx -aAB -asB +cxF +aCX +aAy aCR aEm aCR @@ -108600,33 +108615,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -asB -asB -asB -asB -asB -asB -asB -asB -asB +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCR bfb aCR @@ -108857,33 +108872,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaf -aaa -aaa -atS -apQ -aoV -aoV -atS -apQ -apQ -apQ -atS +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aCR aEn aCR @@ -109114,33 +109129,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atS -aoV -aoV -aoV -atS -aoV -aoV -apQ -atS +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -109371,33 +109386,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atS -aoV -aoV -aoV -aaH -aoV -aoV -apQ -atS +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +atB +aAy aaf aaa aaf @@ -109628,33 +109643,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atS -aoV -aoV -aoV -aaH -aoV -aoV -aoV -atS +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -109885,33 +109900,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaH -aoV -aoV -aoV -atS -aoV -aoV -aoV -atS +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -110142,33 +110157,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -atS -aoV -aoV -aoV -atS -aoV -aoV -aoV -apQ +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -110399,33 +110414,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aae -aaa -atS -aoV -aoV -aoV -atS -aoV -aoV -aoV -aoV +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -110656,33 +110671,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -apQ -aoV -aoV -aoV -atS -aoV -aoV -aoV -aoV +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaf aaa aaf @@ -110912,34 +110927,34 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -apQ -aoV -aoV -aoV -apQ -aoV -aoV -aoV -aoV +aae +aAA +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +atB +aAy aaf aaa aaf @@ -111170,33 +111185,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aoV -aoV -aoV -aoV -apQ -aoV -aoV -aoV -aoV +aAB +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +aCT +cxF +aCX +aAy aaa aaa aaf @@ -111427,33 +111442,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aAz +aCW +aCW +aFD +aCW +aCW +aCW +aCW +aCW +aFD +aCW +aCW +aCW +aCW +aCW +aCW +aFD +aCW +aCW +aCW +aCW +aCW +aCW +aCW +aCX +aCX +aAy aaa aaa aaf @@ -111684,33 +111699,33 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy +aAy aaa aaa aaa @@ -111944,23 +111959,23 @@ aaa aaa aaa aaa +aaf +aaf +aaa +aaa +aaa +aaf +aaf +aaf aaa aaa aaa aaa aaa +aaf +aaf aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf aaa aaa aaa @@ -112200,23 +112215,23 @@ aaa aaa aaa aaa +aaf aaa aaa aaa aaa aaa aaa +aaf aaa aaa aaa +aaf aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf +aaf aaa aaa aaa @@ -112457,22 +112472,22 @@ aaa aaa aaa aaa +aaf aaa aaa aaa aaa aaa aaa +aaf +aaa +aaa +aaf aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaf aaa aaa aaa @@ -112721,15 +112736,15 @@ aaa aaa aaa aaa +aaf +aaf +aaf +aaf aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa +aaf aaa aaa aaa @@ -112978,16 +112993,16 @@ aaa aaa aaa aaa +aaf +aaa +aaf aaa aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa +aaf aaa aaa aaa @@ -113235,7 +113250,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -113492,7 +113507,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -113749,9 +113764,9 @@ aaa aaa aaa aaa +aaf aaa -aaa -aaa +aaf aaa aaa aaa @@ -114005,9 +114020,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +aaf +aaf +aaf aaa aaa aaa @@ -114262,7 +114277,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa @@ -114519,7 +114534,7 @@ aaa aaa aaa aaa -aaa +aaf aaa aaa aaa diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 7ee4db856d4..1761efdda88 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -1158,6 +1158,10 @@ var/list/teleportlocs = list() name = "Construction Area" icon_state = "yellow" +/area/mining_construction + name = "Auxillary Base Construction" + icon_state = "yellow" + /area/construction/supplyshuttle name = "Supply Shuttle" icon_state = "yellow" diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 292fee234dc..3a0612369a0 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -55,7 +55,7 @@ desc = "Used to call and send the mining shuttle." circuit = /obj/item/weapon/circuitboard/computer/mining_shuttle shuttleId = "mining" - possible_destinations = "mining_home;mining_away" + possible_destinations = "mining_home;mining_away;mining_base" no_destination_swap = 1 var/global/list/dumb_rev_heads = list() @@ -500,3 +500,71 @@ anchored = 1 layer = BELOW_MOB_LAYER density = 0 + +///Mining Base//// + +/area/shuttle/auxillary_base + name = "Auxillary Base" + + +/obj/machinery/computer/shuttle/auxillary_base + name = "auxillary base launch control" + icon = 'icons/obj/terminals.dmi' + icon_state = "dorm_available" + shuttleId = "colony_drop" + possible_destinations = null + clockwork = TRUE + +/obj/machinery/computer/shuttle/auxillary_base/Topic(href, href_list) + if(href_list["move"]) + if(z != ZLEVEL_STATION) + usr << "You can't move the base again!" + return 0 + ..() + +/obj/item/device/assault_pod/mining + name = "Landing Field Designator" + icon_state = "gangtool-purple" + item_state = "electronic" + icon = 'icons/obj/device.dmi' + desc = "Deploy to designate the landing zone of the auxillary base." + shuttle_id = "colony_drop" + dwidth = 11 + dheight = 0 + width = 23 + height = 23 + lz_dir = 1 + +/obj/item/device/assault_pod/mining/attack_self(mob/living/user) + var/turf/T = get_turf(user) + if(T.z != ZLEVEL_MINING) + user << "Wouldn't do much good dropping a mining base away from the mining area!" + return + + var/obj/docking_port/stationary/landing_zone = new /obj/docking_port/stationary(T) + landing_zone.id = "colony_drop(\ref[src])" + landing_zone.name = "Landing Zone" + landing_zone.dwidth = dwidth + landing_zone.dheight = dheight + landing_zone.width = width + landing_zone.height = height + landing_zone.setDir(lz_dir) + + for(var/obj/machinery/computer/shuttle/S in machines) + if(S.shuttleId == shuttle_id) + S.possible_destinations = "[landing_zone.id]" + + user << "Landing zone set." + + qdel(src) + + +/area/shuttle/auxillary_base + name = "Auxillary Base" + +/obj/docking_port/mobile/auxillary_base + name = "auxillary base" + id = "colony_drop" + dwidth = 11 + width = 23 + height = 23 \ No newline at end of file From aae09b939be8e70dd2680d1e05c5b30197716279 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 30 Jul 2016 23:30:39 -0500 Subject: [PATCH 2/3] Fixes mining shuttle breaking --- _maps/map_files/MetaStation/MetaStation.dmm | 11 +++----- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 26 ++++++++----------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ab00758cc74..e6cb749bb1b 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -13240,7 +13240,7 @@ "axc" = ( /obj/structure/grille, /obj/structure/window/shuttle, -/turf/open/floor/plating, +/turf/open/floor/pod/light, /area/shuttle/mining) "axd" = ( /turf/open/space, @@ -15477,10 +15477,6 @@ }, /area/library) "aAR" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Mining Shuttle Airlock"; - req_access_txt = "0" - }, /obj/docking_port/mobile{ dir = 8; dwidth = 3; @@ -15498,7 +15494,8 @@ name = "mining shuttle bay"; width = 7 }, -/turf/open/floor/plating, +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "aAS" = ( /obj/machinery/door/airlock/external{ @@ -16983,7 +16980,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/plating/airless, +/turf/open/floor/pod/light, /area/shuttle/mining) "aDx" = ( /obj/structure/ore_box, diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 5693f5912ab..6df7be72240 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -11919,10 +11919,9 @@ /area/crew_quarters/sleep) "aAc" = ( /obj/structure/grille, -/obj/structure/window/fulltile, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating, -/area/maintenance/fsmaint2) +/obj/structure/window/shuttle, +/turf/open/floor/pod/light, +/area/shuttle/labor) "aAd" = ( /obj/machinery/light_switch{ pixel_y = -25 @@ -39628,10 +39627,6 @@ /turf/open/floor/plating, /area/quartermaster/miningdock) "bJc" = ( -/obj/machinery/door/airlock/shuttle{ - name = "Mining Shuttle Airlock"; - req_access_txt = "48" - }, /obj/docking_port/mobile{ dir = 8; dwidth = 3; @@ -39649,7 +39644,8 @@ name = "mining shuttle bay"; width = 7 }, -/turf/open/floor/plating, +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium/blue, /area/shuttle/labor) "bJd" = ( /obj/machinery/door/airlock/glass_mining{ @@ -40847,7 +40843,7 @@ /area/shuttle/labor) "bLt" = ( /obj/structure/shuttle/engine/heater, -/turf/open/floor/plating, +/turf/open/floor/pod/light, /area/shuttle/labor) "bLu" = ( /obj/structure/rack{ @@ -80158,9 +80154,9 @@ aaa aaa akD akD -ajX +aAc akD -ajX +aAc akD akD aaa @@ -80670,7 +80666,7 @@ bxx bxu bxu bDi -ajX +aAc bGh bHx amI @@ -81186,9 +81182,9 @@ bxx aaa akD akD -ajX +aAc bJc -ajX +aAc akD akD aaa From bed2a5dae495fdd81bc72ac67f08c8b4b8ffcf2d Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 30 Jul 2016 23:39:11 -0500 Subject: [PATCH 3/3] Can't launch the colony as the clown --- code/modules/mining/mine_items.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 3a0612369a0..058e56530e8 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -512,6 +512,7 @@ icon = 'icons/obj/terminals.dmi' icon_state = "dorm_available" shuttleId = "colony_drop" + req_access = list(access_heads) possible_destinations = null clockwork = TRUE