cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 14:08:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes machine frames on maps (#26798)

Browse Source 
* Machine fixes

* wrong name on this

* Revert "Machine fixes"

This reverts commit e3fca7dca2859ee26bfe6cdc13ff9c75a416b461.

* I need to rerun this

* there we go

* Extra updates, split up into two just in case
This commit is contained in:
Waterpig
2024-03-08 19:16:45 -05:00
committed by GitHub
parent 312dd8f4ce
commit c0ab4e707f
5 changed files with 20 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
+2 -10
View File
@@ -250,11 +250,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/syndicate_lava_base/bar)
"bv" = (
/obj/structure/frame/machine{
anchored = 1;
state = 2;
icon_state = "box_1"
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_redemption,
/obj/item/assembly/igniter,
/obj/structure/marker_beacon/burgundy,
@@ -406,11 +402,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/syndicate_lava_base/main)
"cm" = (
/obj/structure/frame/machine{
anchored = 1;
state = 2;
icon_state = "box_1"
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_silo,
/obj/structure/marker_beacon/burgundy,
/obj/structure/sign/flag/syndicate/directional/north,
_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
+2 -10
View File
@@ -1284,11 +1284,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/syndicate_lava_base/arrivals)
"iu" = (
/obj/structure/frame/machine{
anchored = 1;
state = 2;
icon_state = "box_1"
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_redemption,
/obj/item/assembly/igniter,
/obj/structure/marker_beacon/burgundy,
@@ -4830,11 +4826,7 @@
/turf/closed/wall/r_wall/syndicate/nodiagonal,
/area/ruin/syndicate_lava_base/bar)
"Gc" = (
/obj/structure/frame/machine{
anchored = 1;
state = 2;
icon_state = "box_1"
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_silo,
/obj/structure/marker_beacon/burgundy,
/obj/structure/sign/flag/syndicate/directional/north,
_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm
+13 -65
View File
@@ -46,11 +46,7 @@
/turf/open/floor/iron/dark/textured_large,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"aj" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/mech_recharger,
/obj/effect/turf_decal/trimline/dark_red/filled/line,
/obj/effect/turf_decal/siding/dark{
@@ -801,11 +797,7 @@
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/ore_redemption,
/obj/item/assembly/igniter,
/turf/open/floor/iron/dark/textured_large,
@@ -1477,11 +1469,7 @@
/turf/closed/wall/r_wall/syndicate,
/area/ruin/space/has_grav/skyrat/interdynefob/bridge/vault)
"gw" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/component_printer,
/obj/effect/turf_decal/trimline/dark_red/filled/line{
dir = 5
@@ -1942,11 +1930,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/skyrat/interdynefob/research)
"il" = (
@@ -2302,11 +2286,7 @@
/turf/open/floor/plating/elevatorshaft,
/area/ruin/space/has_grav/skyrat/interdynefob/cargo/hangar)
"jJ" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/mechfab,
/obj/effect/turf_decal/trimline/dark_red/filled/line,
/turf/open/floor/iron/dark,
@@ -2773,11 +2753,7 @@
/obj/effect/turf_decal/siding/dark{
dir = 9
},
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/smes,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skyrat/interdynefob/engineering)
@@ -3510,11 +3486,7 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/skyrat/interdynefob/security)
"pk" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/module_duplicator,
/obj/effect/turf_decal/trimline/dark_red/filled/line{
dir = 4
@@ -4781,11 +4753,7 @@
/turf/open/floor/iron/dark/small,
/area/ruin/space/has_grav/skyrat/interdynefob/security/prison)
"vd" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/cyborgrecharger,
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -5500,11 +5468,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/skyrat/interdynefob/research)
"zh" = (
@@ -5912,11 +5876,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
/obj/machinery/light/red/directional/north,
/obj/item/folded_navigation_gigabeacon,
/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/skyrat/interdynefob/bridge/vault)
"Bj" = (
@@ -7477,11 +7437,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/skyrat/interdynefob/research)
"IM" = (
@@ -7522,11 +7478,7 @@
/area/ruin/space/has_grav/skyrat/interdynefob/service/dorms/fitness)
"IU" = (
/obj/item/circuitboard/machine/ammo_workbench,
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/disk/ammo_workbench/advanced,
/obj/effect/turf_decal/siding/dark{
dir = 8
@@ -10411,11 +10363,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/light/red/directional/south,
/obj/item/circuitboard/machine/ore_silo,
/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/skyrat/interdynefob/bridge/vault)
"VJ" = (
tools/UpdatePaths/Scripts_Skyrat/26596_machineframe_state.txt
+2
View File
@@ -0,0 +1,2 @@
/obj/structure/frame/machine{state = 1} : /obj/structure/frame/machine{@OLD;state=0;icon_state=@SKIP}
/obj/structure/frame/machine{state = 2} : /obj/structure/frame/machine{@OLD;state=1;icon_state=@SKIP}
tools/UpdatePaths/Scripts_Skyrat/26798_machineframe_update_secured.txt
+1
View File
@@ -0,0 +1 @@
/obj/structure/frame/machine{state = 1;anchored = 1} : /obj/structure/frame/machine/secured