diff --git a/html/changelogs/furrycactus-solars.yml b/html/changelogs/furrycactus-solars.yml
new file mode 100644
index 00000000000..17b89f0a8ea
--- /dev/null
+++ b/html/changelogs/furrycactus-solars.yml
@@ -0,0 +1,37 @@
+################################
+# 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: Furrycactus
+
+# 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: "Drastically increased the size of each Solar Array on the station so that they're actually useful. Enough to serve as backup power on high intensity rounds, or primary power on low intensity. A useful entry point for anyone that wants to learn Engineering."
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index 3283ce235cd..b70f7230df2 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -37,9 +37,6 @@
/turf/simulated/floor/airless,
/area/solar/fore)
"ai" = (
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Fore Solar Array"
- },
/turf/unsimulated/chasm_mask,
/area/solar/fore)
"aj" = (
@@ -360,16 +357,23 @@
/turf/simulated/floor/plating,
/area/maintenance/foresolar)
"aJ" = (
-/obj/item/weapon/stool{
- pixel_y = 8
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/obj/machinery/alarm{
- dir = 4;
- icon_state = "alarm0";
- pixel_x = -22
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
},
-/turf/simulated/floor/plating,
-/area/maintenance/foresolar)
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/airless,
+/area/solar/fore)
"aK" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -3592,13 +3596,18 @@
/turf/simulated/floor/airless,
/area/solar/port)
"gI" = (
-/obj/structure/cable/yellow{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/item/stack/cable_coil/yellow{
+ pixel_x = 4;
+ pixel_y = 4
},
-/turf/simulated/floor/airless,
-/area/solar/port)
+/obj/item/stack/cable_coil/yellow,
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/foresolar)
"gJ" = (
/obj/structure/cable/yellow{
d2 = 8;
@@ -4228,8 +4237,18 @@
/turf/simulated/floor/plating,
/area/maintenance/portsolar)
"hJ" = (
-/turf/simulated/floor/plating,
-/area/maintenance/portsolar)
+/obj/structure/cable/yellow{
+ d2 = 4;
+ icon_state = "0-4"
+ },
+/obj/machinery/power/solar{
+ id = "portsolar";
+ name = "Port Solar Array"
+ },
+/turf/simulated/floor/airless{
+ icon_state = "solarpanel"
+ },
+/area/solar/port)
"hK" = (
/obj/structure/cable,
/obj/machinery/alarm{
@@ -8745,18 +8764,13 @@
/turf/simulated/floor/tiled,
/area/security/vacantoffice)
"pS" = (
-/obj/item/weapon/stool,
-/obj/machinery/alarm{
- dir = 4;
- icon_state = "alarm0";
- pixel_x = -22
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecoms - Aft Solar Maintenance";
- dir = 4
- },
-/turf/simulated/floor/plating,
-/area/maintenance/starboardsolar)
+/turf/simulated/floor/airless,
+/area/solar/port)
"pT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/cable/yellow{
@@ -9356,20 +9370,18 @@
/turf/unsimulated/chasm_mask,
/area/mine/explored)
"qY" = (
-/obj/machinery/power/solar{
- id = "aftsolar";
- name = "Aft Solar Array"
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
},
/obj/structure/cable/yellow{
+ d1 = 1;
d2 = 2;
- icon_state = "0-2"
+ icon_state = "1-2"
},
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/airless{
- icon_state = "solarpanel"
- },
-/area/solar/starboard)
+/turf/simulated/floor/airless,
+/area/solar/port)
"qZ" = (
/obj/structure/cable/yellow,
/turf/simulated/floor/airless,
@@ -9691,17 +9703,13 @@
/turf/simulated/floor/asteroid/ash,
/area/shuttle/administration/station)
"rE" = (
-/obj/machinery/power/solar{
- id = "aftsolar";
- name = "Aft Solar Array"
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/structure/cable/yellow,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor/airless{
- icon_state = "solarpanel"
- },
-/area/solar/starboard)
+/turf/simulated/floor/airless,
+/area/solar/port)
"rF" = (
/obj/structure/table/standard,
/obj/random/tech_supply,
@@ -12082,11 +12090,22 @@
/turf/simulated/floor/plating,
/area/bridge/levela)
"wq" = (
-/obj/machinery/camera/network/telecom{
- c_tag = "Telecomms - Aft Solar Array";
- dir = 1
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
-/turf/unsimulated/chasm_mask,
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/airless,
/area/solar/port)
"wr" = (
/obj/structure/cable/yellow{
@@ -19124,6 +19143,14 @@
},
/turf/simulated/floor/plating,
/area/maintenance/arrivals)
+"Jb" = (
+/obj/item/stack/cable_coil/yellow{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/stack/cable_coil/yellow,
+/turf/simulated/floor/plating,
+/area/maintenance/portsolar)
"Jc" = (
/turf/simulated/floor/asteroid/ash,
/area/skipjack_station/surface)
@@ -19142,6 +19169,19 @@
},
/turf/simulated/floor/tiled,
/area/hallway/secondary/exit)
+"Jf" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/airless,
+/area/solar/port)
"Jg" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -20068,6 +20108,14 @@
},
/turf/simulated/floor/plating,
/area/sconference_room)
+"KX" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/airless,
+/area/solar/port)
"KY" = (
/obj/machinery/door/firedoor,
/obj/structure/grille,
@@ -20097,6 +20145,111 @@
},
/turf/simulated/floor/wood,
/area/sconference_room)
+"Lb" = (
+/obj/machinery/alarm{
+ dir = 4;
+ icon_state = "alarm0";
+ pixel_x = -22
+ },
+/obj/machinery/camera/network/telecom{
+ c_tag = "Telecoms - Aft Solar Maintenance";
+ dir = 4
+ },
+/obj/item/stack/cable_coil/yellow{
+ pixel_x = 4;
+ pixel_y = 4
+ },
+/obj/item/stack/cable_coil/yellow,
+/turf/simulated/floor/plating,
+/area/maintenance/starboardsolar)
+"Lc" = (
+/obj/structure/sign/electricshock,
+/turf/simulated/wall,
+/area/mine/unexplored)
+"Ld" = (
+/obj/structure/grille,
+/turf/simulated/floor/airless,
+/area/mine/unexplored)
+"Le" = (
+/obj/machinery/power/solar{
+ id = "aftsolar";
+ name = "Aft Solar Array"
+ },
+/obj/structure/cable/yellow{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/airless{
+ icon_state = "solarpanel"
+ },
+/area/solar/starboard)
+"Lf" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/airless,
+/area/solar/starboard)
+"Lg" = (
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/airless,
+/area/solar/starboard)
+"Lh" = (
+/obj/machinery/power/solar{
+ id = "aftsolar";
+ name = "Aft Solar Array"
+ },
+/obj/structure/cable/yellow,
+/turf/simulated/floor/airless{
+ icon_state = "solarpanel"
+ },
+/area/solar/starboard)
+"Li" = (
+/obj/machinery/camera/network/telecom{
+ c_tag = "Telecomms - Aft Solar Array";
+ dir = 4
+ },
+/turf/unsimulated/chasm_mask,
+/area/mine/explored)
+"Lj" = (
+/obj/machinery/camera/network/telecom{
+ c_tag = "Telecomms - Aft Solar Array";
+ dir = 8
+ },
+/turf/unsimulated/chasm_mask,
+/area/mine/explored)
+"Lk" = (
+/obj/machinery/camera/network/telecom{
+ c_tag = "Telecomms - Aft Solar Array";
+ dir = 1
+ },
+/turf/unsimulated/chasm_mask,
+/area/solar/starboard)
"NI" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -20588,33 +20741,33 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ac
ac
ac
ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
aa
aa
aa
@@ -20845,21 +20998,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ac
-aa
-aa
-aa
ac
aa
aa
@@ -20873,6 +21011,21 @@ aa
aa
aa
aa
+fi
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ac
+aa
aa
aa
aa
@@ -21102,21 +21255,32 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+aa
gH
aa
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+hJ
+aa
ac
aa
aa
@@ -21260,17 +21424,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(5,1,1) = {"
aa
@@ -21354,32 +21507,42 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ae
ac
ac
ac
ac
-ac
ab
aa
-gI
+pS
+qY
+qY
+qY
+qY
+qY
+qY
+qY
+qY
+qY
+rE
+wq
+rE
+Jf
+Jf
+Jf
+Jf
+Jf
+Jf
+Jf
+Jf
+Jf
+KX
aa
ab
ac
ac
ac
ac
-ac
ae
aa
aa
@@ -21518,16 +21681,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(6,1,1) = {"
aa
@@ -21611,24 +21764,24 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aa
aa
aa
-aa
fi
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gJ
aa
aa
@@ -21637,6 +21790,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+fi
+aa
+aa
+aa
+aa
ac
aa
aa
@@ -21775,16 +21938,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(7,1,1) = {"
aa
@@ -21868,16 +22021,6 @@ aa
aa
aa
aa
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
ac
aa
dv
@@ -21885,6 +22028,16 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
gK
aa
@@ -21893,6 +22046,16 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
ac
aa
@@ -22032,16 +22195,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(8,1,1) = {"
aa
@@ -22125,16 +22278,6 @@ aa
aa
aa
aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
ac
aa
dw
@@ -22142,6 +22285,16 @@ dS
dS
dS
dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
fX
gK
hG
@@ -22149,6 +22302,16 @@ it
it
it
it
+it
+it
+it
+it
+it
+it
+it
+it
+it
+it
kx
aa
ac
@@ -22289,16 +22452,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(9,1,1) = {"
aa
@@ -22382,16 +22535,6 @@ aa
aa
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
ac
aa
dx
@@ -22399,6 +22542,16 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
gK
aa
@@ -22407,6 +22560,16 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
ac
aa
@@ -22546,16 +22709,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(10,1,1) = {"
aa
@@ -22639,16 +22792,6 @@ aa
aa
ag
ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
ac
aa
aa
@@ -22657,6 +22800,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gK
aa
aa
@@ -22665,6 +22818,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ac
aa
aa
@@ -22803,16 +22966,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(11,1,1) = {"
aa
@@ -22896,16 +23049,6 @@ aa
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
ac
aa
dv
@@ -22913,6 +23056,16 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
gK
aa
@@ -22921,6 +23074,16 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
ac
aa
@@ -23060,16 +23223,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(12,1,1) = {"
aa
@@ -23153,16 +23306,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-bJ
-aa
ac
aa
dw
@@ -23170,6 +23313,16 @@ dS
dS
dS
dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
fX
gK
hG
@@ -23177,6 +23330,16 @@ it
it
it
it
+it
+it
+it
+it
+it
+it
+it
+it
+it
+it
kx
aa
ac
@@ -23184,16 +23347,6 @@ aa
aa
aa
aa
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -23410,16 +23563,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
ac
aa
dx
@@ -23427,6 +23570,16 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
gK
aa
@@ -23435,21 +23588,21 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
ac
aa
aa
aa
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
aa
aa
aa
@@ -23667,16 +23820,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
ac
aa
aa
@@ -23685,6 +23828,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gK
aa
aa
@@ -23693,17 +23846,17 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
ac
-aa
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
ag
aa
aa
@@ -23924,16 +24077,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
ac
aa
dv
@@ -23941,6 +24084,16 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
gK
aa
@@ -23949,18 +24102,18 @@ dv
dv
dv
dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
+dv
aa
ac
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
ag
ag
ag
@@ -24181,16 +24334,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
ac
aa
dw
@@ -24198,6 +24341,16 @@ dS
dS
dS
dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
+dS
fX
gK
hG
@@ -24205,19 +24358,19 @@ it
it
it
it
+it
+it
+it
+it
+it
+it
+it
+it
+it
+it
kx
aa
ac
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
ag
ag
ag
@@ -24438,16 +24591,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
ac
aa
dx
@@ -24455,6 +24598,16 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
gL
aa
@@ -24463,18 +24616,18 @@ dx
dx
dx
dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
+dx
aa
ac
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
ag
ag
ag
@@ -24695,16 +24848,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
ac
aa
aa
@@ -24713,6 +24856,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gM
aa
aa
@@ -24721,17 +24874,17 @@ aa
aa
aa
aa
-ac
aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ac
ag
ag
ag
@@ -24952,16 +25105,6 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
ae
ac
ac
@@ -24969,6 +25112,16 @@ ac
ac
ac
ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
fY
gN
fY
@@ -24978,17 +25131,17 @@ ac
ac
ac
ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
ae
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
ag
ag
ag
@@ -25999,7 +26152,7 @@ ag
fk
gc
gR
-hJ
+Jb
fk
ag
ag
@@ -28009,29 +28162,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
aa
ag
ag
@@ -28082,29 +28235,29 @@ ag
ag
ag
ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Lc
+Ld
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
aa
aa
aa
@@ -28266,6 +28419,7 @@ aa
aa
aa
aa
+ac
aa
aa
aa
@@ -28277,19 +28431,18 @@ aa
aa
aa
aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ac
+aa
ag
ag
ag
@@ -28339,9 +28492,7 @@ ag
ag
ag
ag
-ag
-aa
-aa
+Ld
aa
aa
aa
@@ -28352,6 +28503,7 @@ aa
aa
aa
aa
+Li
aa
aa
aa
@@ -28362,6 +28514,7 @@ aa
aa
aa
aa
+ac
aa
aa
aa
@@ -28523,29 +28676,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+al
+ar
aa
+aj
+al
+ar
aa
+aj
+al
+ar
aa
+aj
+al
+ar
aa
+aj
+al
+ar
aa
-aa
-aa
-aa
-aa
-aa
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
+ac
aa
ag
ag
@@ -28596,29 +28749,29 @@ ag
ag
ag
ag
+ac
aa
+Le
+ri
+Lh
aa
+Le
+ri
+Lh
aa
+Le
+ri
+Lh
aa
+Le
+ri
+Lh
aa
+Le
+ri
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -28780,29 +28933,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
ag
ag
@@ -28853,29 +29006,29 @@ ag
ag
aa
aa
+ac
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -29037,29 +29190,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
ag
ag
@@ -29110,29 +29263,29 @@ ag
aa
aa
aa
+ac
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -29294,29 +29447,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+aJ
+ar
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
-aa
-aa
-ae
ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
aa
aa
ag
@@ -29367,29 +29520,29 @@ ag
aa
aa
aa
-ae
ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
-aa
-aa
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+ac
aa
aa
aa
@@ -29551,27 +29704,27 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
+aj
+am
+ar
aa
+aj
+am
+ar
aa
+aj
+aJ
+ar
aa
+aj
+am
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aj
+am
+ar
aa
ac
aa
@@ -29626,17 +29779,25 @@ aa
aa
ac
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
+Le
+rj
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Le
+rj
+Lh
aa
ac
aa
@@ -29744,14 +29905,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(38,1,1) = {"
aa
@@ -29808,26 +29961,26 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
-al
+am
ar
aa
aj
-al
+am
ar
aa
aj
-al
+aJ
+ar
+aa
+aj
+am
+ar
+aa
+aj
+am
ar
aa
ac
@@ -29883,17 +30036,25 @@ aa
aa
ac
aa
-qY
-ri
-rE
+Le
+Lf
+Lh
aa
-qY
-ri
-rE
+Le
+Lf
+Lh
aa
-qY
-ri
-rE
+Le
+Lf
+Lh
+aa
+Le
+Lf
+Lh
+aa
+Le
+Lf
+Lh
aa
ac
aa
@@ -30001,14 +30162,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(39,1,1) = {"
aa
@@ -30065,14 +30218,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -30084,6 +30229,14 @@ am
ar
aa
aj
+aJ
+ar
+aa
+aj
+am
+ar
+aa
+aj
am
ar
aa
@@ -30140,17 +30293,25 @@ aa
aa
ac
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
+aa
+Le
+rj
+Lh
+aa
+Le
+rj
+Lh
aa
ac
aa
@@ -30258,14 +30419,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(40,1,1) = {"
aa
@@ -30322,14 +30475,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -30341,6 +30486,14 @@ am
ar
aa
aj
+aJ
+ar
+aa
+aj
+am
+ar
+aa
+aj
am
ar
aa
@@ -30397,17 +30550,25 @@ aa
aa
ac
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
+aa
+Le
+rj
+Lh
+aa
+Le
+rj
+Lh
aa
ac
aa
@@ -30515,14 +30676,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(41,1,1) = {"
aa
@@ -30579,14 +30732,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -30601,6 +30746,14 @@ aj
am
ar
aa
+aj
+am
+ar
+aa
+aj
+am
+ar
+aa
ac
aa
aa
@@ -30654,17 +30807,25 @@ aa
aa
ac
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
+aa
+Le
+rj
+Lh
+aa
+Le
+rj
+Lh
aa
ac
aa
@@ -30772,14 +30933,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(42,1,1) = {"
aa
@@ -30833,15 +30986,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
+ae
ac
ac
ab
@@ -30858,6 +31003,14 @@ aj
am
ar
aa
+aj
+am
+ar
+aa
+aj
+am
+ar
+aa
ac
aa
aA
@@ -30911,30 +31064,30 @@ qo
aa
ac
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
+Lh
aa
-qY
+Le
rj
-rE
-wq
+Lh
+aa
+Le
+rj
+Lh
+aa
+Le
+rj
+Lh
+Lk
ab
ac
ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ae
aa
aa
aa
@@ -31090,14 +31243,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aa
@@ -31115,11 +31260,19 @@ aa
an
aa
aa
+aa
+an
+aa
+aa
+aa
+an
+aa
+aa
au
ax
aB
aG
-aJ
+gI
aM
aF
aS
@@ -31162,7 +31315,7 @@ mK
aS
pu
pE
-pS
+Lb
qc
qp
qx
@@ -31181,6 +31334,14 @@ rk
aa
aa
aa
+rk
+aa
+aa
+aa
+rk
+aa
+aa
+aa
aa
aa
ac
@@ -31286,14 +31447,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(44,1,1) = {"
aa
@@ -31347,14 +31500,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
ad
@@ -31370,6 +31515,14 @@ ak
ak
ak
ak
+ak
+ak
+ak
+ak
+ak
+ak
+ak
+ak
as
at
av
@@ -31436,6 +31589,14 @@ rl
rl
rl
rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
+rl
wr
xo
ym
@@ -31543,14 +31704,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(45,1,1) = {"
aa
@@ -31604,14 +31757,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aa
@@ -31629,6 +31774,14 @@ aa
ao
aa
aa
+aa
+ao
+aa
+aa
+aa
+ao
+aa
+aa
au
ax
aD
@@ -31695,6 +31848,14 @@ rm
aa
aa
aa
+rm
+aa
+aa
+aa
+rm
+aa
+aa
+aa
aa
aa
ac
@@ -31800,14 +31961,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(46,1,1) = {"
aa
@@ -31861,18 +32014,18 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ab
+ae
ac
ac
ab
+aa
+aj
+ap
+ar
+aa
+aj
+ap
+ar
ai
aj
ap
@@ -31939,30 +32092,30 @@ qs
aa
ac
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
+aa
+Le
+rn
+Lh
+aa
+Le
+rn
+Lh
aa
ab
ac
ac
-ab
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ae
aa
aa
aa
@@ -32121,14 +32274,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -32143,6 +32288,14 @@ aj
ap
ar
aa
+aj
+ap
+ar
+aa
+aj
+ap
+ar
+aa
ac
aa
aa
@@ -32196,17 +32349,25 @@ aa
aa
ac
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
+aa
+Le
+rn
+Lh
+aa
+Le
+rn
+Lh
aa
ac
aa
@@ -32314,14 +32475,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(48,1,1) = {"
aa
@@ -32378,14 +32531,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -32400,6 +32545,14 @@ aj
ap
ar
aa
+aj
+ap
+ar
+aa
+aj
+ap
+ar
+aa
ac
aa
aa
@@ -32453,17 +32606,25 @@ aa
aa
ac
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
+aa
+Le
+rn
+Lh
+aa
+Le
+rn
+Lh
aa
ac
aa
@@ -32571,14 +32732,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(49,1,1) = {"
aa
@@ -32635,14 +32788,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
@@ -32657,6 +32802,14 @@ aj
ap
ar
aa
+aj
+ap
+ar
+aa
+aj
+ap
+ar
+aa
ac
aa
aa
@@ -32710,17 +32863,25 @@ ag
aa
ac
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
aa
-qY
+Le
rn
-rE
+Lh
+aa
+Le
+rn
+Lh
+aa
+Le
+rn
+Lh
aa
ac
aa
@@ -32828,14 +32989,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(50,1,1) = {"
aa
@@ -32892,26 +33045,26 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
aj
-aq
+ap
ar
aa
aj
-aq
+ap
ar
aa
aj
-aq
+ap
+ar
+aa
+aj
+ap
+ar
+aa
+aj
+ap
ar
aa
ac
@@ -32967,17 +33120,25 @@ ag
aa
ac
aa
-qY
-ro
-rE
+Le
+Lg
+Lh
aa
-qY
-ro
-rE
+Le
+Lg
+Lh
aa
-qY
-ro
-rE
+Le
+Lg
+Lh
+aa
+Le
+Lg
+Lh
+aa
+Le
+Lg
+Lh
aa
ac
aa
@@ -33085,14 +33246,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(51,1,1) = {"
aa
@@ -33149,27 +33302,27 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
ac
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+aj
+ap
+ar
aa
ac
aa
@@ -33224,17 +33377,25 @@ ag
aa
ac
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Le
+rn
+Lh
aa
ac
aa
@@ -33342,14 +33503,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
"}
(52,1,1) = {"
aa
@@ -33406,29 +33559,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
-aa
-aa
-ae
ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
aa
aa
ag
@@ -33479,29 +33632,29 @@ ag
ag
ag
aa
-ae
ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ae
-aa
-aa
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+ac
aa
aa
aa
@@ -33663,29 +33816,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
ag
ag
@@ -33736,29 +33889,29 @@ ag
ag
ag
aa
+ac
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -33920,29 +34073,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
+aj
+ap
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+ac
ag
ag
ag
@@ -33993,29 +34146,29 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ld
+bc
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+Le
+rn
+Lh
aa
+ac
aa
aa
aa
@@ -34177,29 +34330,29 @@ aa
aa
aa
aa
+ac
aa
+aj
+aq
+ar
aa
+aj
+aq
+ar
aa
+aj
+aq
+ar
aa
+aj
+aq
+ar
aa
+aj
+aq
+ar
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ag
+ac
ag
ag
ag
@@ -34250,29 +34403,29 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ld
+bc
+Le
+ro
+Lh
aa
+Le
+ro
+Lh
aa
+Le
+ro
+Lh
aa
+Le
+ro
+Lh
aa
+Le
+ro
+Lh
aa
+ac
aa
aa
aa
@@ -34434,6 +34587,7 @@ aa
aa
aa
aa
+ac
aa
aa
aa
@@ -34455,8 +34609,7 @@ aa
aa
aa
aa
-aa
-ag
+ac
ag
ag
ag
@@ -34507,11 +34660,18 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
+Ld
+bc
+bc
+bc
+bc
+aa
+aa
+aa
+aa
+aa
+aa
+Lj
aa
aa
aa
@@ -34522,14 +34682,7 @@ aa
aa
aa
aa
-aa
-bJ
-aa
-aa
-aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -34691,29 +34844,29 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-ag
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
ag
ag
ag
@@ -34764,29 +34917,29 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
-ag
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Lc
+Ld
+Ld
+Ld
+Ld
+Ld
+ac
+ac
+ac
+ac
+ac
+ae
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ac
+ae
aa
aa
aa
diff --git a/maps/aurora/aurora-7_roof.dmm b/maps/aurora/aurora-7_roof.dmm
index eb6ca80b76d..3de02e1738f 100644
--- a/maps/aurora/aurora-7_roof.dmm
+++ b/maps/aurora/aurora-7_roof.dmm
@@ -1970,16 +1970,12 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eb" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
+ dir = 4
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/airless,
+/obj/effect/floor_decal/industrial/warning,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"ec" = (
/obj/structure/cable/yellow{
@@ -2003,29 +1999,22 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"ee" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
dir = 5
},
-/turf/simulated/floor/airless,
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8
+ },
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"ef" = (
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
- },
-/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
-/turf/simulated/floor/airless,
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eg" = (
/obj/structure/cable/yellow{
@@ -2041,16 +2030,13 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eh" = (
-/obj/structure/cable/yellow{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
/obj/effect/floor_decal/industrial/warning{
- dir = 1
+ dir = 8
},
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/airless,
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"ei" = (
/turf/simulated/wall/r_wall,
@@ -2094,15 +2080,14 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"em" = (
-/obj/structure/cable/yellow{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/floor_decal/industrial/warning{
+ dir = 8
},
+/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/turf/simulated/floor/airless,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"en" = (
/obj/structure/ladder{
@@ -2405,15 +2390,11 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eK" = (
+/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/obj/structure/cable{
- icon_state = "1-2";
dir = 4
},
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor/airless,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eL" = (
/obj/structure/cable/yellow{
@@ -2428,21 +2409,17 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eM" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 8;
- icon_state = "2-8"
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
+ dir = 1
+ },
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
-/turf/simulated/floor/airless,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eN" = (
/obj/machinery/access_button{
@@ -2470,16 +2447,23 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eO" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
-/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/airless,
-/area/mine/explored)
+/area/solar/auxport)
"eP" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -2496,18 +2480,14 @@
/turf/simulated/floor/airless,
/area/mine/explored)
"eQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
+/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
-/turf/simulated/floor/airless,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eR" = (
/obj/effect/floor_decal/industrial/warning{
@@ -2518,68 +2498,76 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eS" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/airless,
+/obj/effect/floor_decal/industrial/warning/corner,
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/structure/window/reinforced,
+/obj/effect/floor_decal/industrial/warning,
/obj/effect/floor_decal/industrial/warning{
- dir = 4
+ dir = 1
},
/obj/effect/floor_decal/industrial/warning{
- dir = 8
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"eU" = (
-/obj/structure/window/reinforced{
dir = 4
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
-"eV" = (
-/obj/structure/cable{
- dir = 2;
- icon_state = "11-1"
+"eU" = (
+/obj/structure/cable/yellow{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
},
-/obj/structure/lattice,
-/turf/simulated/open,
-/area/mine/explored)
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/airless,
+/area/solar/auxport)
+"eV" = (
+/obj/structure/cable/yellow{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/airless,
+/area/solar/auxport)
"eW" = (
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
-/obj/structure/window/reinforced{
+/obj/effect/floor_decal/industrial/warning{
dir = 8
},
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"eX" = (
-/obj/structure/cable{
+/obj/structure/cable/yellow{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/effect/floor_decal/industrial/warning{
- dir = 6
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/yellow{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
/turf/simulated/floor/airless,
-/area/mine/explored)
+/area/solar/auxport)
"eY" = (
/obj/effect/landmark/map_data{
height = 6
@@ -2695,18 +2683,42 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"fn" = (
-/obj/effect/floor_decal/industrial/warning{
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
dir = 4
},
/obj/effect/floor_decal/industrial/warning{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
+"fo" = (
+/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
+/obj/effect/floor_decal/industrial/warning{
+ dir = 4
},
-/turf/simulated/floor/airless,
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
+"fp" = (
+/obj/effect/floor_decal/industrial/warning{
+ icon_state = "warning";
+ dir = 10
+ },
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced/airless,
+/area/mine/explored)
+"fq" = (
+/obj/effect/floor_decal/industrial/warning/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/warning{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"fr" = (
/obj/effect/floor_decal/industrial/warning{
@@ -2893,231 +2905,13 @@
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
"fL" = (
-/obj/structure/window/reinforced{
+/obj/random/loot,
+/obj/effect/floor_decal/industrial/warning/corner{
+ icon_state = "warningcorner";
dir = 1
},
/turf/simulated/floor/reinforced/airless,
/area/mine/explored)
-"fM" = (
-/obj/structure/cable{
- d1 = 2;
- d2 = 4;
- icon_state = "2-4"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 9
- },
-/obj/effect/floor_decal/industrial/warning/corner,
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fN" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fO" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fP" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fQ" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fR" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fS" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fT" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fU" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fV" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 2;
- icon_state = "1-2"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 8
- },
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fW" = (
-/obj/structure/cable{
- d1 = 1;
- d2 = 4;
- icon_state = "1-4"
- },
-/obj/effect/floor_decal/industrial/warning{
- icon_state = "warning";
- dir = 10
- },
-/obj/effect/floor_decal/industrial/warning/corner{
- icon_state = "warningcorner";
- dir = 4
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fX" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fY" = (
-/obj/random/junk,
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"fZ" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"ga" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
-"gb" = (
-/obj/structure/cable{
- icon_state = "1-2";
- dir = 4
- },
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/floor_decal/industrial/warning{
- dir = 1
- },
-/turf/simulated/floor/airless,
-/area/mine/explored)
"gc" = (
/obj/random/glowstick,
/turf/simulated/floor/reinforced/airless,
@@ -26650,19 +26444,19 @@ ab
ab
ab
ab
-ad
-ag
-ag
-aw
-ab
-ab
-ae
-ah
-ah
-ah
-ah
-ah
-ah
+fk
+aP
+aP
+aP
+aP
+aP
+eS
+ai
+ai
+ai
+ai
+ai
+fi
ah
al
ab
@@ -26907,20 +26701,20 @@ ab
ab
ac
ab
+aJ
+dF
+dF
+dF
+dF
+dF
+eT
+dW
+dF
+dF
+dF
+dF
ae
ah
-ah
-fh
-ag
-ag
-fe
-ah
-ah
-ah
-ah
-ah
-ah
-ah
fh
aw
ab
@@ -27164,21 +26958,21 @@ ab
ab
ab
ab
+aJ
+dG
+dK
+dK
+dK
+dK
+eU
+dX
+dX
+dX
+dX
+dY
ae
ah
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
al
ab
ab
@@ -27421,21 +27215,21 @@ ab
ab
ab
ab
+aJ
+dH
+dH
+dH
+dH
+dH
+eV
+dH
+dH
+dH
+dH
+dH
ae
ah
ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
-ah
al
ab
ab
@@ -27672,31 +27466,31 @@ ag
ag
ag
ag
-ag
-ag
-ag
-ag
-ag
fy
+aP
+aP
+aP
+aP
+em
+eM
+bb
+bb
+bb
+bb
+eQ
+dP
+eW
+bb
+bb
+bb
+bb
fz
+fn
ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ai
-ff
-ah
-al
-ab
-ab
-ab
+fo
+bb
+bb
+fp
ab
ac
ab
@@ -27929,17 +27723,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dF
dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ah
dP
ah
@@ -27948,12 +27742,12 @@ dF
dF
dF
dF
-ae
-ah
-al
-ab
-ab
-ab
+dW
+dF
+dF
+dF
+dF
+aJ
ab
ab
ab
@@ -28186,17 +27980,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -28204,13 +27998,13 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
-ae
-ah
-fh
-ag
-aw
-ab
+aJ
ab
ab
ab
@@ -28443,17 +28237,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dH
dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ah
dP
ah
@@ -28462,12 +28256,12 @@ dH
dH
dH
dH
-ae
-ah
-ah
-ah
-al
-ab
+dH
+dH
+dH
+dH
+dH
+aJ
ab
ab
ab
@@ -28700,11 +28494,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ah
ah
@@ -28712,6 +28501,11 @@ ah
ah
ah
ah
+ah
+ah
+ah
+ah
+ah
dP
ah
ah
@@ -28719,12 +28513,12 @@ ah
ah
ah
ah
-ae
ah
ah
ah
-fh
-ag
+ah
+ah
+fq
ag
bG
ag
@@ -28957,17 +28751,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dF
dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ah
dP
ah
@@ -28976,13 +28770,13 @@ dF
dF
dF
dF
+dW
+dF
+dF
+dF
+dF
ae
ah
-ah
-ah
-ah
-ah
-ah
dZ
ec
ec
@@ -29214,17 +29008,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -29232,14 +29026,14 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
ah
ah
@@ -29471,17 +29265,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dH
dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ah
dP
ah
@@ -29490,13 +29284,13 @@ dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
ah
ah
@@ -29728,11 +29522,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ah
ah
@@ -29740,6 +29529,11 @@ ah
ah
ah
ah
+ah
+ah
+ah
+ah
+ah
dP
ah
ah
@@ -29747,13 +29541,13 @@ ah
ah
ah
ah
+ah
+ah
+ah
+ah
+ah
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
ah
ah
@@ -29985,17 +29779,17 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
dF
dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ah
dP
ah
@@ -30004,13 +29798,13 @@ dF
dF
dF
dF
+dW
+dF
+dF
+dF
+dF
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
ah
ah
@@ -30242,17 +30036,17 @@ ah
ah
ah
ah
-ah
-ah
-an
-ah
-ah
al
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -30260,14 +30054,14 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
fg
ai
@@ -30499,17 +30293,17 @@ ah
ah
ah
ah
-ah
-ah
-bX
-ah
-ah
al
dH
dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ah
dP
ah
@@ -30518,13 +30312,13 @@ dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ae
ah
-ah
-ah
-ah
-ah
-ah
ea
al
ab
@@ -30756,12 +30550,12 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
-al
+fh
+ag
+ag
+ag
+ag
+ag
ag
ag
ag
@@ -30775,12 +30569,12 @@ ag
ag
ag
ag
-ae
-ah
-ah
-ah
-ah
-ah
+ag
+ag
+ag
+ag
+ag
+fe
ah
ea
al
@@ -31012,13 +30806,13 @@ ad
ag
ag
ag
-dC
+aw
ah
ad
ag
ag
ag
-dC
+aw
ah
ah
ah
@@ -31270,12 +31064,12 @@ ah
ah
ah
al
-ah
-ae
-ah
-ah
-ah
-al
+fg
+ef
+ai
+ai
+ai
+eK
ai
ai
ai
@@ -31289,12 +31083,12 @@ ai
ai
ai
ai
-ae
-ah
-ah
-ah
-ah
-ah
+ai
+ai
+ai
+ai
+ai
+fi
ah
ah
al
@@ -31527,17 +31321,17 @@ ah
ah
ah
al
-ah
-ae
-ah
-ah
-ah
al
dF
dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ah
dP
ah
@@ -31546,14 +31340,14 @@ dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ae
ah
ah
-ah
-ah
-ah
-ah
-ah
fh
ag
fe
@@ -31784,17 +31578,17 @@ ah
ah
ah
al
-ah
-ae
-ah
-ah
-ah
al
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -31802,6 +31596,11 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
ae
ah
@@ -31829,11 +31628,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
fg
ai
ai
@@ -32041,12 +31835,12 @@ ai
ai
ai
am
-ah
-af
-ai
-ai
-ai
-am
+al
+dH
+dH
+dH
+dH
+dH
dH
dH
dH
@@ -32060,6 +31854,11 @@ dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ae
ah
ah
@@ -32080,11 +31879,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
fg
ai
ff
@@ -32298,12 +32092,12 @@ ai
ai
ai
ai
-ff
+eb
+ah
ah
ah
ah
ah
-al
ah
ah
ah
@@ -32317,6 +32111,11 @@ ah
ah
ah
ah
+ah
+ah
+ah
+ah
+ah
ae
ah
ah
@@ -32337,11 +32136,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ab
ae
@@ -32555,12 +32349,12 @@ ab
ab
ab
ab
-ae
-ah
-ah
-ah
-ah
-al
+aJ
+dF
+dF
+dF
+dF
+dF
dF
dF
dF
@@ -32574,6 +32368,11 @@ dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ae
ah
ah
@@ -32581,11 +32380,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
fg
ai
ai
@@ -32812,17 +32606,17 @@ ab
ab
ab
ab
-af
-ai
-ff
-ah
-ah
-al
+cU
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -32830,6 +32624,11 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
ae
ah
@@ -32838,11 +32637,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ab
aa
@@ -33069,12 +32863,12 @@ ab
ab
ab
ab
-ab
-ab
-ae
-ah
-ah
-al
+cU
+dH
+dH
+dH
+dH
+dH
dH
dH
dH
@@ -33088,6 +32882,11 @@ dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ae
ah
ah
@@ -33095,11 +32894,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ab
aa
@@ -33326,12 +33120,12 @@ ab
ab
ab
ab
-ab
-ab
-af
-ff
+cU
+ah
+ah
+ah
+ah
ah
-al
ah
ah
ah
@@ -33345,6 +33139,11 @@ ah
ah
ah
ah
+ah
+ah
+ah
+ah
+ah
ae
ah
ah
@@ -33352,11 +33151,6 @@ ah
ah
ah
ah
-ah
-ah
-ah
-ah
-ah
al
ab
aa
@@ -33583,12 +33377,12 @@ ac
ab
ab
ab
-ab
-ab
-ab
-ae
-ah
-al
+cU
+dF
+dF
+dF
+dF
+dF
dF
dF
dF
@@ -33602,12 +33396,12 @@ dF
dF
dF
dF
+dF
+dF
+dF
+dF
+dF
ae
-ah
-ah
-ah
-ah
-ah
an
ah
ah
@@ -33840,17 +33634,17 @@ ac
ab
ab
ab
-ab
-ab
-ab
-ae
-ah
-al
+cU
dG
dK
dK
dK
dK
+eO
+dK
+dK
+dK
+dK
dO
dP
dS
@@ -33858,14 +33652,14 @@ dX
dX
dX
dX
+eX
+dX
+dX
+dX
+dX
dY
ae
ah
-ah
-ah
-ah
-ah
-ah
fF
ai
ai
@@ -34097,12 +33891,12 @@ ab
ab
ab
ab
-ac
-ab
-ab
-ae
-ah
-al
+cU
+dH
+dH
+dH
+dH
+dH
dH
dH
dH
@@ -34116,13 +33910,13 @@ dH
dH
dH
dH
+dH
+dH
+dH
+dH
+dH
ae
ah
-ah
-ah
-ah
-ah
-ah
bm
ab
ab
@@ -34354,12 +34148,10 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ae
-ah
-fh
+ee
+aP
+aP
+eh
ag
ag
ag
@@ -34373,12 +34165,14 @@ ag
ag
ag
ag
-fe
-ah
-ah
-ah
-ah
-bX
+ag
+ag
+fJ
+ag
+ag
+ag
+ag
+fL
ah
al
ab