From 42000e257a13d871242582f09e802d340a0b716b Mon Sep 17 00:00:00 2001 From: Molnia <161384279+molnizz@users.noreply.github.com> Date: Fri, 16 Aug 2024 05:33:57 +0500 Subject: [PATCH] Fix: Ships and ruins --- .../RandomRuins/SpaceRuins/oldstation.dmm | 54 ++++++++++--------- .../shuttles/solfed/solfed_saber.dmm | 9 ++++ .../shuttles/subshuttles/nanotrasen_ancon.dmm | 43 ++++++++++++--- mod_celadon/maps/code/ruins/ruin.dm | 1 + 4 files changed, 74 insertions(+), 33 deletions(-) diff --git a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm index 042b31ac8cf9..abdf1b02cdba 100644 --- a/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/_mod_celadon/RandomRuins/SpaceRuins/oldstation.dmm @@ -1939,7 +1939,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/template_noop, +/turf/open/floor/plating/rust, /area/template_noop) "pp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -2652,12 +2652,16 @@ color = "#8a8a8a" }, /area/ruin/space/has_grav/ancientstation/rnd) +"vz" = ( +/obj/structure/lattice/catwalk, +/turf/open/floor/plating/rust, +/area/template_noop) "vB" = ( /obj/structure/lattice/catwalk, /obj/structure/cable/yellow{ icon_state = "1-4" }, -/turf/template_noop, +/turf/open/floor/plating/rust, /area/template_noop) "vC" = ( /obj/machinery/conveyor, @@ -3268,7 +3272,7 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/turf/template_noop, +/turf/open/floor/plating/rust, /area/template_noop) "Av" = ( /mob/living/simple_animal/hostile/hivebot, @@ -5847,7 +5851,7 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/turf/template_noop, +/turf/open/floor/plating/rust, /area/template_noop) "UH" = ( /obj/structure/sign/departments/medbay/alt, @@ -6195,7 +6199,7 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/turf/template_noop, +/turf/open/floor/plating/rust, /area/template_noop) "XT" = ( /obj/effect/decal/cleanable/dirt, @@ -8524,20 +8528,20 @@ tY tO tO iO -RJ -RJ +vz +vz UC -RJ -RJ +vz +vz fA UC UC XR -RJ +vz vB -RJ +vz UC -RJ +vz XR tO tO @@ -8620,21 +8624,21 @@ rq tO tO iO -RJ -RJ +vz +vz Au UC UC ep UC -RJ -RJ +vz +vz XR -RJ +vz UC -RJ -RJ -RJ +vz +vz +vz Bp tO tO @@ -8718,16 +8722,16 @@ tO iO pn UC -RJ -RJ -RJ +vz +vz +vz fA UC UC UC vB -RJ -RJ +vz +vz UC UC vB diff --git a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm index 33d7e26e5af1..fe501db7ace5 100644 --- a/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm +++ b/_maps/_mod_celadon/shuttles/solfed/solfed_saber.dmm @@ -1119,6 +1119,9 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/structure/cable{ + icon_state = "0-1" + }, /turf/open/floor/wood/walnut, /area/ship/hallway/central) "ir" = ( @@ -5082,6 +5085,9 @@ /obj/effect/turf_decal/corner/opaque/solgovgold{ dir = 5 }, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/wood/walnut, /area/ship/security) "Ni" = ( @@ -5764,6 +5770,9 @@ dir = 1 }, /obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/cable{ + icon_state = "0-4" + }, /turf/open/floor/wood/yew, /area/ship/crew/office) "TW" = ( diff --git a/_maps/_mod_celadon/shuttles/subshuttles/nanotrasen_ancon.dmm b/_maps/_mod_celadon/shuttles/subshuttles/nanotrasen_ancon.dmm index 2e265d6a0ab2..e17192a7df40 100644 --- a/_maps/_mod_celadon/shuttles/subshuttles/nanotrasen_ancon.dmm +++ b/_maps/_mod_celadon/shuttles/subshuttles/nanotrasen_ancon.dmm @@ -29,9 +29,6 @@ /turf/open/floor/plating, /area/ship/bridge) "dw" = ( -/obj/machinery/door/airlock/external/glass{ - dir = 4 - }, /obj/docking_port/mobile{ dir = 8; name = "ancon dock"; @@ -40,6 +37,9 @@ /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, /turf/open/floor/plating, /area/ship/bridge) "hj" = ( @@ -113,6 +113,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/plasteel/white, /area/ship/bridge) +"py" = ( +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/door/airlock/external/glass{ + dir = 4 + }, +/turf/open/floor/plating, +/area/ship/bridge) "te" = ( /obj/effect/turf_decal/corner/opaque/green/diagonal, /obj/effect/turf_decal/siding/thinplating/light, @@ -195,6 +204,9 @@ name = "Engine Shutters"; dir = 4 }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/bridge) "yi" = ( @@ -236,6 +248,9 @@ /obj/machinery/power/shuttle/engine/electric/premium{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-5" + }, /turf/open/floor/plating/airless, /area/ship/external/dark) "Ct" = ( @@ -292,6 +307,15 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"JS" = ( +/obj/machinery/power/shuttle/engine/electric/premium{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/turf/open/floor/plating/airless, +/area/ship/external/dark) "KF" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -380,11 +404,11 @@ /obj/effect/turf_decal/corner/opaque/green/border{ dir = 4 }, -/obj/structure/chair/comfy{ - dir = 4 - }, /obj/effect/landmark/ert_shuttle_spawn, /obj/machinery/newscaster/directional/north, +/obj/structure/chair/comfy/grey{ + dir = 4 + }, /turf/open/floor/plasteel, /area/ship/bridge) "Th" = ( @@ -397,6 +421,9 @@ name = "Engine Shutters"; dir = 4 }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/open/floor/plating, /area/ship/bridge) "TQ" = ( @@ -462,14 +489,14 @@ LV vV Zr LV -zJ +JS tk "} (3,1,1) = {" LV xZ LV -Om +py Om LV Th diff --git a/mod_celadon/maps/code/ruins/ruin.dm b/mod_celadon/maps/code/ruins/ruin.dm index 58fc67d9ec9f..285b04933226 100644 --- a/mod_celadon/maps/code/ruins/ruin.dm +++ b/mod_celadon/maps/code/ruins/ruin.dm @@ -555,6 +555,7 @@ suffix = "oldstation.dmm" name = "Old Station" description = "The old destroyed network of stations Alpha, Beta, Charlie, Tetta" + allow_duplicates = FALSE // /// // WastePlanet ruin ///