From 413a04c0e79cb278b055c3d79bc483823840f882 Mon Sep 17 00:00:00 2001 From: evilew Date: Fri, 17 Jan 2025 00:14:41 +0100 Subject: [PATCH] more mapping tweaks - rotated some airlocks on kilo - small tweaks to near-station ruins (just more details) - small details in xenoarch station --- _maps/RandomRuins/SpaceRuins/DJstation.dmm | 288 +++++++++++---- _maps/RandomRuins/SpaceRuinsStation/roid3.dmm | 106 ++++-- _maps/RandomRuins/SpaceRuinsStation/roid6.dmm | 1 + _maps/RandomRuins/SpaceRuinsStation/roid9.dmm | 340 ++++++++++++++---- _maps/map_files/KiloStation/KiloStation.dmm | 10 +- _maps/map_files/Mining/Lavaland_Lower.dmm | 34 +- 6 files changed, 585 insertions(+), 194 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 7cbee23c98..0affe09426 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -28,7 +28,6 @@ /turf/open/floor/plating, /area/ruin/space/djstation) "ai" = ( -/obj/machinery/telecomms/relay/preset/ruskie, /obj/machinery/light{ dir = 1 }, @@ -36,11 +35,11 @@ /area/ruin/space/djstation) "aj" = ( /obj/machinery/power/terminal, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/ruin/space/djstation) "ak" = ( /obj/item/multitool, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/ruin/space/djstation) "al" = ( /obj/item/storage/toolbox/mechanical{ @@ -61,13 +60,13 @@ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; name = "power storage unit" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/ruin/space/djstation) "ao" = ( /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating, +/turf/open/floor/catwalk_floor, /area/ruin/space/djstation) "ap" = ( /obj/structure/cable{ @@ -108,29 +107,37 @@ /area/ruin/space/djstation) "au" = ( /obj/structure/closet/emcloset, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "av" = ( /obj/machinery/vending/snack, /obj/machinery/light/small{ dir = 1 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "aw" = ( -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "ax" = ( /obj/machinery/light_switch{ pixel_y = 28 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "ay" = ( /obj/machinery/newscaster{ pixel_y = 32 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "az" = ( /obj/structure/table, @@ -180,31 +187,34 @@ /turf/open/floor/plasteel, /area/ruin/space/djstation) "aG" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Kitchen" - }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "aH" = ( /obj/structure/table, -/obj/item/radio/intercom{ - broadcasting = 0; - dir = 8; - freerange = 1; - listening = 1; - name = "Pirate Radio Listening Channel" +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" }, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "aI" = ( /obj/structure/chair/office/light, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + icon_state = "steel_decals_central6" + }, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "aJ" = ( /obj/machinery/door/airlock/public/glass{ - name = "Rest Room" + dir = 8 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "aK" = ( /turf/open/floor/plasteel/grimy, @@ -244,28 +254,43 @@ /area/ruin/space/djstation) "aP" = ( /obj/structure/table, -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "aQ" = ( /obj/structure/table, -/obj/item/radio/intercom{ - broadcasting = 1; - dir = 8; - freerange = 1; - listening = 0; - name = "Pirate Radio Broadcast Channel" +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "aR" = ( -/obj/structure/table, /obj/item/paper/fluff/ruins/djstation, -/turf/open/floor/plasteel/cafeteria, +/obj/structure/table, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "aS" = ( /obj/structure/frame/computer{ - anchored = 1 + anchored = 1; + dir = 4 }, /turf/open/floor/plasteel/grimy, /area/ruin/space/djstation) @@ -291,33 +316,65 @@ /obj/machinery/door/airlock/hatch{ name = "Washroom" }, +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "borderfloor"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/ruin/space/djstation) "aY" = ( /obj/machinery/light{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_decals6" + }, +/turf/open/floor/plasteel, /area/ruin/space/djstation) "aZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating/airless, /area/space/nearstation) "ba" = ( +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plasteel/freezer, /area/ruin/space/djstation) "bb" = ( /obj/structure/chair{ dir = 4 }, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "bc" = ( /obj/structure/window/reinforced{ dir = 1 }, /obj/machinery/space_heater, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "bd" = ( /obj/structure/window/reinforced{ @@ -326,7 +383,15 @@ /obj/structure/rack, /obj/item/clothing/under/costume/soviet, /obj/item/clothing/head/ushanka, -/turf/open/floor/plasteel/cafeteria, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "be" = ( /obj/structure/sink{ @@ -334,13 +399,28 @@ pixel_x = -12; pixel_y = 2 }, -/obj/machinery/light/small, +/obj/structure/mirror{ + name = "dusty mirror"; + pixel_x = -26 + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/freezer, /area/ruin/space/djstation) "bf" = ( /obj/structure/toilet{ pixel_y = 8 }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain" + }, +/obj/machinery/shower{ + dir = 8; + pixel_y = -4 + }, /turf/open/floor/plasteel/freezer, /area/ruin/space/djstation) "bg" = ( @@ -350,13 +430,13 @@ pixel_y = 9 }, /obj/item/pen, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "bh" = ( /obj/structure/sign/warning/vacuum/external{ pixel_y = -32 }, -/turf/open/floor/plasteel/cafeteria, +/turf/open/floor/plasteel/dark, /area/ruin/space/djstation) "bi" = ( /obj/machinery/door/airlock/external{ @@ -372,6 +452,47 @@ /obj/structure/disposaloutlet, /turf/open/floor/plating/airless, /area/space/nearstation) +"bZ" = ( +/obj/item/radio/intercom{ + broadcasting = 0; + dir = 8; + freerange = 1; + listening = 1; + name = "Pirate Radio Listening Channel"; + pixel_y = -14; + pixel_x = 12 + }, +/turf/open/floor/plasteel, +/area/ruin/space/djstation) +"gS" = ( +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_decals6" + }, +/turf/open/floor/plasteel, +/area/ruin/space/djstation) +"mU" = ( +/turf/open/floor/catwalk_floor, +/area/ruin/space/djstation) +"vh" = ( +/obj/machinery/telecomms/relay/preset/ruskie, +/turf/open/floor/catwalk_floor, +/area/ruin/space/djstation) +"zm" = ( +/obj/item/radio/intercom{ + broadcasting = 1; + dir = 8; + freerange = 1; + listening = 0; + name = "Pirate Radio Broadcast Channel"; + pixel_y = -14 + }, +/turf/open/floor/plasteel, +/area/ruin/space/djstation) "Co" = ( /obj/machinery/door/airlock/external{ name = "Ruskie DJ Station" @@ -381,6 +502,35 @@ }, /turf/open/floor/plating, /area/ruin/space/djstation) +"Kw" = ( +/obj/structure/table, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "drain"; + name = "drain"; + dir = 1 + }, +/turf/open/floor/plasteel/dark, +/area/ruin/space/djstation) +"To" = ( +/obj/item/radio/intercom{ + broadcasting = 0; + dir = 8; + freerange = 1; + listening = 1; + name = "Pirate Radio Listening Channel"; + pixel_y = -14; + pixel_x = -12 + }, +/turf/open/floor/plasteel, +/area/ruin/space/djstation) +"Xy" = ( +/turf/open/floor/plasteel/dark, +/area/ruin/space/djstation) (1,1,1) = {" aa @@ -523,7 +673,7 @@ af af af ag -aG +aJ ag af af @@ -547,10 +697,10 @@ ah ap af au -aw -aw -aw -aw +aG +aG +aG +gS af af af @@ -565,17 +715,17 @@ ad ad ag ah -ah -ah -ah -ah +mU +mU +mU +mU aq af av -aw -aH +bZ +Kw aP -aw +gS bb bg af @@ -590,19 +740,19 @@ ac ac af ai -ah +vh aj an ao ar at -aw -aw +aG +zm aI aQ +gS aw -aw -aw +Xy af aa aa @@ -615,17 +765,17 @@ ad ad ag ah -ah +mU ak -ah -ah +mU +mU ah af ax -aw +To aH aR -aw +gS bc bh af @@ -647,12 +797,12 @@ ah as af ay -aw -aw -aw +aG +aG +aG aY bd -aw +Xy bi ah Co diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid3.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid3.dmm index a24d8225a8..883b57afbe 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid3.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid3.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/structure/bed, -/obj/item/bedsheet, +/obj/structure/bed/double, +/obj/item/bedsheet/double_red, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) "c" = ( @@ -27,8 +27,15 @@ /area/ruin/space) "i" = ( /obj/structure/fireplace{ - dir = 8 + dir = 8; + pixel_x = -22 }, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, +/obj/item/stack/sheet/mineral/wood, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) "j" = ( @@ -72,8 +79,15 @@ /obj/item/plant_analyzer, /turf/open/floor/plating/asteroid/airless, /area/ruin/space) +"x" = ( +/turf/open/floor/carpet/red, +/area/ruin/space/has_grav/powered) "y" = ( -/obj/structure/dresser, +/obj/item/kirbyplants/random, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered) +"z" = ( +/obj/structure/closet/secure_closet/personal/cabinet, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) "A" = ( @@ -81,12 +95,21 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/space) "C" = ( -/obj/structure/chair/wood/normal{ - dir = 1 - }, +/obj/item/instrument/guitar, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered) +"D" = ( +/obj/item/chair/wood, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) "E" = ( +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, +/obj/structure/mirror{ + name = "dusty mirror"; + pixel_y = 32 + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/powered) "F" = ( @@ -94,21 +117,26 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/space) "J" = ( -/obj/machinery/light, +/obj/structure/rack/shelf, +/obj/item/reagent_containers/rag/towel, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/powered) "K" = ( -/obj/structure/table/wood, /obj/machinery/light{ dir = 4 }, -/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/structure/dresser, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) "L" = ( -/obj/structure/mirror{ - pixel_x = 28 - }, /obj/effect/turf_decal/bot, /obj/machinery/shower{ dir = 8; @@ -120,14 +148,22 @@ /obj/structure/toilet{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, /turf/open/floor/plasteel/showroomfloor, /area/ruin/space/has_grav/powered) "N" = ( -/obj/structure/rack, -/obj/item/stack/sheet/mineral/wood, -/obj/item/stack/sheet/mineral/wood, +/obj/structure/table/wood, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/open/floor/wood, /area/ruin/space/has_grav/powered) +"O" = ( +/obj/structure/rack, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space) "P" = ( /obj/structure/table/wood, /obj/item/clothing/head/festive, @@ -140,6 +176,12 @@ /obj/item/shovel/spade, /turf/open/floor/plating/asteroid/airless, /area/ruin/space) +"V" = ( +/obj/structure/chair/sofachair{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/space/has_grav/powered) "W" = ( /obj/item/cultivator, /turf/open/floor/plating/asteroid/airless, @@ -234,9 +276,9 @@ d d p p +O d -d -d +O e j p @@ -298,10 +340,10 @@ W d t Y -C +D +v v n -y t p d @@ -318,9 +360,9 @@ d t P C -v -v -v +x +x +z t p d @@ -337,9 +379,9 @@ d m v v -v -v -v +x +x +y t p d @@ -354,10 +396,10 @@ s s d t -v -v -v -v +n +V +x +x v t p @@ -417,7 +459,7 @@ p p p p -d +p q "} (15,1,1) = {" @@ -434,7 +476,7 @@ p p p p -d +p d q q diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm index d9835c4296..6d83e0a88d 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid6.dmm @@ -62,6 +62,7 @@ dir = 8 }, /obj/structure/spider/stickyweb, +/obj/item/trash/fatoray_scrap1, /turf/open/floor/mineral/titanium/blue, /area/ruin/space/has_grav) "P" = ( diff --git a/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm b/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm index aceb476071..b094dcf133 100644 --- a/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm +++ b/_maps/RandomRuins/SpaceRuinsStation/roid9.dmm @@ -2,6 +2,25 @@ "a" = ( /turf/closed/wall/mineral/iron, /area/ruin/space/has_grav) +"b" = ( +/obj/structure/table, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/obj/item/radio/headset, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav) +"c" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/ruin/space/has_grav) "d" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -22,8 +41,23 @@ /turf/open/floor/plasteel, /area/ruin/space/has_grav) "h" = ( -/obj/machinery/light/small, -/turf/open/floor/wood, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) +"i" = ( +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) +"j" = ( +/obj/structure/rack/shelf, +/obj/item/reagent_containers/food/snacks/cannedpeaches, +/obj/item/reagent_containers/food/snacks/cannedpeaches, +/obj/item/reagent_containers/food/snacks/cannedpeaches, +/obj/item/reagent_containers/food/snacks/cannedpeaches, +/turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav) "k" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ @@ -36,20 +70,31 @@ /turf/open/floor/wood, /area/ruin/space/has_grav) "m" = ( -/obj/structure/table/wood, -/turf/open/floor/wood, +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/machinery/door/airlock/public{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav) "n" = ( +/obj/item/export/bottle/vodka, +/obj/item/export/bottle/vodka{ + pixel_y = 8; + pixel_x = -12 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ + pixel_x = 12; + pixel_y = 5 + }, /turf/open/floor/wood, /area/ruin/space/has_grav) "o" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/beans, -/obj/item/reagent_containers/food/snacks/beans, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/wood, +/obj/structure/table, +/turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav) "p" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ @@ -64,6 +109,14 @@ /obj/machinery/atmospherics/components/unary/tank/air{ dir = 8 }, +/obj/effect/turf_decal/loading_area{ + dir = 2; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_decals10" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "r" = ( @@ -75,17 +128,59 @@ }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) -"u" = ( -/obj/structure/chair/comfy/black{ - dir = 1 +"s" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/toilet{ + pixel_y = 6 + }, +/obj/machinery/shower{ + dir = 4 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) +"t" = ( +/obj/structure/table, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/gloves/color/yellow, +/obj/item/multitool, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) +"u" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space) "v" = ( /turf/open/floor/plating/asteroid/airless, /area/ruin/space) "w" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/effect/turf_decal/loading_area{ + dir = 6; + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/loading_area{ + icon_state = "steel_decals3" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "x" = ( @@ -104,19 +199,16 @@ dir = 4 }, /obj/machinery/door/airlock/highsecurity, -/obj/structure/fans/tiny, -/turf/open/floor/plasteel, +/turf/open/floor/catwalk_floor, /area/ruin/space/has_grav) "A" = ( -/obj/structure/table/wood, -/obj/item/export/bottle/wine, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/obj/item/reagent_containers/food/drinks/drinkingglass, -/turf/open/floor/wood, +/obj/machinery/computer/security{ + dir = 8 + }, +/turf/open/floor/plasteel, /area/ruin/space/has_grav) "B" = ( /obj/structure/table/wood, -/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -135,17 +227,34 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "F" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular, +/obj/machinery/computer/crew{ + dir = 8 + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "G" = ( -/obj/machinery/computer/security, +/obj/effect/turf_decal/loading_area{ + icon_state = "steel_decals_central6" + }, +/obj/item/chair, /turf/open/floor/plasteel, /area/ruin/space/has_grav) +"I" = ( +/obj/structure/table, +/obj/machinery/microwave, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) "J" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 9 @@ -153,18 +262,56 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/ruin/space/has_grav) +"K" = ( +/obj/structure/table, +/obj/item/storage/box/donkpockets, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) +"L" = ( +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/obj/machinery/light/small, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) +"M" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ + dir = 4 + }, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external{ + name = "Escape Airlock"; + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/ruin/space/has_grav) "N" = ( /obj/structure/table, -/obj/item/storage/toolbox/mechanical, -/obj/item/clothing/gloves/color/yellow, -/obj/item/multitool, -/turf/open/floor/plasteel, +/obj/item/storage/firstaid/regular, +/obj/structure/window/reinforced/spawner{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav) "O" = ( /turf/open/floor/plasteel, /area/ruin/space/has_grav) "P" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals4" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "Q" = ( @@ -172,21 +319,50 @@ dir = 1 }, /obj/structure/table/wood, -/obj/machinery/microwave, +/obj/item/reagent_containers/food/snacks/beans, /turf/open/floor/wood, /area/ruin/space/has_grav) +"R" = ( +/obj/structure/table, +/obj/item/reagent_containers/food/snacks/beans, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_decals10" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_decals10" + }, +/turf/open/floor/plasteel, +/area/ruin/space/has_grav) +"S" = ( +/obj/structure/closet/emcloset, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/catwalk_floor, +/area/ruin/space/has_grav) "T" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 6 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/open/floor/wood, /area/ruin/space/has_grav) "U" = ( /obj/machinery/sleeper, -/turf/open/floor/plasteel, +/obj/effect/turf_decal/loading_area{ + icon_state = "steel_decals_central6" + }, +/turf/open/floor/plasteel/freezer, /area/ruin/space/has_grav) "V" = ( -/obj/machinery/computer/crew, +/obj/effect/turf_decal/loading_area{ + dir = 8; + icon_state = "steel_decals_central4" + }, /turf/open/floor/plasteel, /area/ruin/space/has_grav) "W" = ( @@ -203,6 +379,12 @@ }, /turf/open/floor/plating/asteroid/airless, /area/ruin/space) +"Z" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/freezer, +/area/ruin/space/has_grav) (1,1,1) = {" e @@ -283,7 +465,7 @@ C C v v -v +C C C C @@ -327,7 +509,7 @@ C C v v -C +v C C C @@ -349,8 +531,8 @@ C C v v -C -C +v +v C C C @@ -369,10 +551,10 @@ C C C C -v -v -v -C +Y +u +u +D C C C @@ -386,18 +568,18 @@ v C C C +a +a +a +a +a +M +a C C C C C -v -v -v -C -C -C -C C C v @@ -408,13 +590,13 @@ v C C C -C -C -C -C -C -Y -D +a +s +L +a +S +c +a C C C @@ -430,17 +612,17 @@ C C C C -C a a +m a a z a -C -C -C -C +a +a +a +a C C C @@ -452,16 +634,16 @@ C C C C -C a +t V -O x +O k -a -a -a -a +h +i +Z +j a C C @@ -474,16 +656,16 @@ C C C C -C a +b G -u +O O k a -l -f -f +I +K +o a C C @@ -496,16 +678,16 @@ C C C C -C a +R F -O +A P W a -d -n -h +a +a +a a C C @@ -518,7 +700,7 @@ C C C C -C +a a a N @@ -569,9 +751,9 @@ a a q a -m -o -A +l +f +d a C v diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 6f19d9cac6..0c5a195ffb 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -41429,7 +41429,8 @@ }, /obj/machinery/door/airlock/maintenance/external{ name = "mass driver intersection"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -76510,7 +76511,8 @@ }, /obj/machinery/door/airlock/maintenance/external{ name = "mass driver intersection"; - req_access_txt = "12" + req_access_txt = "12"; + dir = 8 }, /turf/open/floor/plating, /area/maintenance/fore) @@ -77746,11 +77748,11 @@ /turf/open/floor/plating, /area/maintenance/aft) "cEp" = ( +/obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance{ req_access_txt = "12"; - welded = 1 + dir = 4 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/dark, /area/maintenance/starboard/fore) "cEr" = ( diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 5f824e9463..3556ae0971 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -2949,7 +2949,7 @@ pixel_x = -32 }, /obj/structure/dresser, -/turf/open/floor/carpet/gato, +/turf/open/indestructible/hotelwood, /area/xenoarch/gen) "gB" = ( /obj/structure/closet/secure_closet/personal/cabinet, @@ -3243,7 +3243,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/turf/open/floor/carpet/gato, +/turf/open/indestructible/hotelwood, /area/xenoarch/gen) "hl" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -3463,7 +3463,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 8 }, -/turf/open/floor/carpet/gato, +/turf/open/indestructible/hotelwood, /area/xenoarch/gen) "hM" = ( /obj/effect/turf_decal/box, @@ -3512,7 +3512,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{ dir = 8 }, -/turf/open/floor/carpet/gato, +/turf/open/indestructible/hotelwood, /area/xenoarch/gen) "hR" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ @@ -3549,7 +3549,7 @@ pixel_x = 24; specialfunctions = 4 }, -/turf/open/floor/carpet/gato, +/turf/open/indestructible/hotelwood, /area/xenoarch/gen) "hX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, @@ -13591,6 +13591,10 @@ "Qr" = ( /turf/open/floor/plating/lavaland_baseturf, /area/xenoarch/caloriteresearch_unpowered) +"Qx" = ( +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/xenoarch/arch) "Qy" = ( /obj/machinery/shower{ pixel_y = 19 @@ -14545,6 +14549,12 @@ }, /turf/open/floor/carpet, /area/xenoarch/gen) +"Ub" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/floor/plating, +/area/xenoarch/arch) "Ud" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -15052,6 +15062,10 @@ }, /turf/open/floor/plasteel/freezer, /area/xenoarch/caloriteresearch_powered) +"Wd" = ( +/obj/machinery/light/small, +/turf/open/floor/plasteel/damturf/platdmg1, +/area/xenoarch/arch) "We" = ( /obj/effect/turf_decal/candy/bluewhite1, /turf/open/candyfloor, @@ -18257,7 +18271,7 @@ fX Sy gC hs -hs +mP ic fK hS @@ -22334,7 +22348,7 @@ ab ab ab fL -bG +Ub ZR wq VM @@ -22346,7 +22360,7 @@ wq wq VM th -sw +Wd fL Kg qI @@ -24390,7 +24404,7 @@ ab ab ab fL -bG +Ub ZR aC Di @@ -24402,7 +24416,7 @@ Th sY sY th -bG +Qx fL aB aZ