Skip to content

Commit

Permalink
Dumb cables (#621)
Browse files Browse the repository at this point in the history
* Dumb cables

* Adds an UpdatePath script

* Fixes stuff

* Changes and typepaths for mapping

* Cable changes

* Smart cables are subtype of cable

* Removes a redundant variable

* Cables that have their directions set to more than 2 CRASH()

* update cables

* Knotted wires layer higher

* Changes icon state to requested one

* Dumbcablification Part 1

* Typepath snafu

* Metastation Rewire Part 2

Fixes a race condition in wire initialization
Expands the selection of available cable colors

* Rewire 3

* Recabling Complete

* Fixes Check-Power

* Removes invalid cable linting

* stupid bugfix

* Fixes knotted cables connecting to other non knotted cables

---------

Co-authored-by: Francinum <[email protected]>
Co-authored-by: Kapu1178 <[email protected]>
  • Loading branch information
3 people authored Dec 18, 2023
1 parent f2d3fbe commit fec87b5
Show file tree
Hide file tree
Showing 76 changed files with 51,604 additions and 42,842 deletions.
26 changes: 13 additions & 13 deletions _maps/RandomRuins/SpaceRuins/DJstation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/turf/template_noop,
/area/space/nearstation)
"d" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
Expand All @@ -14,7 +14,7 @@
/turf/template_noop,
/area/space/nearstation)
"f" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/door/airlock/maintenance_hatch{
name = "Telecommunications"
},
Expand Down Expand Up @@ -60,7 +60,7 @@
/area/ruin/space/djstation/service)
"w" = (
/obj/machinery/door/airlock/maintenance_hatch,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"x" = (
Expand All @@ -72,64 +72,64 @@
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"A" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"C" = (
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"D" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"E" = (
/obj/machinery/power/solar/fake,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/iron/solarpanel/airless,
/area/ruin/space/djstation/solars)
"G" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/light/small/directional/south,
/obj/structure/closet/crate,
/obj/item/clothing/head/ushanka,
/obj/effect/spawner/random/maintenance/two,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"I" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/power/apc/auto_name/directional/east,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"M" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/structure/closet/crate,
/obj/effect/spawner/random/maintenance/five,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"O" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/template_noop,
/area/ruin/space/djstation/solars)
"P" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"R" = (
/obj/machinery/power/smes/magical{
desc = "A high-capacity superconducting magnetic energy storage (SMES) unit.";
name = "power storage unit"
},
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"S" = (
/obj/machinery/power/terminal{
dir = 1
},
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation/service)
"U" = (
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/DJstation/radioroom_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@
/turf/open/floor/iron/vaporwave,
/area/ruin/space/djstation)
"A" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/plating,
/area/ruin/space/djstation)
"H" = (
/obj/structure/chair,
/turf/open/floor/iron/vaporwave,
/area/ruin/space/djstation)
"J" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/power/apc/auto_name/directional/south,
/turf/open/floor/iron,
/area/ruin/space/djstation)
Expand Down
10 changes: 5 additions & 5 deletions _maps/RandomRuins/SpaceRuins/DJstation/radioroom_2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
/turf/open/floor/wood,
/area/ruin/space/djstation)
"d" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/structure/chair/office{
dir = 1
},
Expand Down Expand Up @@ -157,7 +157,7 @@
/area/ruin/space/djstation)
"C" = (
/obj/machinery/power/apc/auto_name/directional/south,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/turf_decal/tile/green,
/obj/effect/turf_decal/tile/green{
dir = 4
Expand Down Expand Up @@ -205,7 +205,7 @@
/turf/open/floor/iron/dark,
/area/ruin/space/djstation)
"O" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/turf_decal/tile/green{
dir = 8
},
Expand All @@ -228,7 +228,7 @@
/turf/open/floor/plating,
/area/ruin/space/djstation)
"T" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/turf_decal/tile/green,
/turf/open/floor/iron/dark,
/area/ruin/space/djstation)
Expand All @@ -255,7 +255,7 @@
/turf/open/floor/wood,
/area/ruin/space/djstation)
"X" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/effect/turf_decal/tile/green{
dir = 8
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/DJstation/radioroom_3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/turf/closed/wall,
/area/ruin/space/djstation)
"b" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/power/apc/auto_name/directional/north,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/djstation)
Expand All @@ -14,7 +14,7 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/space/djstation)
"g" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/djstation)
"h" = (
Expand Down Expand Up @@ -49,7 +49,7 @@
/turf/open/floor/iron/cafeteria,
/area/ruin/space/djstation)
"G" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/cafeteria,
/area/ruin/space/djstation)
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/DJstation/solars_1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
/area/space/nearstation)
"u" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/modular_map_connector,
/turf/template_noop,
/area/ruin/space/djstation/solars)
Expand All @@ -67,14 +67,14 @@
/area/ruin/space/djstation/solars)
"O" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/template_noop,
/area/ruin/space/djstation/solars)
"T" = (
/turf/template_noop,
/area/template_noop)
"U" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/power/solar/fake,
/turf/open/floor/iron/solarpanel/airless,
/area/ruin/space/djstation/solars)
Expand Down
6 changes: 3 additions & 3 deletions _maps/RandomRuins/SpaceRuins/DJstation/solars_2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
/area/template_noop)
"L" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/turf/template_noop,
/area/ruin/space/djstation/solars)
"P" = (
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/machinery/power/solar/fake,
/turf/open/floor/iron/solarpanel/airless,
/area/ruin/space/djstation/solars)
Expand All @@ -23,7 +23,7 @@
/area/space/nearstation)
"V" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable,
/obj/structure/cable/smart_cable/color/yellow,
/obj/modular_map_connector,
/turf/template_noop,
/area/ruin/space/djstation/solars)
Expand Down
Loading

0 comments on commit fec87b5

Please sign in to comment.