Skip to content

Commit

Permalink
Fixes the unusable machine frames in DS2 and Interdyne (#1273)
Browse files Browse the repository at this point in the history
* swaps the machines to the secured subtype

* shuttle too
  • Loading branch information
sqnztb authored and StealsThePRs committed Mar 4, 2024
1 parent 600801a commit 917f2fb
Show file tree
Hide file tree
Showing 3 changed files with 279 additions and 65 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
},
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
56 changes: 21 additions & 35 deletions _maps/RandomRuins/SpaceRuins/nova/des_two.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down
Loading

0 comments on commit 917f2fb

Please sign in to comment.