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

Fixes machines on a few maps (#1259)

Browse Source 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

https://github.com/Skyrat-SS13/Skyrat-tg/pull/26798

## Why It's Good For The Game

Some pretty nice fixes, dauntless mapfix included

## Changelog

🆑
fix: Dauntless frames are no longer broken
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
This commit is contained in:
Waterpig
2024-03-11 18:14:37 +01:00
committed by GitHub
parent f7d2c3dc7b
commit 5ddcc3f5ea
6 changed files with 30 additions and 135 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/bubberstation/lavaland_dauntless.dmm
+10 -50
View File
@@ -45,11 +45,7 @@
/turf/open/floor/iron/dark/diagonal,
/area/ruin/space/has_grav/bubbers/dauntless/engineering)
"al" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/disk/ammo_workbench/advanced,
/obj/item/circuitboard/machine/ammo_workbench,
/obj/structure/cable,
@@ -1038,11 +1034,7 @@
/turf/open/floor/iron/textured,
/area/ruin/space/has_grav/bubbers/dauntless/sci/rnd)
"gn" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/effect/turf_decal/trimline/dark_red/line,
/obj/effect/turf_decal/trimline/dark_red/line{
dir = 1
@@ -2900,11 +2892,7 @@
/area/ruin/space/has_grav/bubbers/dauntless/sci/xenobio)
"qk" = (
/obj/item/circuitboard/machine/ore_silo,
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/effect/turf_decal/siding/dark{
dir = 4
},
@@ -3958,11 +3946,7 @@
/turf/open/floor/carpet/royalblue,
/area/ruin/space/has_grav/bubbers/dauntless/command/liason)
"vl" = (
/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/siding/dark,
/obj/effect/turf_decal/trimline/dark_red/line{
@@ -4012,11 +3996,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/bubbers/dauntless/engineering)
"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/trimline/dark_red/end{
dir = 1
@@ -4461,11 +4441,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/bubbers/dauntless/engineering/dispolsals)
"xS" = (
/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/line{
dir = 8
@@ -6489,11 +6465,7 @@
/turf/open/floor/wood/tile,
/area/ruin/space/has_grav/bubbers/dauntless/service/diner)
"GO" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/effect/turf_decal/trimline/dark_red/end{
dir = 4
},
@@ -7526,11 +7498,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/bubbers/dauntless/cargo)
"LP" = (
/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/end{
dir = 1
@@ -8282,11 +8250,7 @@
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/space/has_grav/bubbers/dauntless/sci/rnd)
"Qm" = (
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/effect/turf_decal/trimline/dark_red/line,
/obj/effect/turf_decal/trimline/dark_red/line{
dir = 1
@@ -8388,11 +8352,7 @@
/obj/effect/turf_decal/trimline/dark_red/end{
dir = 8
},
/obj/structure/frame/machine{
anchored = 1;
icon_state = "box_1";
state = 2
},
/obj/structure/frame/machine/secured,
/obj/item/circuitboard/machine/mechfab,
/obj/machinery/power/apc/auto_name/directional/north,
/obj/structure/cable,
_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