From 917f2fb036ac089cd88c5c0da306395d33cfcc4d Mon Sep 17 00:00:00 2001 From: sqn Date: Mon, 4 Mar 2024 12:35:06 -0500 Subject: [PATCH] Fixes the unusable machine frames in DS2 and Interdyne (#1273) * swaps the machines to the secured subtype * shuttle too --- .../icemoon_underground_interdyne_base1.dmm | 36 +-- _maps/RandomRuins/SpaceRuins/nova/des_two.dmm | 56 ++-- _maps/shuttles/nova/ruin_interdyne_cargo.dmm | 252 ++++++++++++++++++ 3 files changed, 279 insertions(+), 65 deletions(-) create mode 100644 _maps/shuttles/nova/ruin_interdyne_cargo.dmm diff --git a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm index b4c408c4c0c..a9328d7cae9 100644 --- a/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm +++ b/_maps/RandomRuins/IceRuins/nova/icemoon_underground_interdyne_base1.dmm @@ -722,11 +722,7 @@ /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/cargo) "bW" = ( -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/ore_redemption, /obj/item/assembly/igniter, /turf/open/floor/iron/diagonal, @@ -2589,11 +2585,7 @@ /turf/open/floor/iron/white/textured_large, /area/ruin/interdyne_planetary_base/med) "gG" = ( -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /turf/open/floor/vault/alien{ name = "floor" }, @@ -2771,11 +2763,7 @@ /area/ruin/interdyne_planetary_base/science) "hd" = ( /obj/item/circuitboard/machine/ore_silo, -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark/textured_large, /area/ruin/interdyne_planetary_base/main/vault) "he" = ( @@ -2957,11 +2945,7 @@ /area/ruin/interdyne_planetary_base/main) "hE" = ( /obj/machinery/light/small/directional/west, -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/ammo_workbench, /obj/item/disk/ammo_workbench/advanced, /turf/open/floor/iron/dark/textured_large, @@ -4179,11 +4163,7 @@ /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/eng/disp) "kD" = ( -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/recycler, /obj/machinery/conveyor{ dir = 4; @@ -4352,11 +4332,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/structure/frame/machine{ - icon_state = "box_1"; - state = 2; - anchored = 1 - }, +/obj/structure/frame/machine/secured, /obj/item/circuitboard/machine/stacking_machine, /turf/open/floor/plating/reinforced, /area/ruin/interdyne_planetary_base/eng/disp) diff --git a/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm b/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm index 90b52e5db09..362098903bc 100644 --- a/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm +++ b/_maps/RandomRuins/SpaceRuins/nova/des_two.dmm @@ -1476,15 +1476,11 @@ /turf/closed/wall/r_wall/syndicate, /area/ruin/space/has_grav/nova/des_two/bridge/vault) "gw" = ( -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, /obj/item/circuitboard/machine/component_printer, /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 5 }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "gx" = ( @@ -1941,11 +1937,7 @@ dir = 4 }, /obj/item/circuitboard/machine/circuit_imprinter/offstation, -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "il" = ( @@ -2772,12 +2764,8 @@ /obj/effect/turf_decal/siding/dark{ dir = 9 }, -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, /obj/item/circuitboard/machine/smes, +/obj/structure/frame/machine/secured, /turf/open/floor/plating, /area/ruin/space/has_grav/nova/des_two/engineering) "md" = ( @@ -3509,15 +3497,11 @@ /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/nova/des_two/security) "pk" = ( -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, /obj/item/circuitboard/machine/module_duplicator, /obj/effect/turf_decal/trimline/dark_red/filled/line{ dir = 4 }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "pl" = ( @@ -4855,6 +4839,20 @@ /obj/effect/mob_spawn/ghost_role/human/ds2/syndicate_command/masteratarms, /turf/open/floor/carpet/royalblack, /area/ruin/space/has_grav/nova/des_two/security) +<<<<<<< HEAD +======= +"vu" = ( +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 1 + }, +/obj/item/circuitboard/machine/mechfab, +/obj/effect/turf_decal/trimline/dark_red/warning, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark/side{ + dir = 1 + }, +/area/ruin/space/has_grav/nova/des_two/research/robotics) +>>>>>>> 57b3aec38f7 (Fixes the unusable machine frames in DS2 and Interdyne (#1273)) "vv" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -5499,11 +5497,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "zh" = ( @@ -7476,11 +7470,7 @@ dir = 5 }, /obj/item/circuitboard/machine/destructive_analyzer, -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, +/obj/structure/frame/machine/secured, /turf/open/floor/iron/dark, /area/ruin/space/has_grav/nova/des_two/research) "IM" = ( @@ -7521,15 +7511,11 @@ /area/ruin/space/has_grav/nova/des_two/service/dorms/fitness) "IU" = ( /obj/item/circuitboard/machine/ammo_workbench, -/obj/structure/frame/machine{ - anchored = 1; - icon_state = "box_1"; - state = 2 - }, /obj/item/disk/ammo_workbench/advanced, /obj/effect/turf_decal/siding/dark{ dir = 8 }, +/obj/structure/frame/machine/secured, /turf/open/floor/mineral/plastitanium/red, /area/ruin/space/has_grav/nova/des_two/security/armory) "IV" = ( diff --git a/_maps/shuttles/nova/ruin_interdyne_cargo.dmm b/_maps/shuttles/nova/ruin_interdyne_cargo.dmm new file mode 100644 index 00000000000..6d9779e75c2 --- /dev/null +++ b/_maps/shuttles/nova/ruin_interdyne_cargo.dmm @@ -0,0 +1,252 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/shuttle/interdyne_cargo) +"e" = ( +/obj/effect/turf_decal/loading_area, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"f" = ( +/obj/item/circuitboard/machine/ore_redemption, +/obj/item/assembly/igniter, +/obj/effect/turf_decal/delivery, +/obj/machinery/light/red/directional/west, +/obj/machinery/button/door/directional/west{ + req_access = list("syndicate"); + id = "interdyneshuttle" + }, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"g" = ( +/obj/effect/spawner/structure/window/reinforced/plasma/plastitanium, +/turf/open/floor/plating, +/area/shuttle/interdyne_cargo) +"h" = ( +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"i" = ( +/obj/machinery/light/small/red/directional/south, +/obj/item/circuitboard/machine/ore_silo, +/obj/effect/turf_decal/delivery, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"k" = ( +/obj/structure/fans/tiny/forcefield{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/door/poddoor/preopen{ + id = "interdyneshuttle" + }, +/turf/open/floor/plating, +/area/shuttle/interdyne_cargo) +"v" = ( +/turf/closed/wall/r_wall/syndicate, +/area/shuttle/interdyne_cargo) +"w" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/obj/structure/window/reinforced/survival_pod{ + dir = 5 + }, +/turf/open/floor/plating/airless, +/area/shuttle/interdyne_cargo) +"y" = ( +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/shuttle/interdyne_cargo) +"z" = ( +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/interdyne_cargo) +"B" = ( +/obj/machinery/power/shuttle_engine/propulsion/right{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line, +/obj/structure/fans/tiny, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/turf/open/floor/plating/airless, +/area/shuttle/interdyne_cargo) +"D" = ( +/obj/machinery/power/shuttle_engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced/survival_pod/spawner/directional/south, +/obj/structure/window/reinforced/survival_pod{ + dir = 6 + }, +/turf/open/floor/plating/airless, +/area/shuttle/interdyne_cargo) +"G" = ( +/obj/structure/fluff/metalpole/end{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/fluff/metalpole/end{ + dir = 4; + pixel_x = 12 + }, +/turf/closed/wall/r_wall/syndicate, +/area/shuttle/interdyne_cargo) +"H" = ( +/obj/structure/closet/crate/eva, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"L" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/syndicate/general, +/obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/structure/fans/tiny, +/obj/machinery/door/airlock/external/glass{ + name = "External Access" + }, +/obj/docking_port/mobile{ + dir = 4; + shuttle_id = "interdyne_cargo"; + launch_status = 0; + name = "Interdyne Cargo Shuttle"; + port_direction = 2; + preferred_direction = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/shuttle/interdyne_cargo) +"M" = ( +/obj/machinery/light/small/red/directional/north, +/obj/machinery/computer/shuttle/interdyne_cargo{ + icon_screen = "syndishuttle"; + icon_keyboard = "syndie_key"; + dir = 8 + }, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"N" = ( +/turf/template_noop, +/area/template_noop) +"O" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"Q" = ( +/turf/closed/wall/mineral/titanium/spaceship/nodiagonal, +/area/shuttle/interdyne_cargo) +"V" = ( +/obj/effect/spawner/structure/window/survival_pod, +/turf/open/floor/plating, +/area/shuttle/interdyne_cargo) +"X" = ( +/obj/machinery/power/shuttle_engine/propulsion/left{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/fans/tiny, +/obj/structure/window/reinforced/survival_pod/spawner/directional/north, +/turf/open/floor/plating/airless, +/area/shuttle/interdyne_cargo) +"Y" = ( +/obj/structure/chair/comfy/shuttle{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_large, +/area/shuttle/interdyne_cargo) +"Z" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/turf/closed/wall/r_wall/syndicate/nodiagonal, +/area/shuttle/interdyne_cargo) + +(1,1,1) = {" +Q +B +L +V +Q +k +k +X +Q +"} +(2,1,1) = {" +Q +D +h +e +f +z +z +w +Q +"} +(3,1,1) = {" +y +O +h +z +z +z +z +H +y +"} +(4,1,1) = {" +y +M +h +z +z +z +z +i +y +"} +(5,1,1) = {" +v +Z +Y +Y +Y +z +z +a +v +"} +(6,1,1) = {" +N +G +g +g +v +g +g +G +N +"}