From adbc1e532595d43f2e0597487f98e33da942be72 Mon Sep 17 00:00:00 2001 From: Zergspower Date: Tue, 11 Oct 2022 12:13:00 -0500 Subject: [PATCH] Granite's Love pass 2 of X for ruins (#16760) Beeping Love --- .../SpaceRuins/skyrat/ancient_satellite.dmm | 24 +- _maps/RandomRuins/SpaceRuins/skyrat/crash.dmm | 39 +- .../SpaceRuins/skyrat/prisonshuttle.dmm | 679 +++--- .../SpaceRuins/skyrat/shuttle8532.dmm | 1834 ++++++----------- .../SpaceRuins/skyrat/smugglies.dmm | 219 +- 5 files changed, 1223 insertions(+), 1572 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/ancient_satellite.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/ancient_satellite.dmm index 295b187ec06..0a854e14cf1 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/ancient_satellite.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/ancient_satellite.dmm @@ -1,56 +1,56 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/turf/open/space/basic, -/area/space) +/turf/template_noop, +/area/template_noop) "b" = ( /obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 4; pixel_x = 20 }, /turf/closed/wall/mineral/titanium, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "p" = ( /obj/machinery/door/airlock/titanium, /turf/open/floor/plating/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "s" = ( /obj/item/camera_bug, /obj/item/encryptionkey/headset_sci, /obj/structure/table/reinforced, /obj/structure/window/reinforced/shuttle, /turf/open/floor/plating/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "y" = ( /obj/machinery/power/solar/fake, /turf/open/floor/iron/solarpanel/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "D" = ( /obj/machinery/exoscanner, /turf/open/floor/plating/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "G" = ( /obj/machinery/power/shuttle_engine/propulsion/burst{ dir = 8; pixel_x = -20 }, /turf/closed/wall/mineral/titanium, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "I" = ( /turf/closed/wall/mineral/titanium, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "M" = ( /obj/structure/table/reinforced, /obj/item/fuel_pellet/exotic, /obj/item/gps, /obj/structure/window/reinforced/shuttle, /turf/open/floor/plating/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "P" = ( /turf/closed/wall/mineral/titanium/nodiagonal, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) "V" = ( /turf/open/floor/plating/airless, -/area/ruin/space) +/area/ruin/space/has_grav/powered/skyrat) (1,1,1) = {" a diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm index 411e6501dee..3cc927167ff 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/crash.dmm @@ -5,6 +5,10 @@ "c" = ( /turf/open/floor/iron/dark/airless, /area/ruin/unpowered/no_grav) +"d" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/ruin/unpowered/no_grav) "e" = ( /obj/item/storage/toolbox/syndicate, /turf/open/floor/iron/dark/airless, @@ -19,7 +23,7 @@ /turf/open/floor/iron/dark/airless, /area/ruin/unpowered/no_grav) "m" = ( -/turf/closed/mineral/random/asteroid, +/turf/closed/mineral/random/high_chance, /area/ruin/space) "t" = ( /obj/effect/decal/cleanable/blood/splatter, @@ -31,7 +35,13 @@ "x" = ( /obj/effect/decal/cleanable/blood, /obj/effect/decal/cleanable/blood/gibs/up, -/turf/open/floor/iron/dark/airless, +/obj/effect/turf_decal/sand, +/turf/open/floor/plating, +/area/ruin/unpowered/no_grav) +"B" = ( +/obj/effect/decal/fakelattice, +/obj/effect/turf_decal/sand, +/turf/open/misc/asteroid/airless, /area/ruin/unpowered/no_grav) "C" = ( /obj/machinery/power/shuttle_engine/propulsion{ @@ -77,12 +87,21 @@ /obj/effect/spawner/random/engineering/material_cheap, /turf/open/floor/iron/dark/airless, /area/ruin/unpowered/no_grav) +"U" = ( +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating, +/area/ruin/unpowered/no_grav) "V" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/engineering/toolbox, /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/iron/dark/airless, /area/ruin/unpowered/no_grav) +"X" = ( +/obj/effect/turf_decal/sand, +/turf/open/floor/plating, +/area/ruin/unpowered/no_grav) "Y" = ( /obj/machinery/power/port_gen/pacman/super, /turf/open/floor/iron/dark/airless, @@ -165,8 +184,8 @@ m m v I -c -m +d +d t v m @@ -176,10 +195,10 @@ a m m v -m +U x -m -m +d +d v m m @@ -188,9 +207,9 @@ m m m m -m -m -m +X +X +B m m m diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm index 5faa81a02a1..855f271bd29 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/prisonshuttle.dmm @@ -1,31 +1,79 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "br" = ( -/mob/living/simple_animal/hostile/russian/ranged/officer, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/mob/living/simple_animal/hostile/russian/ranged/officer{ + loot = list(/obj/effect/mob_spawn/corpse/human/russian/ranged/officer,/obj/item/gun/ballistic/rifle/boltaction) + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"bA" = ( +/turf/closed/wall/mineral/plastitanium/nodiagonal, /area/ruin/space/has_grav/powered/prison_shuttle) "cP" = ( /obj/structure/chair/office{ dir = 8 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/yellow{ + dir = 2 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "da" = ( /turf/template_noop, /area/template_noop) +"dj" = ( +/obj/structure/chair/office{ + dir = 1 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) "dI" = ( /turf/open/floor/plating/airless, /area/ruin/space/has_grav/powered/prison_shuttle) "ev" = ( /obj/structure/table, /obj/item/food/meat/steak/bear, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"eC" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + dir = 8; + name = "Broken Computer" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/dark_red/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"fg" = ( +/obj/effect/turf_decal/stripes/white{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "fV" = ( /obj/structure/table, /obj/item/food/meat/steak/bear, /obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"fZ" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + dir = 4; + name = "Broken Computer" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/green/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "hG" = ( /obj/machinery/computer{ @@ -34,11 +82,12 @@ name = "Broken Computer" }, /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/prison_shuttle) "io" = ( /obj/effect/spawner/structure/window/reinforced/shuttle, -/turf/open/floor/iron/white, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, /area/ruin/space/has_grav/powered/prison_shuttle) "is" = ( /obj/structure/rack, @@ -62,18 +111,11 @@ pixel_x = -9; pixel_y = 9 }, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"ku" = ( -/obj/machinery/porta_turret/syndicate/energy{ - dir = 8; - pixel_x = 32 - }, -/turf/template_noop, -/area/template_noop) "kx" = ( /mob/living/simple_animal/hostile/russian, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "lk" = ( /obj/machinery/power/shuttle_engine/huge, @@ -86,11 +128,7 @@ /obj/structure/table, /obj/item/food/burger/bearger, /obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/powered/prison_shuttle) -"nF" = ( -/obj/effect/spawner/structure/window/reinforced/shuttle, -/turf/open/floor/plating, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "nG" = ( /turf/open/floor/iron/stairs/left, @@ -98,17 +136,17 @@ "nH" = ( /obj/structure/table, /obj/item/food/bearsteak, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "oI" = ( /obj/structure/table, /obj/item/food/meat/steak/bear, /obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "oY" = ( /obj/structure/chair/office, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "qg" = ( /obj/machinery/computer{ @@ -116,69 +154,161 @@ dir = 8; name = "Broken Computer" }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/yellow{ + dir = 6 + }, +/obj/effect/turf_decal/tile/purple/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "qU" = ( /obj/machinery/power/shuttle_engine/heater, -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"rZ" = ( +/obj/effect/turf_decal/tile/green/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"ta" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 4 + }, +/turf/closed/wall/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "tm" = ( -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"uu" = ( +/obj/structure/table, +/obj/item/food/bearsteak, +/turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/prison_shuttle) "uU" = ( /obj/machinery/power/shuttle_engine/large, /turf/template_noop, /area/ruin/space/has_grav/powered/prison_shuttle) -"vA" = ( -/obj/machinery/computer{ - desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; - name = "Broken Computer" +"vq" = ( +/obj/effect/turf_decal/siding/yellow/end{ + dir = 1 }, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"vA" = ( +/obj/structure/table, +/obj/item/food/burger/bearger, +/obj/machinery/light/small/directional/west, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"vM" = ( +/obj/effect/turf_decal/tile/blue/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"wx" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 6 + }, +/turf/closed/wall/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "wO" = ( /obj/structure/chair/office{ dir = 4 }, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"xj" = ( -/obj/effect/spawner/structure/window/reinforced/shuttle, -/obj/machinery/door/poddoor, -/turf/open/floor/plating, +"xb" = ( +/obj/effect/turf_decal/tile/dark_red/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "xo" = ( /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "xp" = ( /obj/machinery/light/small/directional/south, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"xI" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + dir = 8; + name = "Broken Computer" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 5 + }, +/obj/effect/turf_decal/tile/dark_green/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "ys" = ( -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"yE" = ( +/obj/effect/turf_decal/tile/yellow/half{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "yQ" = ( /obj/structure/table, /obj/item/food/meat/cutlet/bear, /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "zu" = ( -/mob/living/simple_animal/hostile/russian/ranged/officer, /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/mob/living/simple_animal/hostile/russian/ranged/officer{ + loot = list(/obj/effect/mob_spawn/corpse/human/russian/ranged/officer,/obj/item/gun/ballistic/rifle/boltaction) + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "zy" = ( /obj/structure/table, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"Bf" = ( -/turf/open/floor/iron/white/corner, +"Bh" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 10 + }, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Bx" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + dir = 4; + name = "Broken Computer" + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 9 + }, +/obj/effect/turf_decal/tile/blue/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"BZ" = ( +/obj/machinery/computer{ + desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; + name = "Broken Computer" + }, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Cv" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/hammerandsickle, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "Cw" = ( /mob/living/simple_animal/hostile/bear/russian, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "CX" = ( /obj/structure/chair{ @@ -186,20 +316,38 @@ }, /obj/effect/mob_spawn/corpse/human/assistant, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "DD" = ( /obj/effect/decal/cleanable/blood/splatter, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"DZ" = ( +/obj/effect/turf_decal/tile/purple/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "ED" = ( /mob/living/simple_animal/hostile/russian, -/turf/open/floor/iron/white/corner, +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/prison_shuttle) +"ET" = ( +/obj/machinery/porta_turret/syndicate/energy{ + dir = 8 + }, +/turf/closed/wall/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Fa" = ( +/obj/effect/turf_decal/stripes/white{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "Hc" = ( /obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "Hq" = ( /obj/machinery/door/airlock/external, @@ -208,22 +356,18 @@ /area/ruin/space/has_grav/powered/prison_shuttle) "Hy" = ( /obj/machinery/door/airlock/security/glass, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "HQ" = ( /obj/structure/table, /obj/item/food/meat/cutlet/bear, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"Ih" = ( -/turf/open/floor/iron/white/side{ +"HZ" = ( +/obj/machinery/power/shuttle_engine/propulsion{ dir = 1 }, -/area/ruin/space/has_grav/powered/prison_shuttle) -"IC" = ( -/turf/open/floor/iron/white/corner{ - dir = 4 - }, +/turf/template_noop, /area/ruin/space/has_grav/powered/prison_shuttle) "IR" = ( /obj/structure/chair{ @@ -231,7 +375,7 @@ }, /obj/effect/mob_spawn/corpse/human/cargo_tech, /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "IU" = ( /obj/machinery/computer{ @@ -239,20 +383,48 @@ dir = 4; name = "Broken Computer" }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Jn" = ( +/obj/structure/table, +/obj/item/food/meat/steak/bear, +/turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/prison_shuttle) "Jo" = ( /obj/effect/decal/cleanable/blood/splatter, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"LR" = ( -/turf/open/floor/iron/white/corner{ +"JG" = ( +/obj/effect/decal/hammerandsickle, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Ku" = ( +/obj/structure/chair/office{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner{ dir = 1 }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Lc" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 1 + }, +/turf/open/floor/plating, /area/ruin/space/has_grav/powered/prison_shuttle) "LU" = ( /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "MR" = ( /obj/structure/chair{ @@ -260,50 +432,39 @@ }, /obj/effect/mob_spawn/corpse/human/cargo_tech, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"MT" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/powered/prison_shuttle) -"Nw" = ( -/obj/machinery/porta_turret/syndicate/energy{ - dir = 4; - pixel_x = -32 - }, -/turf/template_noop, -/area/template_noop) "NJ" = ( /turf/open/floor/iron/stairs/right, /area/ruin/space/has_grav/powered/prison_shuttle) -"OX" = ( -/turf/open/floor/iron/white/corner{ - dir = 8 - }, +"NS" = ( +/obj/machinery/door/poddoor, +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, /area/ruin/space/has_grav/powered/prison_shuttle) -"QT" = ( -/obj/effect/decal/cleanable/blood, -/turf/open/floor/iron/white/corner{ +"NZ" = ( +/obj/effect/turf_decal/siding/yellow{ dir = 4 }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"Rg" = ( -/obj/machinery/porta_turret/syndicate/energy{ - dir = 10; - pixel_x = 32 +"OX" = ( +/turf/open/floor/mineral/plastitanium/red, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Qg" = ( +/obj/effect/decal/cleanable/blood, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"QP" = ( +/obj/machinery/power/shuttle_engine/propulsion{ + dir = 1 }, /turf/template_noop, /area/template_noop) "Rj" = ( /obj/effect/decal/cleanable/blood, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/powered/prison_shuttle) -"RA" = ( -/obj/structure/table, -/obj/item/food/burger/bearger, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "Sb" = ( /obj/machinery/computer{ @@ -311,10 +472,7 @@ dir = 1; name = "Broken Computer" }, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/powered/prison_shuttle) -"SQ" = ( -/turf/open/floor/iron/white/side, +/turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/powered/prison_shuttle) "Us" = ( /obj/structure/chair{ @@ -322,48 +480,49 @@ }, /obj/effect/mob_spawn/corpse/human/assistant, /obj/machinery/light/small/directional/west, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"UX" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) +"Vq" = ( +/obj/effect/turf_decal/tile/dark_green/half{ + dir = 4 + }, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "Vw" = ( /turf/open/floor/iron/stairs/medium, /area/ruin/space/has_grav/powered/prison_shuttle) "Vy" = ( -/mob/living/simple_animal/hostile/russian/ranged/officer, -/turf/open/floor/iron/white, -/area/ruin/space/has_grav/powered/prison_shuttle) -"Wt" = ( -/obj/machinery/porta_turret/syndicate/energy{ - dir = 6; - pixel_x = -32 +/mob/living/simple_animal/hostile/russian/ranged/officer{ + loot = list(/obj/effect/mob_spawn/corpse/human/russian/ranged/officer,/obj/item/gun/ballistic/rifle/boltaction) }, -/turf/template_noop, -/area/template_noop) +/turf/open/floor/mineral/plastitanium, +/area/ruin/space/has_grav/powered/prison_shuttle) "Xa" = ( /obj/structure/table, /obj/item/food/burger/bearger, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "XH" = ( /obj/structure/table, /obj/item/food/meat/steak/bear, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) -"XQ" = ( -/mob/living/simple_animal/hostile/russian, -/turf/open/floor/iron/white/corner{ - dir = 8 - }, -/area/ruin/space/has_grav/powered/prison_shuttle) -"Zp" = ( -/obj/structure/chair/office{ +"Yp" = ( +/obj/machinery/power/shuttle_engine/heater{ dir = 1 }, -/turf/open/floor/iron/white, +/turf/closed/wall/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) "ZG" = ( /obj/item/gps/spaceruin, -/turf/open/floor/iron/white, +/turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/powered/prison_shuttle) (1,1,1) = {" @@ -371,7 +530,6 @@ da da da da -Rg da da da @@ -379,6 +537,8 @@ da da da da +QP +Yp ys ys ys @@ -391,7 +551,6 @@ da da da da -ku da da da @@ -399,24 +558,25 @@ da da "} (2,1,1) = {" -ys -ys -xj -xj -ys da da da +da +da +HZ +Lc +Bh ys ys Hq ys -ys +bA IR -ys +bA Us -ys +bA Us +bA ys ys ys @@ -425,31 +585,30 @@ ys ys ys ys +ET ys -ys -ys -ys +da "} (3,1,1) = {" -ys -RA -ev -ev -ys -ys da da +da +da +HZ +Lc ys +ys +bA hG +fg tm -tm -ys +bA Hy -ys +bA Hy -ys +bA Hy -ys +bA nH yQ ev @@ -464,29 +623,29 @@ lk "} (4,1,1) = {" ys -vA -tm -tm -tm +ys +NS +NS ys ys -ys -ys -MT +bA +bA +bA +Qg tm Jo tm +vM tm +rZ tm -tm -tm -tm +yE tm tm kx tm tm -tm +Qg tm ev qU @@ -497,13 +656,13 @@ lT (5,1,1) = {" ys vA -Zp -tm +ev +ev tm zu -nH +uu ev -ys +bA Xa kx tm @@ -527,17 +686,17 @@ dI lT "} (6,1,1) = {" -xj -vA +NS +BZ tm tm tm tm ED Xa -ys +bA ev -IC +tm tm Rj tm @@ -553,30 +712,30 @@ LU tm tm tm +bA ys ys -ys -ys +da "} (7,1,1) = {" -xj -Hc -tm +NS +BZ +dj tm tm tm OX xp -ys +bA fV -LR +tm tm ys -nF -nF -nF -nF -nF +io +io +io +io +io ys Hc tm @@ -591,25 +750,25 @@ dI uU "} (8,1,1) = {" -xj +NS +BZ tm tm tm tm -tm -Bf +OX tm nG tm -IC tm -nF -IU tm +io +Bx +UX +fZ +UX IU -tm -IU -nF +io tm tm ys @@ -623,40 +782,40 @@ dI lT "} (9,1,1) = {" -xj +NS +Hc tm tm +JG tm -tm -tm -SQ +OX tm Vw tm -Ih tm tm -cP +vq +Ku Vy wO Vy cP -nF +io tm tm ys Cw Hy tm -tm +Cv xp ys ys -ys +da "} (10,1,1) = {" -xj -tm +NS +BZ tm tm tm @@ -665,15 +824,15 @@ OX Jo NJ tm -LR tm -nF -qg tm +io +xI +NZ +eC +NZ qg -tm -qg -nF +io tm tm ys @@ -687,24 +846,24 @@ dI uU "} (11,1,1) = {" -xj -Hc +NS +BZ +dj tm tm tm -tm -Bf +OX xp -ys +bA fV -QT +Qg tm ys -nF -nF -nF -nF -nF +io +io +io +io +io ys Hc tm @@ -719,17 +878,17 @@ dI lT "} (12,1,1) = {" -xj -vA +NS +BZ tm tm tm tm -XQ +ED HQ -ys +bA nH -LR +tm tm xo tm @@ -745,26 +904,26 @@ xo tm tm tm +bA ys ys -ys -ys +da "} (13,1,1) = {" ys -vA -Zp -tm +XH +nH +ev tm br -ev +Jn Xa -ys +bA ev kx tm tm -MT +Qg tm tm tm @@ -784,23 +943,23 @@ lk "} (14,1,1) = {" ys -vA -tm -tm -tm -ys -ys +ys +NS +NS ys ys +bA +bA +bA tm tm tm tm +Vq tm +xb tm -tm -tm -tm +DZ tm tm kx @@ -815,25 +974,25 @@ dI lT "} (15,1,1) = {" -ys -XH -nH -ev -ys -ys da da +da +da +HZ +Lc ys +bA +bA DD +Fa tm -tm -ys +bA Hy -ys +bA Hy -ys +bA Hy -ys +bA zy XH Xa @@ -847,24 +1006,25 @@ dI lT "} (16,1,1) = {" -ys -ys -xj -xj -ys da da da +da +da +HZ +Lc +wx ys ys Hq ys -ys +bA CX -ys +bA MR -ys +bA MR +bA ys ys ys @@ -873,17 +1033,15 @@ ys ys ys ys +ta ys -ys -ys -ys +da "} (17,1,1) = {" da da da da -Wt da da da @@ -891,6 +1049,8 @@ da da da da +QP +Yp ys ys ys @@ -903,7 +1063,6 @@ da da da da -Nw da da da diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm index 901fbe6b9dc..882a33e6439 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/shuttle8532.dmm @@ -73,7 +73,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating/airless, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532engineering) "bo" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/structure/chair/sofa/bench{ @@ -387,9 +387,8 @@ /turf/template_noop, /area/template_noop) "hP" = ( -/obj/machinery/power/shuttle_engine/propulsion, /turf/template_noop, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532engineering) "id" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 8 @@ -632,10 +631,8 @@ /area/ruin/space/has_grav/shuttle8532cargohall) "oe" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/blood/tracks, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/iron/airless, -/area/template_noop) +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "of" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, @@ -693,11 +690,11 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "pe" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating/airless, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532cargohall) "pm" = ( /obj/effect/mob_spawn/corpse/human, /obj/effect/decal/cleanable/blood, @@ -735,12 +732,9 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "pH" = ( -/obj/structure/lattice, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/grille, /turf/template_noop, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532engineering) "qb" = ( /turf/template_noop, /area/template_noop) @@ -854,6 +848,11 @@ /obj/machinery/vending/coffee, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) +"sQ" = ( +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "sR" = ( /obj/effect/mine/explosive, /obj/effect/mapping_helpers/burnt_floor, @@ -990,6 +989,10 @@ /obj/effect/decal/cleanable/blood/tracks, /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) +"ve" = ( +/obj/machinery/power/shuttle_engine/large, +/turf/template_noop, +/area/ruin/space/has_grav/shuttle8532engineering) "vy" = ( /obj/structure/railing{ dir = 4 @@ -1038,10 +1041,11 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532engineering) "wP" = ( -/obj/effect/decal/cleanable/blood/tracks, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/iron/airless, -/area/template_noop) +/obj/item/flashlight/glowstick/red{ + light_on = 1 + }, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "wQ" = ( /obj/effect/turf_decal/vg_decals/numbers/five, /turf/open/floor/iron/airless, @@ -1138,9 +1142,11 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "yx" = ( -/obj/machinery/power/shuttle_engine/large, -/turf/template_noop, -/area/template_noop) +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "yz" = ( /obj/item/chair{ pixel_y = -5 @@ -1249,12 +1255,11 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532engineering) "zZ" = ( -/obj/structure/lattice, -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/obj/structure/cable, /turf/open/floor/plating/airless, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532cargohall) "Av" = ( /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532researchbay) @@ -1692,11 +1697,11 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532cargohall) "Iu" = ( -/obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /turf/open/floor/plating/airless, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532cargohall) "Iv" = ( /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) @@ -1791,9 +1796,12 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "Lf" = ( -/obj/effect/decal/cleanable/blood/tracks, -/turf/open/floor/plating/airless, -/area/template_noop) +/obj/structure/lattice, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/template_noop, +/area/ruin/space/has_grav/shuttle8532engineering) "Ls" = ( /obj/structure/railing{ dir = 1 @@ -1889,11 +1897,11 @@ /turf/open/floor/iron/airless, /area/ruin/space/has_grav/shuttle8532crewquarters) "NG" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, -/turf/open/floor/plating/airless, -/area/template_noop) +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/blood/tracks, +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/iron/airless, +/area/ruin/space/has_grav/shuttle8532engineering) "NJ" = ( /obj/structure/cable, /turf/open/floor/plating/airless, @@ -1934,6 +1942,17 @@ /obj/machinery/light/dim/directional/north, /turf/open/floor/engine/airless, /area/ruin/space/has_grav/shuttle8532engineering) +"Ov" = ( +/obj/effect/decal/cleanable/blood/tracks, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/shuttle8532engineering) +"OC" = ( +/obj/structure/lattice, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, +/turf/open/floor/plating/airless, +/area/ruin/space/has_grav/shuttle8532cargohall) "OG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer4, /obj/machinery/airalarm/directional/north, @@ -2437,10 +2456,9 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/shuttle8532engineering) "YO" = ( -/obj/structure/lattice, -/obj/item/stack/cable_coil/cut, +/obj/machinery/power/shuttle_engine/propulsion, /turf/template_noop, -/area/template_noop) +/area/ruin/space/has_grav/shuttle8532engineering) "YT" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -2570,8 +2588,6 @@ qb qb qb qb -qb -qb "} (2,1,1) = {" qb @@ -2635,8 +2651,6 @@ qb qb qb qb -qb -qb "} (3,1,1) = {" qb @@ -2700,8 +2714,6 @@ qb qb qb qb -qb -qb "} (4,1,1) = {" qb @@ -2734,7 +2746,7 @@ qb qb qb qb -ts +Uv OQ qb qb @@ -2765,8 +2777,6 @@ qb qb qb qb -qb -qb "} (5,1,1) = {" qb @@ -2799,7 +2809,7 @@ qb qb qb qb -dE +eb OQ OQ OQ @@ -2830,8 +2840,6 @@ qb qb qb qb -qb -qb "} (6,1,1) = {" qb @@ -2862,10 +2870,10 @@ OQ qb qb OQ -dE -ts -ts -ts +eb +Uv +Uv +Uv OQ qb qb @@ -2895,8 +2903,6 @@ qb qb qb qb -qb -qb "} (7,1,1) = {" qb @@ -2927,11 +2933,11 @@ SJ SJ SJ Uv -ts -ts -dE -dE -ts +Uv +Uv +eb +eb +Uv qb qb qb @@ -2960,8 +2966,6 @@ qb qb qb qb -qb -qb "} (8,1,1) = {" pu @@ -2994,8 +2998,8 @@ yM ne iG Uv -dE -dE +eb +eb OQ qb qb @@ -3025,8 +3029,6 @@ qb qb qb qb -qb -qb "} (9,1,1) = {" pu @@ -3059,8 +3061,8 @@ aL Av Uv Uv -ts -ts +Uv +Uv OQ qb qb @@ -3090,8 +3092,6 @@ qb qb qb qb -qb -qb "} (10,1,1) = {" HP @@ -3125,7 +3125,7 @@ Bx Uv Uv Uv -ts +Uv OQ qb qb @@ -3155,8 +3155,6 @@ qb qb qb qb -qb -qb "} (11,1,1) = {" HP @@ -3210,16 +3208,14 @@ qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb +QR +QR +QR +QR +QR +QR +QR +QR qb qb "} @@ -3274,19 +3270,17 @@ qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb +QR +QR +pq +Eq +Yq +JB +zz +of +Tt +hP +ve "} (13,1,1) = {" HP @@ -3339,19 +3333,17 @@ qb qb qb qb -qb -qb -qb QR +wM +mX +NO +Iy +Km QR -QR -QR -QR -QR -QR -QR -qb -qb +Tq +Tt +hP +hP "} (14,1,1) = {" HP @@ -3388,15 +3380,13 @@ xj jH Ei Du -ts -ts -ts +dF +dF +dF OQ OQ -xF -qb -qb qb +OQ qb qb qb @@ -3407,16 +3397,16 @@ qb qb qb QR -QR -pq -Eq -Yq -JB -zz -of +Kc +jk +Iy +MM +Iy +Kh +Tq Tt +YO qb -yx "} (15,1,1) = {" HP @@ -3454,15 +3444,13 @@ nV nV sk sk -pe -NG zZ Iu +OC +pe qb -qb -qb -qb -qb +OQ +OQ qb qb qb @@ -3472,15 +3460,15 @@ qb qb qb QR -wM -mX -NO -Iy -Km +OG +RY +Yz +qE +Fn QR Tq Tt -qb +YO qb "} (16,1,1) = {" @@ -3523,11 +3511,9 @@ TQ OQ OQ OQ -YO -qb -qb -OQ qb +ts +ts qb qb qb @@ -3537,15 +3523,15 @@ qb qb qb QR -Kc -jk +ky +WX +ur +DJ Iy -MM -Iy -Kh +QR Tq Tt -hP +YO qb "} (17,1,1) = {" @@ -3588,11 +3574,9 @@ qb qb OQ OQ -qb -qb -qb OQ OQ +ts qb qb qb @@ -3602,16 +3586,16 @@ qb qb qb QR -OG -RY -Yz -qE -Fn +zY +WX +Jk +DJ +Iy QR -Tq +Hu Tt hP -qb +ve "} (18,1,1) = {" HP @@ -3654,29 +3638,27 @@ OQ OQ qb qb +qb +qb +qb +qb +qb CH -qb -ts -ts -qb -qb -qb -qb -qb -qb -qb -qb +hD +pH QR -ky +QR +QR +Cr WX -ur +Uq DJ -Iy +yW QR -Tq +Oi Tt hP -qb +hP "} (19,1,1) = {" HP @@ -3719,29 +3701,27 @@ OQ qb qb qb -ZL +qb +qb +qb OQ -OQ -ts -qb -qb -qb -qb -qb -qb -qb -qb -QR -zY -WX -Jk +Ov +NG +sQ +Ov +HD +EW +ay +GM +Rb +Uq DJ -Iy +wQ QR -Hu +Tq Tt +YO qb -yx "} (20,1,1) = {" HP @@ -3784,28 +3764,26 @@ qb xF qb qb -CH qb qb qb -qb -qb -qb -CH -hD -hD -QR -QR -QR -Cr -WX +az +Lf +yx +aQ +XC +uY +Az +xJ +xJ +hh Uq -DJ -yW +Bh +NX QR -Oi +Tq Tt -qb +YO qb "} (21,1,1) = {" @@ -3850,27 +3828,25 @@ qb qb qb qb -qb -qb -qb -qb +xF +OQ +ts OQ -Lf oe wP -Lf HD -EW -ay -GM +Ig +Sg +pm +Qi Rb Uq -DJ -wQ +Yy +Ha QR Tq Tt -hP +YO qb "} (22,1,1) = {" @@ -3913,30 +3889,28 @@ qb qb qb qb +zM +OQ +OQ +OQ qb qb -qb -qb -qb -qb -az -pH -NG -aQ -XC -uY -Az -xJ -xJ -hh -Uq -Bh -NX +OQ +WO QR -Tq +QR +vE +QR +Eo +Rb +Uq +Yy +uf +QR +MF Tt hP -qb +ve "} (23,1,1) = {" qb @@ -3979,29 +3953,27 @@ qb qb qb qb -qb -qb -qb -xF OQ -ts OQ -dE -fV -HD -Ig -Sg -pm -Qi +qb +hD +qb +OQ +qb +qb +qb +ul +QR +cO Rb -Uq +cA Yy -Ha +Iy QR Tq Tt hP -qb +hP "} (24,1,1) = {" ts @@ -4044,29 +4016,27 @@ Ni qb qb qb -qb -zM OQ +qb +qb +ZL OQ OQ qb qb -OQ -WO -QR -QR -vE +qb +qb QR Eo Rb -Uq -Yy -uf +ur +DJ +Iy QR -MF +Hu Tt +YO qb -yx "} (25,1,1) = {" qb @@ -4108,29 +4078,27 @@ qb qb qb qb -qb -qb -qb -OQ -OQ -qb -hD -qb OQ qb qb qb -ul +CH +qb +qb +qb +qb +qb +qb QR -cO -Rb -cA -Yy -Iy +Eo +VQ +eg +Xa +Fn QR Tq Tt -qb +YO qb "} (26,1,1) = {" @@ -4175,27 +4143,25 @@ qb qb qb qb -qb -OQ +mL +qb +qb qb qb -ZL -OQ -OQ qb qb qb qb QR Eo -Rb -ur -DJ +ED Iy -QR -Hu +Iy +Iy +cH +Tq Tt -hP +YO qb "} (27,1,1) = {" @@ -4240,11 +4206,9 @@ qb qb qb qb -OQ qb qb qb -CH qb qb qb @@ -4252,16 +4216,16 @@ qb qb qb QR -Eo -VQ -eg -Xa -Fn +qK +JQ +Iy +Iy +NO QR -Tq +Hu Tt hP -qb +ve "} (28,1,1) = {" qb @@ -4284,71 +4248,6 @@ qb qb qb qb -qb -qb -qb -OQ -OQ -qb -qb -OQ -OQ -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -mL -qb -qb -qb -qb -qb -qb -qb -qb -QR -Eo -ED -Iy -Iy -Iy -cH -Tq -Tt -hP -qb -"} -(29,1,1) = {" -qb -qb -EM -pu -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb uz qb OQ @@ -4363,73 +4262,6 @@ qb qb qb qb -xF -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -QR -qK -JQ -Iy -Iy -NO -QR -Hu -Tt -qb -yx -"} -(30,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ZL -OQ -OQ -qb -qb -qb -qb -ts -OQ -qb -qb -Ni -qb -qb -qb -qb qb qb qb @@ -4455,15 +4287,14 @@ JB QR HW Tt -qb -qb +hP +hP "} -(31,1,1) = {" -qb -qb -qb -qb -qb +(29,1,1) = {" +qb +qb +EM +pu qb qb qb @@ -4479,6 +4310,7 @@ qb qb qb qb +xF CH qb qb @@ -4493,9 +4325,7 @@ OQ qb qb qb -qb -qb -qb +xF qb qb qb @@ -4520,20 +4350,16 @@ QR QR QR QR -qb +hP qb "} -(32,1,1) = {" -qb -qb -qb -qb -qb -qb +(30,1,1) = {" qb qb qb qb +ow +ow qb qb qb @@ -4542,8 +4368,12 @@ qb qb ow ow +ow +ow +qb +qb +qb qb -xF qb qb qb @@ -4566,6 +4396,130 @@ qb qb qb qb +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +"} +(31,1,1) = {" +qb +qb +qb +ow +ow +ow +qb +qb +qb +qb +qb +ow +ow +ow +ow +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +ts +dE +OK +hj +OQ +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +ow +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +"} +(32,1,1) = {" +qb +qb +ew +ow +ow +qb +qb +qb +qb +CH +hD +ow +ow +ow +ow +ow +qb +qb +qb +qb +qb +qb +Ni +qb +qb +qb +qb +qb +OQ +OQ +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb qb qb qb @@ -4592,19 +4546,19 @@ qb qb qb qb +hD +ow qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb +CH +ow +ow +ow +ow +ow +ow ow qb qb @@ -4615,18 +4569,16 @@ qb qb qb qb -ts -dE -OK -hj +qb +OQ OQ qb qb qb qb qb -qb -qb +ow +ow qb qb qb @@ -4657,6 +4609,21 @@ qb qb qb qb +CH +hD +qb +qb +qb +qb +ow +ow +ow +ow +ow +ow +ow +ow +ow qb qb qb @@ -4665,33 +4632,16 @@ qb qb qb qb +hD +oN qb qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -OQ -OQ -qb -qb -qb -qb -qb -qb -qb -qb +ow +ow +ow qb qb qb @@ -4727,6 +4677,16 @@ qb qb qb qb +ew +ow +ow +ow +ow +ow +ow +ow +ow +ow qb qb qb @@ -4736,27 +4696,15 @@ qb qb qb qb +xF qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -OQ -OQ -qb -qb -qb -qb -qb -qb -qb -qb +ow +ow +ow +ow qb qb qb @@ -4792,6 +4740,16 @@ qb qb qb qb +ew +ow +ow +ow +ow +ow +ow +ow +ow +ow qb qb qb @@ -4805,22 +4763,10 @@ qb qb qb qb -Ni -qb -qb -qb -qb -qb -OQ -OQ -qb -qb -qb -qb -qb -qb -qb -qb +CH +ow +ow +ow qb qb qb @@ -4857,33 +4803,31 @@ qb qb qb qb +ew +ow +ow +ow +ow +ow +ow +ow +ow qb qb qb qb qb qb +xF qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -OQ -OQ -qb -qb -qb -qb -qb -qb -qb +CH +ow +ow +ow +CH +hD qb qb qb @@ -4920,8 +4864,23 @@ qb qb qb qb +qb +qb +ew +ew ow ow +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb qb qb qb @@ -4929,23 +4888,6 @@ qb ow ow ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -hD -oN -qb -qb -qb -qb -qb qb qb qb @@ -4984,49 +4926,47 @@ qb qb qb qb +qb +qb +qb +qb +CH +hD +ew +qb +qb +qb +qb +qb +qb +qb +qb +Ni +qb +qb +qb +qb +qb +ew ow ow -ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb qb qb qb ow ow -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -xF -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb qb qb qb @@ -5048,18 +4988,35 @@ qb qb qb qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +ew ew -ow -ow qb qb -CH -hD -ow -ow -ow -ow -ow +qb +qb +qb qb qb qb @@ -5088,25 +5045,6 @@ qb qb qb qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb "} (41,1,1) = {" qb @@ -5114,30 +5052,15 @@ qb qb qb qb -hD -ow -qb -qb -CH -ow -ow -ow -ow -ow -ow -ow qb qb qb qb qb -xF qb qb qb -ow -ow -ow +qb qb qb qb @@ -5168,6 +5091,19 @@ qb qb qb ow +ow +ow +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb qb qb qb @@ -5179,30 +5115,15 @@ qb qb qb qb -CH -hD -qb -qb -ow -ow -ow -ow -ow -ow -ow -ow -ow qb qb qb qb qb qb -CH -ow -ow -ow -ow +qb +qb +qb qb qb qb @@ -5234,6 +5155,19 @@ qb qb ow ow +ow +ow +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb qb qb qb @@ -5247,566 +5181,44 @@ qb qb qb qb -ew +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb +qb ow -ow -ow -ow -ow -ow -ow -ow -ow -qb -Ni -qb -qb -qb -qb -CH -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -"} -(44,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -ew -ow -ow -ow -ow -ow -ow -ow -ow -ow -qb -qb -qb -qb -qb -qb -CH -hD -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -ow -qb -qb -qb -qb -qb -qb -qb -"} -(45,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -ew -ow -ow -ow -ow -ow -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -ow -qb -qb -qb -qb -qb -qb -qb -"} -(46,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -ew -ew -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -ow -ow -ow -qb -qb -qb -qb -qb -qb -"} -(47,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -CH -hD -ew -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -ow -ow -ow -qb -qb -qb -qb -qb -qb -"} -(48,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -CH -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -qb -qb -qb -qb -qb -qb -qb -"} -(49,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ow -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -"} -(50,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ew -ow -ow -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -"} -(51,1,1) = {" -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -ew -ew -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb -qb qb qb qb diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/smugglies.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/smugglies.dmm index c92e659b57d..0f12a36cb68 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/smugglies.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/smugglies.dmm @@ -4,6 +4,7 @@ /area/template_noop) "c" = ( /obj/machinery/door/airlock/medical, +/obj/effect/mapping_helpers/airlock/access/all, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "d" = ( @@ -48,14 +49,24 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "u" = ( -/obj/structure/table, -/obj/item/seeds/cocoapod, +/obj/machinery/door/airlock/mining{ + name = "Backroom" + }, +/obj/effect/turf_decal/siding/thinplating/dark/corner{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/all, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "v" = ( /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) +"w" = ( +/obj/structure/lattice/catwalk, +/obj/structure/marker_beacon/burgundy, +/turf/template_noop, +/area/template_noop) "y" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/money, @@ -70,10 +81,9 @@ /turf/open/floor/iron/dark, /area/ruin/space/has_grav/powered/skyrat/smugglies) "B" = ( -/obj/structure/closet/secure_closet/hydroponics{ - req_access = null - }, -/turf/open/floor/iron, +/obj/machinery/door/airlock/external, +/obj/effect/mapping_helpers/airlock/access/all, +/turf/open/floor/plating, /area/ruin/space/has_grav/powered/skyrat/smugglies) "C" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ @@ -93,12 +103,10 @@ /turf/open/floor/iron/grimy, /area/ruin/space/has_grav/powered/skyrat/smugglies) "I" = ( -/obj/machinery/door/airlock/mining{ - name = "Backroom" - }, -/obj/effect/turf_decal/siding/thinplating/dark/corner{ - dir = 1 +/obj/structure/closet/secure_closet/hydroponics{ + req_access = null }, +/obj/item/gun/energy/floragun, /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "K" = ( @@ -144,8 +152,10 @@ /turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "W" = ( -/obj/machinery/door/airlock/external, -/turf/open/floor/plating, +/obj/structure/table, +/obj/item/seeds/cocoapod, +/obj/item/circuitboard/machine/spaceship_navigation_beacon, +/turf/open/floor/iron, /area/ruin/space/has_grav/powered/skyrat/smugglies) "Y" = ( /obj/machinery/computer/crew/syndie{ @@ -164,15 +174,15 @@ a a a -z -z -z -z a z z +a +a +a z -z +a +a a a a @@ -184,13 +194,13 @@ z z z z +a +a z z z -z -z -z -z +a +a a a "} @@ -198,23 +208,57 @@ a a a z -O -O -O -O -O -O -O -O -O z z +z +z +a +z +z +z +z +a +a a "} (4,1,1) = {" a z z +z +z +z +z +z +z +z +z +z +z +a +a +"} +(5,1,1) = {" +a +z +z +O +O +O +O +O +O +O +O +O +z +z +w +"} +(6,1,1) = {" +z +z +z O R v @@ -228,8 +272,8 @@ O O h "} -(5,1,1) = {" -a +(7,1,1) = {" +z z z O @@ -240,12 +284,12 @@ O H m o -W +B K -W +B k "} -(6,1,1) = {" +(8,1,1) = {" z z z @@ -253,7 +297,7 @@ O y Z U -I +u o o o @@ -262,7 +306,7 @@ O O C "} -(7,1,1) = {" +(9,1,1) = {" z z z @@ -277,16 +321,16 @@ O O z z -F +w "} -(8,1,1) = {" +(10,1,1) = {" z z z O -B +I o -u +W d o S @@ -294,9 +338,9 @@ e O z z -z +F "} -(9,1,1) = {" +(11,1,1) = {" z z z @@ -313,7 +357,7 @@ z z z "} -(10,1,1) = {" +(12,1,1) = {" z z z @@ -330,41 +374,41 @@ z z z "} -(11,1,1) = {" -z -z -z -O -O -O -O -O -O -O -O -O -z -z -a -"} -(12,1,1) = {" -a -z -z -z -z -z -z -z -z -z -z -z -z -a -a -"} (13,1,1) = {" +z +z +z +O +O +O +O +O +O +O +O +O +z +z +a +"} +(14,1,1) = {" +a +z +z +z +z +z +z +z +z +z +z +z +z +a +a +"} +(15,1,1) = {" a a z @@ -381,3 +425,20 @@ a a a "} +(16,1,1) = {" +a +a +a +z +z +z +z +z +z +z +a +a +a +a +a +"}