From 24eccfe08243020207207688976cdf6d1e5be7b5 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:21:51 +0100 Subject: [PATCH] Slightly Remaps Derelict 4 (#29329) * Update derelict4.dmm * creation * Update derelict4.dmm --- .../RandomRuins/SpaceRuins/derelict4.dmm | 519 +++++++++++------- .../mapping/templates/space_map_templates.dm | 9 +- 2 files changed, 326 insertions(+), 202 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm index 3a397374825..fa30b90a81d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/derelict4.dmm @@ -15,29 +15,35 @@ /turf/simulated/wall/mineral/titanium, /area/ruin/space/unpowered) "f" = ( -/obj/machinery/door/airlock/titanium, -/turf/simulated/floor/plating/airless, +/obj/structure/table/reinforced, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/unpowered) "g" = ( +/obj/item/shard, +/obj/effect/decal/remains/robot, +/obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "h" = ( -/turf/simulated/floor/mineral/titanium/blue/airless, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/unpowered) "i" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/mapping_helpers/turfs/damage, +/obj/item/stack/sheet/mineral/titanium{ + amount = 4; + pixel_x = 9; + pixel_y = -8 }, -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/mineral/titanium/blue/airless, -/area/ruin/space/unpowered) -"j" = ( -/obj/structure/chair/comfy/shuttle, -/turf/simulated/floor/mineral/titanium/blue/airless, +/obj/item/stack/sheet/metal{ + amount = 2; + pixel_x = 2; + pixel_y = -6 + }, +/turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "k" = ( /obj/effect/spawner/random/loot_crate/rarely, -/turf/simulated/floor/mineral/titanium/blue/airless, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/unpowered) "l" = ( /obj/structure/shuttle/engine/propulsion{ @@ -46,22 +52,29 @@ /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "m" = ( -/obj/item/shard, +/obj/item/stack/sheet/metal, +/obj/item/stack/sheet/metal, +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/mob_spawn/human/corpse/charredskeleton, +/obj/item/cigbutt, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) "n" = ( +/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/obj/effect/mapping_helpers/turfs/burn, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"o" = ( /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/turf/simulated/floor/plating/airless, -/area/ruin/space/unpowered) -"o" = ( -/obj/structure/grille, -/turf/simulated/floor/plating/airless, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/unpowered) "p" = ( -/obj/structure/table, -/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed, +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/obj/effect/mapping_helpers/turfs/burn, /turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/space/unpowered) "q" = ( @@ -69,31 +82,143 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"t" = ( +/obj/effect/mob_spawn/human/corpse/random_species/assistant, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"u" = ( +/obj/structure/table/reinforced, /turf/simulated/floor/mineral/titanium/blue/airless, /area/ruin/space/unpowered) -"r" = ( +"v" = ( +/obj/item/storage/firstaid/regular, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"w" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"x" = ( +/obj/effect/spawner/random/food_trash, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"y" = ( +/obj/structure/girder, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"z" = ( +/obj/effect/mob_spawn/human/corpse/random_species/doctor, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"B" = ( +/obj/machinery/door/airlock/titanium/glass, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"C" = ( +/obj/effect/spawner/random/trash, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"D" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"E" = ( +/obj/structure/flora/ash/rock/style_random, +/turf/simulated/floor/plating/asteroid/airless, +/area/ruin/space/unpowered) +"F" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4 + }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, -/turf/simulated/floor/mineral/titanium/blue/airless, -/area/ruin/space/unpowered) -"s" = ( -/obj/structure/chair/comfy/shuttle{ - dir = 1 - }, /turf/simulated/floor/plating/airless, /area/ruin/space/unpowered) -"t" = ( -/obj/structure/girder, -/turf/simulated/floor/plating/airless, +"H" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_or_drink/dinner, +/turf/simulated/floor/mineral/titanium/airless, /area/ruin/space/unpowered) "K" = ( /obj/structure/spawner/mining/basilisk/space, /turf/simulated/floor/plating/asteroid/airless, /area/ruin/space/unpowered) +"L" = ( +/obj/effect/mapping_helpers/turfs/burn, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"M" = ( +/obj/effect/mob_spawn/human/corpse/random_species/engineer, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"N" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/grille/broken, +/obj/item/shard{ + icon_state = "medium" + }, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"P" = ( +/obj/machinery/computer/nonfunctional{ + dir = 4 + }, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"Q" = ( +/obj/effect/spawner/window/shuttle, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"R" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"S" = ( +/turf/simulated/wall/mineral/titanium/nodiagonal, +/area/ruin/space/unpowered) +"T" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/food_trash, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"U" = ( +/obj/effect/mob_spawn/human/corpse/random_species/assistant, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"V" = ( +/obj/structure/grille, +/obj/effect/decal/cleanable/glass, +/obj/item/shard{ + icon_state = "small" + }, +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) +"W" = ( +/obj/effect/mapping_helpers/turfs/damage, +/turf/simulated/floor/mineral/titanium/airless, +/area/ruin/space/unpowered) +"X" = ( +/obj/machinery/door/airlock/command/glass, +/turf/simulated/floor/mineral/titanium/blue/airless, +/area/ruin/space/unpowered) +"Y" = ( +/obj/effect/mapping_helpers/turfs/damage, +/obj/effect/spawner/random/engineering/toolbox, +/turf/simulated/floor/plating/airless, +/area/ruin/space/unpowered) "Z" = ( /mob/living/simple_animal/hostile/carp, /turf/template_noop, @@ -677,10 +802,10 @@ b b b b -b -b -b -b +D +N +V +y b b b @@ -716,12 +841,12 @@ d b b b -g -g -o b +g +P +P +w b -c b b d @@ -754,14 +879,14 @@ d d b b -c -e -g +E +y +b m p -g -e -c +R +u +y b b d @@ -795,13 +920,13 @@ b b b c -e -g +y +w n -q -h -e -c +L +U +u +S b b d @@ -835,13 +960,13 @@ b b b c -e -g -h -h -h -e -c +S +S +S +X +S +S +S c b b @@ -873,18 +998,18 @@ a b b b -c +E c e +T +H h -h -h -h +T +f e c c c -c b a a @@ -914,17 +1039,17 @@ a b b c -c -f +e +e +o +o h -h -h -h -f -c +q +o +e +e K c -c b a b @@ -953,17 +1078,17 @@ a a b b -b -c e -i +e +k +t +h +h +h h h -r e -c -c -c +e c a a @@ -993,17 +1118,17 @@ a a b b -b -c -e -j +Q +o +o +o h h -s -t -c -c -c +h +o +o +o +Q c a a @@ -1029,23 +1154,23 @@ a a a a -a b b b d -c -e -k +S +o +o +o h -g -g -g +h +h +o +o +M +S +E c -c -a -a -a a a b @@ -1069,18 +1194,21 @@ b b a a -a b b b d -c -e -e -e -e -e -e +B +x +t +h +h +h +h +W +W +Y +i c c a @@ -1095,9 +1223,6 @@ a a a a -a -a -a "} (26,1,1) = {" a @@ -1109,18 +1234,21 @@ b b a Z -a b b b d -c -e -l -l -l -l -e +S +o +o +o +v +h +h +o +W +w +y c c a @@ -1135,9 +1263,6 @@ a a a a -a -a -a "} (27,1,1) = {" a @@ -1149,23 +1274,23 @@ b b a a -a -b -b b b b c +Q +o +o +o +z +h +h +o +o +C +Q +c c -c -c -c -c -c -c -a -a -a a a a @@ -1190,22 +1315,22 @@ a a a a -a -b b b c +S +F +F +F +S +S +S +F +F +F +S +c c -c -c -c -a -a -a -a -a -a -a Z a a @@ -1230,21 +1355,21 @@ a a a a -a -a b b +b +S +l +l +l +S c +S +l +l +l +S c -c -c -c -a -a -a -a -a -a a a a @@ -1270,21 +1395,21 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c a a a @@ -1311,19 +1436,19 @@ a a a a -a -a -a -a -a -a -a -a -a -a -a -a -a +b +b +c +c +c +c +c +c +c +c +c +c +c a a a @@ -1354,14 +1479,14 @@ a a a a -a -a -a -a -a -a -a -a +c +c +c +c +c +c +c +c a a a @@ -1396,10 +1521,10 @@ a a a a -a -a -a -a +c +c +c +c Z a a diff --git a/code/datums/mapping/templates/space_map_templates.dm b/code/datums/mapping/templates/space_map_templates.dm index 10777b1210d..e81ac14e3d6 100644 --- a/code/datums/mapping/templates/space_map_templates.dm +++ b/code/datums/mapping/templates/space_map_templates.dm @@ -102,11 +102,10 @@ /datum/map_template/ruin/space/derelict4 id = "derelict4" suffix = "derelict4.dmm" - name = "Derelict 4" - description = "Centcom ferries have never crashed, will never crash, \ - there is no current investigation into a crashed ferry, and we \ - will not let Internal Affairs trample over high security information \ - in the name of this baseless witchhunt." + name = "Crashed Transport Shuttle" + description = "Spacecraft regularly travel through the system, some heading to the Nanotrasen installations orbiting Lavaland, but most are simply passing through. \ + Whilst the shipping lanes are relatively well-serviced and monitored, accidents still happen, and space is large enough that help may not come fast enough, assuming you can even let out a distress call." + allow_duplicates = FALSE /datum/map_template/ruin/space/derelict5 id = "derelict5"