diff --git a/html/changelogs/flimango-roof_solars_redo.yml b/html/changelogs/flimango-roof_solars_redo.yml
new file mode 100644
index 00000000000..7f7794ae183
--- /dev/null
+++ b/html/changelogs/flimango-roof_solars_redo.yml
@@ -0,0 +1,38 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+#################################
+
+# Your name.
+author: flimango
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - maptweak: "Remapped the surface solars cables to run internally."
+ - bugfix: "Fixed the surface solars to properly transfer power to the main grid and vice versa."
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 07884565591..d873eb712ba 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -15891,9 +15891,7 @@
/obj/structure/ladder/up{
pixel_y = 16
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
- },
+/obj/effect/decal/warning_stripes,
/turf/simulated/floor/plating,
/area/maintenance/arrivals)
"DC" = (
@@ -16080,6 +16078,11 @@
req_access = list(31)
},
/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/plating,
/area/quartermaster/loading)
"DY" = (
@@ -16169,6 +16172,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Eg" = (
@@ -16376,6 +16384,11 @@
/area/quartermaster/loading)
"EA" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"EB" = (
@@ -16530,6 +16543,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"EU" = (
@@ -16806,6 +16824,11 @@
"Fp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Fq" = (
@@ -17036,6 +17059,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"FJ" = (
@@ -17301,6 +17329,11 @@
"Gd" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Ge" = (
@@ -17582,6 +17615,11 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"GH" = (
@@ -17856,6 +17894,11 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Hg" = (
@@ -18305,6 +18348,11 @@
icon_state = "corner_white";
dir = 6
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"HV" = (
@@ -18319,6 +18367,11 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"HW" = (
@@ -18332,12 +18385,22 @@
icon_state = "corner_white";
dir = 9
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"HX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"HY" = (
@@ -18359,6 +18422,11 @@
icon_state = "corner_white";
dir = 1
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"HZ" = (
@@ -18378,6 +18446,11 @@
icon_state = "corner_white";
dir = 1
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Ia" = (
@@ -18402,6 +18475,11 @@
/obj/machinery/status_display/supply_display{
pixel_y = 32
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/quartermaster/loading)
"Ib" = (
@@ -18417,6 +18495,11 @@
/obj/structure/window/reinforced{
dir = 1
},
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/plating,
/area/quartermaster/loading)
"Ic" = (
@@ -18433,6 +18516,11 @@
dir = 6
},
/obj/random/junk,
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/arrivals)
"Id" = (
@@ -18960,11 +19048,6 @@
/turf/simulated/floor/plating,
/area/maintenance/arrivals)
"IW" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/random/junk,
/obj/structure/disposalpipe/segment,
/obj/machinery/power/apc{
@@ -18987,11 +19070,6 @@
/turf/simulated/floor/plating,
/area/maintenance/arrivals)
"IY" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/structure/disposalpipe/down{
icon_state = "pipe-d";
dir = 1
@@ -20074,6 +20152,207 @@
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/entry/fore)
+"NJ" = (
+/obj/structure/cable{
+ icon_state = "12-0"
+ },
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NK" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NL" = (
+/obj/random/junk,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NM" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NN" = (
+/obj/machinery/door/firedoor,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NO" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NP" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NQ" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NR" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/arrivals)
+"NS" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NT" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NU" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NV" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NW" = (
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NX" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NY" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"NZ" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"Oa" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"Ob" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"Oc" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"Od" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
+"Oe" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/quartermaster/loading)
(1,1,1) = {"
aa
@@ -43886,14 +44165,14 @@ DD
sU
ag
sU
-tt
+NP
DX
Ef
EA
ET
Fp
FI
-Ek
+NS
Go
GD
DW
@@ -44138,19 +44417,19 @@ ag
sU
sU
sU
-tt
+NJ
tt
sU
sU
sU
-tt
+NQ
DW
Eg
EB
EB
EB
FJ
-Ek
+NT
Go
GB
DW
@@ -44395,19 +44674,19 @@ ag
sU
tt
tt
-tt
-tu
-tt
-Bw
-tt
-tt
+NK
+NL
+NM
+NN
+NM
+NR
DW
Eh
Ek
EU
Ek
FK
-Ek
+NT
Gn
GB
DW
@@ -44664,7 +44943,7 @@ Ek
EV
Ek
FK
-Ek
+NT
Ek
GE
DW
@@ -44921,7 +45200,7 @@ EC
EU
Ek
FK
-Ek
+NT
Ek
ER
DW
@@ -45178,7 +45457,7 @@ Ek
EU
Fq
FL
-ED
+NX
ED
GF
GR
@@ -45436,14 +45715,14 @@ Ek
Fr
FM
Gd
-Gd
+NY
GG
-Gd
+NY
Hf
-Gd
-Gd
-Gd
-FI
+NY
+NY
+NY
+Od
Ig
DW
ag
@@ -46728,7 +47007,7 @@ Hj
Hv
HH
HR
-Hg
+Oe
Ek
Ip
Iw
@@ -48025,7 +48304,7 @@ IR
IT
IW
IY
-Jb
+tt
sU
aa
aa
diff --git a/maps/aurora/aurora-7_roof.dmm b/maps/aurora/aurora-7_roof.dmm
index 8512ed83c7b..bb6b3b7d156 100644
--- a/maps/aurora/aurora-7_roof.dmm
+++ b/maps/aurora/aurora-7_roof.dmm
@@ -854,8 +854,7 @@
icon_state = "warning";
dir = 8
},
-/obj/effect/floor_decal/industrial/warning/corner{
- icon_state = "warningcorner";
+/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/turf/simulated/floor/airless,
@@ -2065,11 +2064,6 @@
/obj/structure/window/reinforced{
dir = 8
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/turf/simulated/floor/plating,
/area/maintenance/solarmaint)
"ek" = (
@@ -2119,11 +2113,11 @@
/area/maintenance/solarmaint)
"eo" = (
/obj/structure/cable{
- d1 = 1;
d2 = 2;
- icon_state = "1-2"
+ icon_state = "11-2"
},
-/turf/simulated/floor/plating,
+/obj/structure/lattice/catwalk,
+/turf/simulated/open,
/area/maintenance/solarmaint)
"ep" = (
/obj/random/loot,
@@ -2145,25 +2139,25 @@
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable{
d1 = 1;
- d2 = 4;
- icon_state = "1-4"
+ d2 = 8;
+ icon_state = "1-8"
},
/obj/structure/cable{
d1 = 1;
- d2 = 8;
- icon_state = "1-8"
+ d2 = 4;
+ icon_state = "1-4"
},
/turf/simulated/floor/plating,
/area/maintenance/solarmaint)
"es" = (
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
/obj/machinery/power/smes/buildable{
charge = 0;
RCon_tag = "\[SOL.4] Solar - Roof"
},
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/plating,
/area/maintenance/solarmaint)
"et" = (
@@ -2487,21 +2481,18 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eP" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- icon_state = "warningcorner";
- dir = 1
- },
/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
},
-/obj/effect/floor_decal/industrial/warning/corner,
/turf/simulated/floor/airless,
/area/mine/explored)
"eQ" = (
@@ -3127,6 +3118,14 @@
},
/turf/simulated/floor/airless,
/area/mine/explored)
+"gc" = (
+/obj/random/glowstick,
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
+"gd" = (
+/obj/item/weapon/stool,
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
(1,1,1) = {"
aa
@@ -26418,17 +26417,17 @@ ab
ac
ac
ab
-fM
-fN
-fO
-fP
-fQ
-fR
-fS
-fT
-fU
-fV
-fW
+ad
+ag
+ag
+ag
+ag
+ag
+ag
+ag
+fe
+ah
+ah
ah
ah
ah
@@ -26675,7 +26674,7 @@ ab
ab
ab
ab
-eO
+ae
ei
ei
ei
@@ -26685,7 +26684,7 @@ ei
ei
ah
ah
-fX
+ah
ah
ah
ah
@@ -26932,7 +26931,7 @@ ab
ab
ab
ab
-eO
+ae
ei
en
eq
@@ -26942,7 +26941,7 @@ eC
ex
eG
ah
-fY
+ah
ah
ah
ah
@@ -27189,7 +27188,7 @@ ab
ab
ab
ad
-ee
+fe
ej
eo
er
@@ -27199,7 +27198,7 @@ eD
eF
eH
eN
-fZ
+ah
ah
ah
ah
@@ -27456,7 +27455,7 @@ eE
ex
eI
eL
-ga
+ah
ah
ah
ah
@@ -27713,7 +27712,7 @@ ei
ei
eJ
eL
-gb
+ah
ah
ah
ah
@@ -27970,7 +27969,7 @@ el
el
bS
eP
-eX
+ah
ah
ah
ah
@@ -28218,6 +28217,14 @@ ab
ab
ae
eL
+fg
+ai
+ai
+ai
+ai
+ai
+ai
+ff
ah
ah
ah
@@ -28225,14 +28232,6 @@ ah
ah
ah
ah
-eb
-eX
-ah
-ah
-ah
-ah
-ah
-ah
ah
ah
ah
@@ -28482,7 +28481,7 @@ ab
ab
ab
ab
-eK
+ae
ah
ah
ah
@@ -28739,7 +28738,7 @@ ab
ab
ab
ab
-eK
+ae
ah
ah
ah
@@ -28996,7 +28995,7 @@ aa
aa
ab
ab
-eK
+ae
ah
ah
ah
@@ -29253,7 +29252,7 @@ aa
aa
aa
ab
-eK
+ae
ah
ah
ah
@@ -29510,7 +29509,7 @@ aa
aa
aa
aa
-eK
+ae
ah
ah
ah
@@ -29767,7 +29766,7 @@ aa
aa
aa
aa
-eK
+ae
ah
ah
ah
@@ -30024,7 +30023,7 @@ aa
aa
aa
aa
-eK
+ae
ah
ah
ah
@@ -30281,7 +30280,7 @@ aa
aa
aa
aa
-eK
+ae
ah
ah
ah
@@ -30538,7 +30537,7 @@ ad
ag
ag
ag
-eO
+fe
ah
ah
ah
@@ -30565,7 +30564,7 @@ ag
fe
ah
ah
-ah
+gc
al
aa
aa
@@ -30795,7 +30794,6 @@ ae
ah
ah
ah
-eO
ah
ah
ah
@@ -30821,8 +30819,9 @@ ah
ah
ah
ah
-eU
ah
+an
+gd
al
aa
aa
@@ -31052,34 +31051,34 @@ ae
ah
ah
ah
-eM
-eQ
-fn
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eQ
-eS
-eQ
-eT
-eV
-fL
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+ah
+fg
+ai
+ff
+ah
+ah
+an
al
aa
aa
@@ -31333,9 +31332,9 @@ ai
ai
am
aa
-af
+ak
+ai
ai
-eW
ai
am
aa