The Great Station Site Refactor (#21172)

**Requesting Test Merge**

Refactors multiple stationary away sites (like sensor array) to
ship/stationary to allow for their systems to properly function

Current maps refactored
- Sensor Array
- Hedgemony Waypoint
- People's Station
- IHSS Reclamation

---------

Co-authored-by: Ben10083 <Ben10083@users.noreply.github.com>
This commit is contained in:
Ben
2025-09-06 06:32:02 -04:00
committed by GitHub
parent 387f141959
commit b88f19690d
11 changed files with 297 additions and 54 deletions
+4 -1
View File
@@ -42,6 +42,8 @@
/obj/effect/overmap/proc/get_scan_data(mob/user)
if(static_vessel == TRUE)
if(instant_contact)
. += "<br>It is broadcasting a distress signal."
. += "<hr>"
. += "<br><center><large><b>Scan Details</b></large>"
. += "<br><large><b>[name]</b></large></center>"
@@ -56,7 +58,8 @@
. += "<hr>"
. += "<br><center><b>Native Database Notes</b></center>"
. += "<br><small>[desc]</small>"
if(landing_site == TRUE)
return
else if(landing_site == TRUE)
. += "<hr>"
. += "<br><center><large><b>Designated Landing Zone Details</b></large>"
. += "<br><large><b>[name]</b></large></center>"
+12
View File
@@ -74,6 +74,16 @@
if(LAZYLEN(colors))
color = pick(colors)
/// Parent object for stationary objects that still need to access ship systems (such as the Sensor Relays)
/obj/effect/overmap/visitable/ship/stationary
name = "generic station"
desc = "A generic space station, see if you can find the other twelve."
obfuscated_name = "unidentified stationary object"
unknown_id = "Unknown artificial structure"
static_vessel = TRUE
propulsion = "None equipped, flight incapable"
halted = TRUE // Cannot fly under any circumstances
/obj/effect/overmap/visitable/ship/find_z_levels(var/fore_direction)
. = ..(fore_dir)
@@ -98,6 +108,8 @@
/obj/effect/overmap/visitable/ship/get_scan_data(mob/user)
. = ..()
if (static_vessel) // full data already acquired from parent proc
return
if(!is_still())
. += "<br>Heading: [dir2angle(get_heading())], speed [get_speed() * 1000]"
if(instant_contact)
@@ -0,0 +1,58 @@
################################
# 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
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################
# Your name.
author: Ben10083
# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- experiment: "Refactors most stationary space stations/objects to be considered a ship type, fixing issues relating to sensors and targetting systems."
@@ -6,7 +6,6 @@
sectors = list(SECTOR_UUEOAESA)
id = "hegemony_waypoint"
template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED
unit_test_groups = list(1)
@@ -14,14 +13,18 @@
map = "Hegemony Waypoint"
descriptor = "A hegemony waypoint."
/obj/effect/overmap/visitable/sector/hegemony_waypoint
/obj/effect/overmap/visitable/ship/stationary/hegemony_waypoint
name = "hegemony waypoint"
class = "IHSS"
icon = 'icons/obj/overmap/overmap_stationary.dmi'
icon_state = "waypoint"
color = COLOR_CHESTNUT
desc = "This is a waypoint station manufactued en masse by the Izweski Hegemony, designed to guide vessels through potentially perilous routes, and to maintain a watchful eye for pirates. These are cramped facilities that tend only to be manned for days at a time as contracted technicians see to the maintenance of their systems in a short stay before leaving to the next installation. Many waypoints in Uueoa-Esa have fallen into disrepair since their initial constructions, prone to structural damage, electrical malfunctions, and infestations of dangerous pests. The Izweski Hegemony is known to offer financial compensation for third parties willing to return them to full operational capacity. The exact condition of this one is challenging to ascertain from sensor scans, but it is likely to be inactive."
comms_support = TRUE
comms_name = "Hegemony Waypoint"
volume = "48 meters length, 22 meters beam/width, 20 meters vertical height"
designer = "Izweski Hegemony"
sizeclass = "Waypoint Station"
initial_generic_waypoints = list(
"hegemony_waypoint_dock_n",
"hegemony_waypoint_dock_e",
@@ -33,6 +36,10 @@
"hegemony_waypoint_s_space"
)
/obj/effect/overmap/visitable/ship/stationary/hegemony_waypoint/New(loc, ...)
designation = "Waypoint Station #[rand(100, 999)]"
..()
// Areas
/area/hegemony_waypoint
area_flags = AREA_FLAG_HIDE_FROM_HOLOMAP
@@ -77,6 +77,9 @@
/obj/effect/map_effect/marker/airlock/hegemony_waypoint/east,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/random/dirt_75,
/obj/effect/landmark/entry_point/port{
name = "port, eastern airlock"
},
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_waypoint/hallway)
"cg" = (
@@ -436,6 +439,23 @@
/obj/structure/lattice,
/turf/space/dynamic,
/area/hegemony_waypoint/exterior)
"iB" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/port{
name = "port, upper solar array"
},
/turf/simulated/floor/airless,
/area/hegemony_waypoint/exterior)
"jo" = (
/obj/effect/floor_decal/corner_wide/brown{
dir = 9
@@ -915,6 +935,13 @@
/obj/effect/shuttle_landmark/hegemony_waypoint/east,
/turf/template_noop,
/area/space)
"sm" = (
/obj/structure/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/starboard{
name = "starboard, southern exterior"
},
/turf/simulated/floor/airless,
/area/hegemony_waypoint/exterior)
"sq" = (
/obj/effect/floor_decal/corner/yellow/diagonal,
/obj/structure/table/steel,
@@ -944,10 +971,10 @@
/turf/simulated/floor/tiled/dark,
/area/hegemony_waypoint/hallway)
"sB" = (
/obj/effect/map_effect/map_helper/ruler_tiles_3,
/obj/effect/overmap/visitable/sector/hegemony_waypoint,
/turf/template_noop,
/area/space)
/obj/structure/lattice/catwalk/indoor,
/obj/effect/overmap/visitable/ship/stationary/hegemony_waypoint,
/turf/simulated/floor/airless,
/area/hegemony_waypoint/exterior)
"sJ" = (
/obj/effect/floor_decal/corner_wide/brown{
dir = 6
@@ -1122,6 +1149,12 @@
/obj/random/dirt_75,
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_waypoint/hallway)
"wh" = (
/obj/effect/landmark/entry_point/starboard{
name = "starboard, northern docking arm"
},
/turf/simulated/wall/shuttle/raider,
/area/hegemony_waypoint/hallway)
"wj" = (
/obj/effect/floor_decal/industrial/hatch/grey,
/obj/machinery/door/airlock/service{
@@ -1417,6 +1450,23 @@
/obj/random/dirt_75,
/turf/simulated/floor/tiled/dark,
/area/hegemony_waypoint/hallway)
"AW" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/port{
name = "port, lower solar array"
},
/turf/simulated/floor/airless,
/area/hegemony_waypoint/exterior)
"Bi" = (
/obj/machinery/power/smes/buildable/third_party_shuttle/empty,
/obj/structure/cable/green{
@@ -1628,6 +1678,9 @@
/obj/effect/map_effect/marker/airlock/hegemony_waypoint/north,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/random/dirt_75,
/obj/effect/landmark/entry_point/aft{
name = "aft, north airlock"
},
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_waypoint/hallway)
"GO" = (
@@ -2083,6 +2136,9 @@
/obj/machinery/door/airlock/external,
/obj/effect/map_effect/marker/airlock/hegemony_waypoint/south,
/obj/effect/map_effect/marker_helper/airlock/exterior,
/obj/effect/landmark/entry_point/north{
name = "north, south airlock"
},
/turf/simulated/floor/tiled/dark/full,
/area/hegemony_waypoint/hallway)
"Nf" = (
@@ -2168,6 +2224,13 @@
"OV" = (
/turf/template_noop,
/area/space)
"OY" = (
/obj/structure/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/starboard{
name = "starboard, northern exterior"
},
/turf/simulated/floor/airless,
/area/hegemony_waypoint/exterior)
"Pj" = (
/obj/structure/lattice/catwalk/indoor/grate/dark,
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -32198,11 +32261,11 @@ OV
OV
OV
OV
sB
jq
mT
jq
jq
jq
OY
jq
jq
jq
@@ -32983,7 +33046,7 @@ jq
KX
mp
xw
jq
sB
jq
jq
jq
@@ -33469,7 +33532,7 @@ OV
jq
gB
gB
gB
wh
gB
gB
oV
@@ -33767,7 +33830,7 @@ jq
jq
jq
jq
jq
sm
jq
jq
jq
@@ -41976,7 +42039,7 @@ Ao
tt
OV
gk
Jt
iB
tt
OV
gk
@@ -41992,7 +42055,7 @@ Jt
tt
OV
gk
Jt
AW
tt
OV
gk
@@ -22,11 +22,15 @@
map = "sensor_relay"
descriptor = "A sensor relay."
/obj/effect/overmap/visitable/sector/sensor_relay
/obj/effect/overmap/visitable/ship/stationary/sensor_relay
name = "sensor relay"
class = "SASS"
icon = 'icons/obj/overmap/overmap_stationary.dmi'
icon_state = "sensor_relay"
color = COLOR_STEEL
designer = "Solarian Alliance"
sizeclass = "Sensor Installation"
volume = "32 meters length, 48 meters beam/width, 20 meters vertical height"
desc = "A ring-shaped installation with a powerful sensor suite. These stations were originally built during the pre-Interstellar War era by the Solarian Alliance's \
Department of Colonization as a method of making interstellar travel safer. Thousands of these 'beacon stations' were built by the Alliance and many were abandoned during the \
Interstellar War and its aftermath. While they have been mostly replaced in more developed sectors, such as Liberty's Cradle and the Jewel Worlds, beacon stations are still \
@@ -42,7 +46,11 @@
"relay_se",
)
/obj/effect/overmap/visitable/sector/sensor_relay/handle_sensor_state_change(var/on)
/obj/effect/overmap/visitable/ship/stationary/sensor_relay/New(loc, ...)
designation = "Sensor Relay #[rand(100, 999)]"
..()
/obj/effect/overmap/visitable/ship/stationary/sensor_relay/handle_sensor_state_change(var/on)
if(on)
icon_state = "[initial(icon_state)]_active"
else
@@ -606,6 +606,13 @@
/obj/effect/floor_decal/corner/mauve/diagonal,
/turf/simulated/floor/tiled/white,
/area/sensor_relay/janitor)
"abT" = (
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/obj/effect/landmark/entry_point/aft{
name = "aft, sensor monitoring"
},
/turf/simulated/floor/plating,
/area/sensor_relay/monitoring)
"abV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -1778,17 +1785,6 @@
/obj/structure/extinguisher_cabinet/south,
/turf/simulated/floor/tiled/full,
/area/sensor_relay/dining)
"aDR" = (
/obj/structure/lattice/catwalk/indoor,
/obj/structure/railing/mapped{
dir = 1
},
/obj/structure/railing/mapped{
dir = 8
},
/obj/effect/overmap/visitable/sector/sensor_relay,
/turf/simulated/floor/airless,
/area/sensor_relay)
"aDS" = (
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
@@ -2607,6 +2603,7 @@
/obj/structure/cable/green{
icon_state = "0-8"
},
/obj/effect/overmap/visitable/ship/stationary/sensor_relay,
/turf/simulated/floor/plating,
/area/sensor_relay)
"aYV" = (
@@ -2643,6 +2640,23 @@
"aZQ" = (
/turf/simulated/floor/airless,
/area/sensor_relay)
"bpd" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/east{
name = "east, upper solar array"
},
/turf/simulated/floor/airless,
/area/sensor_relay)
"bNO" = (
/obj/effect/floor_decal/industrial/warning{
dir = 8
@@ -2678,6 +2692,9 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/effect/landmark/entry_point/north{
name = "north, southern airlock"
},
/turf/simulated/floor/tiled/dark,
/area/sensor_relay/airlocks)
"cxA" = (
@@ -2748,6 +2765,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/obj/machinery/iff_beacon,
/turf/simulated/floor/airless,
/area/sensor_relay)
"deH" = (
@@ -2772,6 +2790,12 @@
"djv" = (
/turf/simulated/wall,
/area/sensor_relay/dining)
"dnP" = (
/obj/effect/landmark/entry_point/aft{
name = "aft, EVA"
},
/turf/simulated/wall,
/area/sensor_relay/workshop)
"drD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/cyan,
/obj/effect/map_effect/marker/airlock{
@@ -2947,6 +2971,9 @@
/area/sensor_relay)
"evX" = (
/obj/structure/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/aft{
name = "aft, northern airlock"
},
/turf/simulated/floor/airless,
/area/sensor_relay/airlocks)
"eGA" = (
@@ -2986,6 +3013,23 @@
},
/turf/simulated/floor/tiled,
/area/sensor_relay)
"eSR" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/east{
name = "east, lower solar array"
},
/turf/simulated/floor/airless,
/area/sensor_relay)
"eVO" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/drinks/bottle/whiskey{
@@ -3447,6 +3491,23 @@
/obj/item/hullbeacon/red,
/turf/space/dynamic,
/area/space)
"oBH" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/west{
name = "west, upper solar array"
},
/turf/simulated/floor/airless,
/area/sensor_relay)
"oCr" = (
/obj/structure/cable/yellow{
d1 = 4;
@@ -3712,6 +3773,13 @@
/obj/item/device/radio/intercom/ship/west,
/turf/simulated/floor/tiled,
/area/sensor_relay)
"sEV" = (
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/obj/effect/landmark/entry_point/north{
name = "north, hydroponics"
},
/turf/simulated/floor/plating,
/area/sensor_relay/hydroponics)
"sGj" = (
/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/turf/simulated/floor/plating,
@@ -3720,6 +3788,23 @@
/obj/effect/shuttle_landmark/sensor_relay/northwest,
/turf/template_noop,
/area/space)
"sJK" = (
/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/lattice/catwalk/indoor,
/obj/effect/landmark/entry_point/west{
name = "west, lower solar array"
},
/turf/simulated/floor/airless,
/area/sensor_relay)
"sMu" = (
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/turf/simulated/floor/plating,
@@ -3943,7 +4028,7 @@
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/turf/space/dynamic,
/turf/simulated/floor/airless,
/area/sensor_relay)
"vYn" = (
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
@@ -4050,6 +4135,12 @@
},
/turf/simulated/floor/tiled,
/area/sensor_relay/airlocks)
"xxn" = (
/obj/effect/landmark/entry_point/north{
name = "north, bedroom"
},
/turf/simulated/wall,
/area/sensor_relay/quarters)
"xyP" = (
/obj/structure/closet/secure_closet/freezer,
/obj/effect/floor_decal/corner/black/diagonal,
@@ -27095,14 +27186,14 @@ vmy
vmy
cOx
vmy
vmy
vmy
cOx
vmy
vmy
vmy
cOx
vmy
cOx
vmy
vmy
otx
cOx
@@ -27603,7 +27694,7 @@ anw
anw
cOx
aEs
ohn
bpd
aQE
cOx
aEs
@@ -27619,7 +27710,7 @@ ohn
aQE
cOx
aEs
ohn
eSR
aQE
cOx
anw
@@ -32227,7 +32318,7 @@ anw
anw
anw
anw
aDR
cqN
asy
asy
asy
@@ -32999,7 +33090,7 @@ anw
anw
anw
asy
sMu
abT
aKt
aLP
aHe
@@ -33273,7 +33364,7 @@ azs
aAu
uYz
kmb
mqZ
sEV
aZn
anw
anw
@@ -38156,7 +38247,7 @@ axZ
jOf
tLJ
dAx
aNP
xxn
aZn
anw
anw
@@ -38396,7 +38487,7 @@ anw
anw
anw
asy
lcm
dnP
aDv
amT
adO
@@ -43537,7 +43628,7 @@ anw
anw
cOx
aEs
xXj
oBH
aQE
cOx
aEs
@@ -43553,7 +43644,7 @@ xXj
aQE
cOx
aEs
xXj
sJK
aQE
cOx
anw
@@ -17,10 +17,11 @@
map = "People's Space Station"
descriptor = "Built in the interwar period, the People's Space Station bears the prestige of being the first space installation designed, constructed, and manned by Tajara."
/obj/effect/overmap/visitable/sector/peoples_station
/obj/effect/overmap/visitable/ship/stationary/peoples_station
name = "People's Space Station"
class = "PRASS"
designation = "People's Space Station"
desc = "Built in the interwar period, the People's Space Station bears the prestige of being the first space installation designed, constructed, and manned by Tajara."
icon = 'icons/obj/overmap/overmap_stationary.dmi'
icon_state = "battlestation"
color = "#8C8A81"
@@ -50,7 +51,7 @@
comms_support = TRUE
comms_name = "people's station"
/obj/effect/overmap/visitable/sector/peoples_station/get_skybox_representation()
/obj/effect/overmap/visitable/ship/stationary/peoples_station/get_skybox_representation()
var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "pss")
skybox_image.pixel_x = rand(0,64)
skybox_image.pixel_y = rand(128,256)
@@ -1677,6 +1677,7 @@
/area/peoples_station/hangar)
"fX" = (
/obj/structure/lattice/catwalk,
/obj/effect/overmap/visitable/ship/stationary/peoples_station,
/turf/template_noop,
/area/peoples_station/bridge)
"fY" = (
@@ -12339,12 +12340,6 @@
/obj/effect/floor_decal/spline/plain/cee/grey,
/turf/simulated/floor/tiled/dark/full,
/area/shuttle/peoples_station_transport)
"UP" = (
/obj/effect/overmap/visitable/sector/peoples_station,
/turf/simulated/floor/tiled/dark{
temperature = 278.15
},
/area/peoples_station/bridge)
"UQ" = (
/obj/structure/window/reinforced{
dir = 4
@@ -13513,7 +13508,9 @@
/area/peoples_station/atmos)
"Zs" = (
/obj/structure/lattice/catwalk,
/obj/machinery/iff_beacon/name_change,
/obj/machinery/iff_beacon/name_change{
can_change_name = 0
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/airless,
/area/peoples_station/bridge)
@@ -50277,7 +50274,7 @@ Ox
bL
sA
bs
UP
DJ
Gz
DJ
YG
@@ -14,7 +14,7 @@
map = "IHSS Reclamation"
descriptor = "The very first space station constructed by the Unathi, and nearly a century old, the IHSS Reclamation has been extensively refurbished to provide a monitoring and research station for ecological restoration efforts on the Moghresian Wasteland."
/obj/effect/overmap/visitable/sector/ihss_reclamation
/obj/effect/overmap/visitable/ship/stationary/ihss_reclamation
name = "IHSS Reclamation"
desc = "The very first space station constructed by the Unathi, and nearly a century old, the IHSS Reclamation has been extensively refurbished to provide a monitoring and research station for ecological restoration efforts on the Moghresian Wasteland."
class = "IHSS"
@@ -3765,7 +3765,7 @@
/obj/effect/floor_decal/corner/lime{
dir = 5
},
/obj/machinery/seed_storage/xenobotany,
/obj/machinery/seed_storage/garden/hydroponics,
/turf/simulated/floor/tiled/white{
temperature = 303.15
},
@@ -5505,7 +5505,6 @@
/area/shuttle/ihss_reclamation)
"Au" = (
/obj/machinery/hologram/holopad/long_range,
/obj/effect/overmap/visitable/sector/ihss_reclamation,
/turf/simulated/floor/tiled/dark,
/area/ihss_reclamation/bridge)
"Ay" = (
@@ -10173,6 +10172,10 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor/plating,
/area/ihss_reclamation/hangar1)
"Xg" = (
/obj/effect/overmap/visitable/ship/stationary/ihss_reclamation,
/turf/simulated/floor/tiled/dark,
/area/ihss_reclamation/bridge)
"Xk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
@@ -43783,7 +43786,7 @@ IX
ME
wJ
wJ
wJ
Xg
Au
wJ
wJ