From e76ce78a7bba629baeeb4a1fae18b0110b3e7c33 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 00:25:01 +0000
Subject: [PATCH 01/23] Automatic changelog compile [ci skip]
---
html/changelogs/AutoChangeLog-pr-87610.yml | 6 ----
html/changelogs/AutoChangeLog-pr-87676.yml | 5 ---
html/changelogs/AutoChangeLog-pr-87689.yml | 4 ---
html/changelogs/AutoChangeLog-pr-87697.yml | 4 ---
html/changelogs/AutoChangeLog-pr-87702.yml | 5 ---
html/changelogs/AutoChangeLog-pr-87712.yml | 4 ---
html/changelogs/AutoChangeLog-pr-87714.yml | 4 ---
html/changelogs/AutoChangeLog-pr-87721.yml | 6 ----
html/changelogs/AutoChangeLog-pr-87730.yml | 4 ---
html/changelogs/AutoChangeLog-pr-87736.yml | 5 ---
html/changelogs/AutoChangeLog-pr-87737.yml | 4 ---
html/changelogs/archive/2024-11.yml | 38 ++++++++++++++++++++++
12 files changed, 38 insertions(+), 51 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-87610.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87676.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87689.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87697.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87702.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87712.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87714.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87721.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87730.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87736.yml
delete mode 100644 html/changelogs/AutoChangeLog-pr-87737.yml
diff --git a/html/changelogs/AutoChangeLog-pr-87610.yml b/html/changelogs/AutoChangeLog-pr-87610.yml
deleted file mode 100644
index 487644fc3a29a..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87610.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "00-Steven"
-delete-after: True
-changes:
- - bugfix: "NTNRC no longer endlessly duplicates messages with duplicate contents upon switching channels."
- - bugfix: "The new message header you get when NTNRC runs in the background actually works."
- - bugfix: "NtOS header actually updates if there are no program headers."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87676.yml b/html/changelogs/AutoChangeLog-pr-87676.yml
deleted file mode 100644
index df20f96c5612d..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87676.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SyncIt21"
-delete-after: True
-changes:
- - bugfix: "MK honk shoes now consume bananium & can clown again"
- - code_imp: "material container objects end their attack chain early"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87689.yml b/html/changelogs/AutoChangeLog-pr-87689.yml
deleted file mode 100644
index 40fbd2fab95fb..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87689.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SyncIt21"
-delete-after: True
-changes:
- - bugfix: "status & newscaster frame won't drop extra glass sheets upon deconstruction"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87697.yml b/html/changelogs/AutoChangeLog-pr-87697.yml
deleted file mode 100644
index 17d5b2b999d92..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87697.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Rhials"
-delete-after: True
-changes:
- - bugfix: "Goliath Tendril Hammer arm (from the gene brain) is now resistant to being burned off by acid/fire."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87702.yml b/html/changelogs/AutoChangeLog-pr-87702.yml
deleted file mode 100644
index 21da306548273..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87702.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - balance: "Some mind altering effects of heretics (predominantly Path of the Moon heretic abilities) are nullified using...a tinfoil hat. But awareness of the mind altering psychotropic eldritch brain wizards has spread amongst the conspiracy theorists. They could be anyone! Even YOU."
- - balance: "Some additional spells (mindswap, nightmare's terrorize) are also blocked."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87712.yml b/html/changelogs/AutoChangeLog-pr-87712.yml
deleted file mode 100644
index 310b552be4722..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87712.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "NoselessCanine"
-delete-after: True
-changes:
- - balance: "Gas mask filters are now more effective, and their degradation is more heavily influenced by what gasses they are filtering."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87714.yml b/html/changelogs/AutoChangeLog-pr-87714.yml
deleted file mode 100644
index 0f37160fbee8e..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87714.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "unit0016"
-delete-after: True
-changes:
- - code_imp: "Mappers can now opt out of automatically linking their up/down station traits."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87721.yml b/html/changelogs/AutoChangeLog-pr-87721.yml
deleted file mode 100644
index 82b007fdcb614..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87721.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "You can perform fish scanning experiments again."
- - bugfix: "You can actually release fish on water turfs after catching them."
- - spellcheck: "Fixed a typo in the name of material fishing rods."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87730.yml b/html/changelogs/AutoChangeLog-pr-87730.yml
deleted file mode 100644
index 2450028e1e18d..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87730.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "thegrb93"
-delete-after: True
-changes:
- - bugfix: "Fixes oil slimes making vegetable oil instead of corn oil"
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87736.yml b/html/changelogs/AutoChangeLog-pr-87736.yml
deleted file mode 100644
index f5aa63c75db72..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87736.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Jacquerel"
-delete-after: True
-changes:
- - bugfix: "Living Limbs no longer try to grab things that are under the floor."
- - spellcheck: "Living Limb feedback messages now don't redundantly specify that they are flesh arms."
\ No newline at end of file
diff --git a/html/changelogs/AutoChangeLog-pr-87737.yml b/html/changelogs/AutoChangeLog-pr-87737.yml
deleted file mode 100644
index 63f172548d766..0000000000000
--- a/html/changelogs/AutoChangeLog-pr-87737.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fikou"
-delete-after: True
-changes:
- - bugfix: "fixes borgs linking to ais in mechs cards and modsuits"
\ No newline at end of file
diff --git a/html/changelogs/archive/2024-11.yml b/html/changelogs/archive/2024-11.yml
index efaf9114db7e3..d5e17a66462b0 100644
--- a/html/changelogs/archive/2024-11.yml
+++ b/html/changelogs/archive/2024-11.yml
@@ -273,3 +273,41 @@
- spellcheck: the text for failing to succumb is now spanned
zoomachina:
- bugfix: e-cigarettes can't be emptied if the cap isn't open
+2024-11-09:
+ 00-Steven:
+ - bugfix: NTNRC no longer endlessly duplicates messages with duplicate contents
+ upon switching channels.
+ - bugfix: The new message header you get when NTNRC runs in the background actually
+ works.
+ - bugfix: NtOS header actually updates if there are no program headers.
+ Fikou:
+ - bugfix: fixes borgs linking to ais in mechs cards and modsuits
+ Ghommie:
+ - bugfix: You can perform fish scanning experiments again.
+ - bugfix: You can actually release fish on water turfs after catching them.
+ - spellcheck: Fixed a typo in the name of material fishing rods.
+ Jacquerel:
+ - bugfix: Living Limbs no longer try to grab things that are under the floor.
+ - spellcheck: Living Limb feedback messages now don't redundantly specify that they
+ are flesh arms.
+ NoselessCanine:
+ - balance: Gas mask filters are now more effective, and their degradation is more
+ heavily influenced by what gasses they are filtering.
+ Rhials:
+ - bugfix: Goliath Tendril Hammer arm (from the gene brain) is now resistant to being
+ burned off by acid/fire.
+ SyncIt21:
+ - bugfix: MK honk shoes now consume bananium & can clown again
+ - code_imp: material container objects end their attack chain early
+ - bugfix: status & newscaster frame won't drop extra glass sheets upon deconstruction
+ necromanceranne:
+ - balance: Some mind altering effects of heretics (predominantly Path of the Moon
+ heretic abilities) are nullified using...a tinfoil hat. But awareness of the
+ mind altering psychotropic eldritch brain wizards has spread amongst the conspiracy
+ theorists. They could be anyone! Even YOU.
+ - balance: Some additional spells (mindswap, nightmare's terrorize) are also blocked.
+ thegrb93:
+ - bugfix: Fixes oil slimes making vegetable oil instead of corn oil
+ unit0016:
+ - code_imp: Mappers can now opt out of automatically linking their up/down station
+ traits.
From 89ac80e7734b4b53e2babd32156616fef6d158d3 Mon Sep 17 00:00:00 2001
From: Xander3359 <66163761+Xander3359@users.noreply.github.com>
Date: Fri, 8 Nov 2024 21:17:45 -0500
Subject: [PATCH 02/23] fix blade ascension not giving you the ring of blades
(#87744)
## About The Pull Request
fix blade ascension not giving you the ring of blades
## Why It's Good For The Game
Bugfix
Closes https://github.com/tgstation/tgstation/issues/87344
Closes https://github.com/tgstation/tgstation/issues/85635
## Changelog
:cl:
fix: fix blade ascension not giving you the ring of blades
/:cl:
---
code/modules/antagonists/heretic/knowledge/blade_lore.dm | 2 +-
code/modules/antagonists/heretic/magic/furious_steel.dm | 2 +-
code/modules/antagonists/heretic/status_effects/buffs.dm | 7 +++----
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
index c24ed2c273f3c..6cde82e85166c 100644
--- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm
+++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm
@@ -444,7 +444,7 @@
)
ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name)
RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade))
- user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES)
+ user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, /obj/effect/floating_blade, 1 MINUTES)
user.add_stun_absorption(
source = name,
message = span_warning("%EFFECT_OWNER throws off the stun!"),
diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm
index d61ce5d1a3920..9414ca9d7116d 100644
--- a/code/modules/antagonists/heretic/magic/furious_steel.dm
+++ b/code/modules/antagonists/heretic/magic/furious_steel.dm
@@ -19,7 +19,7 @@
active_msg = "You summon forth three blades of furious silver."
deactive_msg = "You conceal the blades of furious silver."
cast_range = 20
- projectile_type = /obj/projectile/floating_blade
+ projectile_type = /obj/effect/floating_blade
projectile_amount = 3
/// A ref to the status effect surrounding our heretic on activation.
diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm
index d82d145b3ef65..4a4083e0ac4c9 100644
--- a/code/modules/antagonists/heretic/status_effects/buffs.dm
+++ b/code/modules/antagonists/heretic/status_effects/buffs.dm
@@ -148,7 +148,7 @@
/// If TRUE, we self-delete our status effect after all the blades are deleted.
var/delete_on_blades_gone = TRUE
/// What blade type to create
- var/blade_type = /obj/effect/floating_blade
+ var/obj/effect/floating_blade/blade_type
/// A list of blade effects orbiting / protecting our owner
var/list/obj/effect/floating_blade/blades = list()
@@ -190,8 +190,7 @@
if(QDELETED(src) || QDELETED(owner))
return
- var/obj/effect/floating_blade/blade
- blade = new blade_type(get_turf(owner))
+ var/obj/effect/floating_blade/blade = new blade_type(get_turf(owner))
blades += blade
blade.orbit(owner, blade_orbit_radius)
RegisterSignal(blade, COMSIG_QDELETING, PROC_REF(remove_blade))
@@ -261,8 +260,8 @@
max_num_blades = 4,
blade_orbit_radius = 20,
time_between_initial_blades = 0.25 SECONDS,
- blade_recharge_time = 1 MINUTES,
blade_type = /obj/effect/floating_blade,
+ blade_recharge_time = 1 MINUTES,
)
src.blade_recharge_time = blade_recharge_time
From 9d46482f2f115d92595c0a432a8171d93b99aff3 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 02:18:06 +0000
Subject: [PATCH 03/23] Automatic changelog for PR #87744 [ci skip]
---
html/changelogs/AutoChangeLog-pr-87744.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-87744.yml
diff --git a/html/changelogs/AutoChangeLog-pr-87744.yml b/html/changelogs/AutoChangeLog-pr-87744.yml
new file mode 100644
index 0000000000000..c3ac14a47e82b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-87744.yml
@@ -0,0 +1,4 @@
+author: "Xander3359"
+delete-after: True
+changes:
+ - bugfix: "fix blade ascension not giving you the ring of blades"
\ No newline at end of file
From dfb5d07b88a093e794898ba4b7a90099eeb7859a Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Sat, 9 Nov 2024 04:07:55 +0100
Subject: [PATCH 04/23] Fixed fishing rod duping with poly belts and shapeshift
spells. (#87706)
## About The Pull Request
It turns out the "shapeshifted from spell" status ejects everything
inside the shapeshifted mob when removed. That's been causing a little
issue with the fishing rod from the profound_fisher component, which a
few mobs have. This PR fixes just that.
## Why It's Good For The Game
## Changelog
:cl:
fix: Fixed fishing rod duping with poly belts and shapeshift spells.
spellcheck: Fixed a small typo when examining fishing rods.
/:cl:
---
code/datums/components/profound_fisher.dm | 29 ++++++++++++++-----
code/modules/fishing/fishing_rod.dm | 2 +-
code/modules/mod/modules/modules_general.dm | 2 +-
.../spell_types/shapeshift/_shape_status.dm | 2 +-
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/code/datums/components/profound_fisher.dm b/code/datums/components/profound_fisher.dm
index 9638af4a8f2c2..cc7e87aeb40af 100644
--- a/code/datums/components/profound_fisher.dm
+++ b/code/datums/components/profound_fisher.dm
@@ -2,15 +2,18 @@
/datum/component/profound_fisher
///the fishing rod this mob will use
var/obj/item/fishing_rod/mob_fisher/our_rod
+ ///Wether we should delete the fishing rod along with the component or replace it if it's somehow removed from the parent
+ var/delete_rod_when_deleted = TRUE
-/datum/component/profound_fisher/Initialize(our_rod)
+/datum/component/profound_fisher/Initialize(our_rod, delete_rod_when_deleted = TRUE)
var/isgloves = istype(parent, /obj/item/clothing/gloves)
if(!isliving(parent) && !isgloves)
return COMPONENT_INCOMPATIBLE
src.our_rod = our_rod || new(parent)
src.our_rod.internal = TRUE
+ src.delete_rod_when_deleted = delete_rod_when_deleted
ADD_TRAIT(src.our_rod, TRAIT_NOT_BARFABLE, REF(src))
- RegisterSignal(src.our_rod, COMSIG_QDELETING, PROC_REF(on_rod_qdel))
+ RegisterSignal(src.our_rod, COMSIG_MOVABLE_MOVED, PROC_REF(on_rod_moved))
if(!isgloves)
RegisterSignal(parent, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(pre_attack))
@@ -37,14 +40,26 @@
examine_list += span_info("When [EXAMINE_HINT("held")] or [EXAMINE_HINT("equipped")], [EXAMINE_HINT("right-click")] with a empty hand to open the integrated fishing rod interface.")
examine_list += span_tinynoticeital("To fish, you need to turn combat mode off.")
-/datum/component/profound_fisher/proc/on_rod_qdel(datum/source)
+///Handles replacing the fishing rod if somehow removed from the parent movable if delete_rod_when_deleted is TRUE, otherwise delete the component.
+/datum/component/profound_fisher/proc/on_rod_moved(datum/source)
SIGNAL_HANDLER
- qdel(src)
+ if(QDELETED(src) || our_rod.loc == parent)
+ return
+ if(delete_rod_when_deleted)
+ UnregisterSignal(our_rod, COMSIG_MOVABLE_MOVED)
+ if(!QDELETED(our_rod))
+ qdel(our_rod)
+ our_rod = new our_rod.type(parent)
+ else
+ qdel(src)
/datum/component/profound_fisher/Destroy()
- our_rod.internal = FALSE
- UnregisterSignal(our_rod, COMSIG_QDELETING)
- REMOVE_TRAIT(our_rod, TRAIT_NOT_BARFABLE, REF(src))
+ UnregisterSignal(our_rod, COMSIG_MOVABLE_MOVED)
+ if(!delete_rod_when_deleted)
+ our_rod.internal = FALSE
+ REMOVE_TRAIT(our_rod, TRAIT_NOT_BARFABLE, REF(src))
+ else if(!QDELETED(our_rod))
+ QDEL_NULL(our_rod)
our_rod = null
return ..()
diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm
index 8b24e34b9e541..4bd045616b3e8 100644
--- a/code/modules/fishing/fishing_rod.dm
+++ b/code/modules/fishing/fishing_rod.dm
@@ -122,7 +122,7 @@
if(hook)
equipped_stuff += "[icon2html(hook, user)] [hook.name]"
if(bait)
- equipped_stuff += "[icon2html(bait, user)] [bait] as bait."
+ equipped_stuff += "[icon2html(bait, user)] [bait]"
if(length(equipped_stuff))
. += span_notice("It has \a [english_list(equipped_stuff)] equipped.")
if(!bait)
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 14fc328aed7f0..42e4c56f55ec1 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -985,7 +985,7 @@
return
gloves.AddComponent(/datum/component/adjust_fishing_difficulty, 5)
if(equipped)
- gloves.AddComponent(/datum/component/profound_fisher, equipped)
+ gloves.AddComponent(/datum/component/profound_fisher, equipped, delete_rod_when_deleted = FALSE)
/obj/item/mod/module/fishing_glove/on_part_deactivation(deleting = FALSE)
var/obj/item/gloves = mod.get_part_from_slot(ITEM_SLOT_GLOVES)
diff --git a/code/modules/spells/spell_types/shapeshift/_shape_status.dm b/code/modules/spells/spell_types/shapeshift/_shape_status.dm
index 2f8d53eeac203..f8f44817a5932 100644
--- a/code/modules/spells/spell_types/shapeshift/_shape_status.dm
+++ b/code/modules/spells/spell_types/shapeshift/_shape_status.dm
@@ -194,7 +194,7 @@
if(owner?.contents)
// Prevent round removal and consuming stuff when losing shapeshift
for(var/atom/movable/thing as anything in owner.contents)
- if(thing == caster_mob)
+ if(thing == caster_mob || HAS_TRAIT(thing, TRAIT_NOT_BARFABLE))
continue
thing.forceMove(get_turf(owner))
From c4276cf81d55ce2fc4d06ccbcc823207a048bd30 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 03:08:16 +0000
Subject: [PATCH 05/23] Automatic changelog for PR #87706 [ci skip]
---
html/changelogs/AutoChangeLog-pr-87706.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-87706.yml
diff --git a/html/changelogs/AutoChangeLog-pr-87706.yml b/html/changelogs/AutoChangeLog-pr-87706.yml
new file mode 100644
index 0000000000000..0265c8918a5c8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-87706.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed fishing rod duping with poly belts and shapeshift spells."
+ - spellcheck: "Fixed a small typo when examining fishing rods."
\ No newline at end of file
From f8ef0319d3940a6db6ca99723f2e302e8887dc53 Mon Sep 17 00:00:00 2001
From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Date: Sat, 9 Nov 2024 14:17:07 +0530
Subject: [PATCH 06/23] Chem master validates selected container in UI (#87780)
---
.../reagents/chemistry/machinery/chem_master.dm | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 87ba535a149c6..2aac6a457abfd 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -393,7 +393,6 @@
. = TRUE
if(. && !QDELETED(src)) //transferring volatile reagents can cause a explosion & destory us
update_appearance(UPDATE_OVERLAYS)
- return .
/obj/machinery/chem_master/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
. = ..()
@@ -447,9 +446,22 @@
if("selectContainer")
var/obj/item/reagent_containers/target = locate(params["ref"])
+
+ //is this even a valid type path
if(!ispath(target))
return FALSE
+ //are we printing a valid container
+ var/container_found = FALSE
+ for(var/category in printable_containers)
+ for(var/obj/item/reagent_containers/container as anything in printable_containers[category])
+ if(target == container)
+ container_found = TRUE
+ break
+ if(!container_found)
+ return FALSE
+
+ //set the container
selected_container = target
return TRUE
From 18a1148db5a32620f27c0bc0d46034a0c083b535 Mon Sep 17 00:00:00 2001
From: "tgstation-ci[bot]"
<179393467+tgstation-ci[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 08:47:27 +0000
Subject: [PATCH 07/23] Automatic changelog for PR #87780 [ci skip]
---
html/changelogs/AutoChangeLog-pr-87780.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-87780.yml
diff --git a/html/changelogs/AutoChangeLog-pr-87780.yml b/html/changelogs/AutoChangeLog-pr-87780.yml
new file mode 100644
index 0000000000000..159c49658736a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-87780.yml
@@ -0,0 +1,4 @@
+author: "SyncIt21"
+delete-after: True
+changes:
+ - bugfix: "chem master validates selected container in UI so no more href exploits"
\ No newline at end of file
From 263a6937ed50451842d8a831a599f29e01bdc710 Mon Sep 17 00:00:00 2001
From: harryob
Date: Sat, 9 Nov 2024 10:06:30 +0000
Subject: [PATCH 08/23] fixes missing icons in abductor console (#87759)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## About The Pull Request
grabs the icon for the item correctly. also typescripts the interface
because blessed type safety would've prevented it being missing in the
first place. and clears some random deprecations
## Why It's Good For The Game
pretty icons 👍
loading icons 👎
## Changelog
:cl:
fix: the abductor console now correctly loads images of equipment
/:cl:
closes #87565
---
.../antagonists/abductor/machinery/console.dm | 9 +++
...bductorConsole.jsx => AbductorConsole.tsx} | 62 +++++++++++++------
2 files changed, 53 insertions(+), 18 deletions(-)
rename tgui/packages/tgui/interfaces/{AbductorConsole.jsx => AbductorConsole.tsx} (74%)
diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm
index 3dcdaf5a5b07e..4c5a30c0d9e27 100644
--- a/code/modules/antagonists/abductor/machinery/console.dm
+++ b/code/modules/antagonists/abductor/machinery/console.dm
@@ -94,10 +94,19 @@
"items" = (category == selected_cat ? list() : null))
for(var/gear in possible_gear[category])
var/datum/abductor_gear/AG = possible_gear[category][gear]
+
+ var/atom/gear_path
+ if(!length(AG.build_path))
+ continue
+
+ gear_path = AG.build_path[1]
+
cat["items"] += list(list(
"name" = AG.name,
"cost" = AG.cost,
"desc" = AG.description,
+ "icon" = gear_path::icon,
+ "icon_state" = gear_path::icon_state,
))
data["categories"] += list(cat)
return data
diff --git a/tgui/packages/tgui/interfaces/AbductorConsole.jsx b/tgui/packages/tgui/interfaces/AbductorConsole.tsx
similarity index 74%
rename from tgui/packages/tgui/interfaces/AbductorConsole.jsx
rename to tgui/packages/tgui/interfaces/AbductorConsole.tsx
index bb2f1dffccfe3..d8d3305362725 100644
--- a/tgui/packages/tgui/interfaces/AbductorConsole.jsx
+++ b/tgui/packages/tgui/interfaces/AbductorConsole.tsx
@@ -5,10 +5,33 @@ import {
Section,
Tabs,
} from 'tgui-core/components';
+import { BooleanLike } from 'tgui-core/react';
import { useBackend, useSharedState } from '../backend';
import { Window } from '../layouts';
-import { GenericUplink } from './Uplink/GenericUplink';
+import { GenericUplink, Item } from './Uplink/GenericUplink';
+
+type AbductorConsoleData = {
+ categories: { name: string; items: ConsoleItem[] }[];
+
+ compactMode: BooleanLike;
+ experiment: BooleanLike;
+ points?: number;
+ credits?: number;
+ pad: BooleanLike;
+ gizmo: BooleanLike;
+ vest: BooleanLike;
+ vest_mode?: number;
+ vest_lock?: BooleanLike;
+};
+
+type ConsoleItem = {
+ name: string;
+ cost: number;
+ desc: string;
+ icon: string;
+ icon_state: string;
+};
export const AbductorConsole = (props) => {
const [tab, setTab] = useSharedState('tab', 1);
@@ -47,15 +70,15 @@ export const AbductorConsole = (props) => {
};
const Abductsoft = (props) => {
- const { act, data } = useBackend();
+ const { act, data } = useBackend();
const { experiment, points, credits, categories } = data;
if (!experiment) {
return No Experiment Machine Detected;
}
- const categoriesList = [];
- const items = [];
+ const categoriesList: string[] = [];
+ const items: Item[] = [];
for (let i = 0; i < categories.length; i++) {
const category = categories[i];
categoriesList.push(category.name);
@@ -67,7 +90,9 @@ const Abductsoft = (props) => {
category: category.name,
cost: `${item.cost} Credits`,
desc: item.desc,
- disabled: credits < item.cost,
+ disabled: (credits || 0) < item.cost,
+ icon: item.icon,
+ icon_state: item.icon_state,
});
}
}
@@ -92,7 +117,7 @@ const Abductsoft = (props) => {
};
const EmergencyTeleporter = (props) => {
- const { act, data } = useBackend();
+ const { act, data } = useBackend();
const { pad, gizmo } = data;
if (!pad) {
@@ -115,10 +140,11 @@ const EmergencyTeleporter = (props) => {
@@ -126,7 +152,7 @@ const EmergencyTeleporter = (props) => {
};
const VestSettings = (props) => {
- const { act, data } = useBackend();
+ const { act, data } = useBackend();
const { vest, vest_mode, vest_lock } = data;
if (!vest) {
@@ -139,25 +165,25 @@ const VestSettings = (props) => {
buttons={
}
>
-
From a85b48fdd4934650ff55fbe16f94598425279ca8 Mon Sep 17 00:00:00 2001
From: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Date: Sat, 9 Nov 2024 15:37:20 +0530
Subject: [PATCH 09/23] Add unit test tag to your PR title (#87757)
## About The Pull Request
You can now add `unit test` anywhere in your PR title to specify if you
are adding/modifying unit tests for your code. It's worth 6 GBP (It
Always has and wasn't changed here)
For when you want some extra GBP for your unit tests that sometimes go
un-noticed by maintainer's when reviewing large changes. It will
encourage people to write unit tests so they can get the extra points
## Changelog
N/A
/:cl:
---
tools/WebhookProcessor/github_webhook_processor.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index c3eb190aeaab0..24e9f502167d8 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -260,6 +260,8 @@ function tag_pr($payload, $opened) {
$tags[] = 'Revert';
if(strpos(strtolower($title), 'removes') !== FALSE)
$tags[] = 'Removal';
+ if(strpos(strtolower($title), 'unit test') !== FALSE)
+ $tags[] = 'Unit Tests';
}
$remove = array('Test Merge Candidate');
From 138c7b378c96d4ed2772df0e61553f3e1166a0ee Mon Sep 17 00:00:00 2001
From: Tim
Date: Sat, 9 Nov 2024 04:07:36 -0600
Subject: [PATCH 10/23] Add `TRAIT_EVIL` to admin tooling (#87749)
## About The Pull Request
Let's admins add/remove `TRAIT_EVIL` from mobs.
## Why It's Good For The Game
Useful for debugging.
## Changelog
:cl:
admin: Admins can now add/remove TRAIT_EVIL from mobs.
/:cl:
---
code/_globalvars/traits/admin_tooling.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/_globalvars/traits/admin_tooling.dm b/code/_globalvars/traits/admin_tooling.dm
index 9d1b47800b85c..7b7ca780a5409 100644
--- a/code/_globalvars/traits/admin_tooling.dm
+++ b/code/_globalvars/traits/admin_tooling.dm
@@ -100,6 +100,7 @@ GLOBAL_LIST_INIT(admin_visible_traits, list(
"TRAIT_EXPANDED_FOV" = TRAIT_EXPANDED_FOV,
"TRAIT_EXPERT_FISHER" = TRAIT_EXPERT_FISHER,
"TRAIT_EXTROVERT" = TRAIT_EXTROVERT,
+ "TRAIT_EVIL" = TRAIT_EVIL,
"TRAIT_FAKEDEATH" = TRAIT_FAKEDEATH,
"TRAIT_FASTMED" = TRAIT_FASTMED,
"TRAIT_FAST_CUFFING" = TRAIT_FAST_CUFFING,
From 8621c7a9c24b3682bab9c569f588244f86e836ca Mon Sep 17 00:00:00 2001
From: Lucy
Date: Sat, 9 Nov 2024 05:07:58 -0500
Subject: [PATCH 11/23] Use native BYOND `isnan` and `isinf` for math defines
(#87748)
## About The Pull Request
`// Remove these once we have Byond implementation.`
Well guess what we have now?
Altho sadly we still lack a native `isfinite`, so we still use a define
for that.
## Why It's Good For The Game
Native BYOND impls have better performance usually, due to them
compiling down to instructions, avoiding proc overhead.
## Changelog
No user-facing changes.
---
code/__DEFINES/maths.dm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm
index a7a95817b4405..aa13298e339a3 100644
--- a/code/__DEFINES/maths.dm
+++ b/code/__DEFINES/maths.dm
@@ -1,14 +1,5 @@
-// Remove these once we have Byond implementation.
-// ------------------------------------
-#define IS_NAN(a) (a != a)
-
-#define IS_INF__UNSAFE(a) (a == a && a-a != a-a)
-#define IS_INF(a) (isnum(a) && IS_INF__UNSAFE(a))
-
-#define IS_FINITE__UNSAFE(a) (a-a == a-a)
+#define IS_FINITE__UNSAFE(a) (!isinf(a) && !isnan(a))
#define IS_FINITE(a) (isnum(a) && IS_FINITE__UNSAFE(a))
-// ------------------------------------
-// Aight dont remove the rest
// Credits to Nickr5 for the useful procs I've taken from his library resource.
// This file is quadruple wrapped for your pleasure
From 4cede34a4911096aa57f88473a5e23b0ec9b8cb6 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Sat, 9 Nov 2024 11:08:51 +0100
Subject: [PATCH 12/23] [NO GBP] Fixes wings and jetpacks sometimes preventing
you from opening doors (#87741)
## About The Pull Request
I hate this timeline. What title says, makes jetpacks and wings allow
you to bump into things you're moving into.
## Why It's Good For The Game
This feels awful and requires you to stop pressing movement keys for a
moment before resuming movement to get out of the "stuck" state
## Changelog
:cl:
fix: Fixed wings and jetpacks sometimes preventing you from opening
doors
/:cl:
---
code/datums/components/jetpack.dm | 6 ++++++
.../surgery/organs/external/wings/functional_wings.dm | 2 +-
code/modules/surgery/organs/external/wings/moth_wings.dm | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm
index ccbe2b3fd4dac..fd49aa2b67b6a 100644
--- a/code/datums/components/jetpack.dm
+++ b/code/datums/components/jetpack.dm
@@ -164,6 +164,12 @@
/datum/component/jetpack/proc/on_pushoff(mob/source, movement_dir, continuous_move, atom/backup)
SIGNAL_HANDLER
+ if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
+ return
+
+ if (!source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
+ return
+
if (!should_trigger(source) || !check_on_move.Invoke(FALSE))
return
diff --git a/code/modules/surgery/organs/external/wings/functional_wings.dm b/code/modules/surgery/organs/external/wings/functional_wings.dm
index 63759761548d9..f773630f8bf1d 100644
--- a/code/modules/surgery/organs/external/wings/functional_wings.dm
+++ b/code/modules/surgery/organs/external/wings/functional_wings.dm
@@ -145,7 +145,7 @@
if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
return
- if (!can_fly(source) || !source.client.intended_direction)
+ if (!can_fly(source) || !source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
return
return COMPONENT_PREVENT_SPACEMOVE_HALT
diff --git a/code/modules/surgery/organs/external/wings/moth_wings.dm b/code/modules/surgery/organs/external/wings/moth_wings.dm
index 2753c88f2c478..265a9ee751226 100644
--- a/code/modules/surgery/organs/external/wings/moth_wings.dm
+++ b/code/modules/surgery/organs/external/wings/moth_wings.dm
@@ -82,7 +82,7 @@
if (get_dir(source, backup) == movement_dir || source.loc == backup.loc)
return
- if (!allow_flight() || !source.client.intended_direction)
+ if (!allow_flight() || !source.client.intended_direction || (source.client.intended_direction & get_dir(source, backup)))
return
return COMPONENT_PREVENT_SPACEMOVE_HALT
From d990e4244e75b066a6404074ea32b7b2a31ca69b Mon Sep 17 00:00:00 2001
From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com>
Date: Sat, 9 Nov 2024 03:10:28 -0700
Subject: [PATCH 13/23] Drinking Glass sprite updates (#87756)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## About The Pull Request
This was meant to be just fixing the missing pixel... then it turned to
redoing all the glasses in all the basic sprites so they'd match... then
redoing sprites that were outdated...
And THEN I realized that drinking glasses can be using the same
auto-sprite system beakers have and oh man it's spiraling.
As for the (hopefully) full list of changes:
- Removes all `glass_[color]` icons. Any drink that fell under these
will now use the fill_icon and their reagent color. As such, a lot of
reagent colors have been tweaked for readability/realism/lemons don't
have red juice what the hell man
(Some colors shown are outdated. It is very annoying to tweak these. I
don't know how to in-game, if I even can. Relaunching several times is
painful.)
- Resprites the base `glass_empty`; now it is very visibly empty. The
overlay being slightly transparent actually works pretty well with this.
(Old / New)
- Full resprite of Curaçao (now it's actually its beautiful blue instead
of gray)
- Minor resprites Beer/Green Beer/Iced Beer/Ale
(Yes, Beer/Green Beer have little animated bubbles)
- Minor resprite of Monkey Energy
(It's animated now too but otherwise about the same sprite)
- Minor resprites to Pina Olivida, Banana Juice, Lemon Juice, Carrot
Juice - mostly just color tweaks so that they look more believable and
the banana juice is less green
- Fixes small nits in the sodas so that they are all consistent
## Why It's Good For The Game
Sprite maintenance and (hopefully) improvements - we've got a lot of
drinks in the Bars and the base foundation of that whole system deserves
a bit of love as well
## Changelog
:cl:
image: redid most basic drinking glass sprites, and moved several drinks
to use the same color system as beakers. Please bug report any incorrect
colored drinks or juices!
/:cl:
---
.../reagents/drinks/alcohol_reagents.dm | 10 +++---
.../reagents/drinks/drink_reagents.dm | 32 +++++++++---------
.../reagents/drinks/glass_styles/alcohol.dm | 4 +--
.../drinks/glass_styles/coffee_tea.dm | 2 --
.../reagents/drinks/glass_styles/dairy.dm | 4 ---
.../reagents/drinks/glass_styles/juices.dm | 14 --------
.../drinks/glass_styles/mixed_alcohol.dm | 8 -----
.../chemistry/reagents/other_reagents.dm | 1 -
icons/obj/drinks/drinks.dmi | Bin 25921 -> 24901 bytes
icons/obj/medical/reagent_fillings.dmi | Bin 7795 -> 9258 bytes
10 files changed, 22 insertions(+), 53 deletions(-)
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 58bacc57bcfd3..7866b2eb37f14 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -109,7 +109,7 @@
/datum/reagent/consumable/ethanol/beer
name = "Beer"
description = "An alcoholic beverage brewed since ancient times on Old Earth. Still popular today."
- color = "#664300" // rgb: 102, 67, 0
+ color = "#D7BC31" // rgb: 215, 188, 49
nutriment_factor = 1
boozepwr = 25
taste_description = "mild carbonated malt"
@@ -1531,7 +1531,7 @@
/datum/reagent/consumable/ethanol/eggnog
name = "Eggnog"
description = "For enjoying the most wonderful time of the year."
- color = "#fcfdc6" // rgb: 252, 253, 198
+ color = "#ffe2ad" // rgb: 255, 226, 173
nutriment_factor = 2
boozepwr = 1
quality = DRINK_VERYGOOD
@@ -1541,7 +1541,7 @@
/datum/reagent/consumable/ethanol/dreadnog
name = "Dreadnog"
description = "For suffering during a period of joy."
- color = "#abb862" // rgb: 252, 253, 198
+ color = "#f7ffad" // rgb: 247, 255, 173
nutriment_factor = 3 * REAGENTS_METABOLISM
boozepwr = 1
quality = DRINK_REVOLTING
@@ -1573,7 +1573,7 @@
/datum/reagent/consumable/ethanol/creme_de_menthe
name = "Creme de Menthe"
description = "A minty liqueur excellent for refreshing, cool drinks."
- color = "#00cc00"
+ color = "#467446" //rgb: 70, 116, 70
boozepwr = 20
taste_description = "a minty, cool, and invigorating splash of cold streamwater"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1581,7 +1581,7 @@
/datum/reagent/consumable/ethanol/creme_de_cacao
name = "Creme de Cacao"
description = "A chocolatey liqueur excellent for adding dessert notes to beverages and bribing sororities."
- color = "#996633"
+ color = "#350900" // rgb: 53, 9, 0
boozepwr = 20
taste_description = "a slick and aromatic hint of chocolates swirling in a bite of alcohol"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
diff --git a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
index 09da70baa16e7..05a2c984287b3 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/drink_reagents.dm
@@ -30,7 +30,7 @@
/datum/reagent/consumable/limejuice
name = "Lime Juice"
description = "The sweet-sour juice of limes."
- color = "#365E30" // rgb: 54, 94, 48
+ color = "#a6f19a" // rgb: 166, 241, 154
taste_description = "unbearable sourness"
ph = 2.2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -73,14 +73,14 @@
/datum/reagent/consumable/applejuice
name = "Apple Juice"
description = "The sweet juice of an apple, fit for all ages."
- color = "#ECFF56" // rgb: 236, 255, 86
+ color = "#fff06b" // rgb: 255, 240, 107
taste_description = "apples"
ph = 3.2 // ~ 2.7 -> 3.7
/datum/reagent/consumable/poisonberryjuice
name = "Poison Berry Juice"
description = "A tasty juice blended from various kinds of very deadly and toxic berries."
- color = "#863353" // rgb: 134, 51, 83
+ color = "#792b49" // rgb: 121, 43, 73
taste_description = "berries"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -92,14 +92,14 @@
/datum/reagent/consumable/watermelonjuice
name = "Watermelon Juice"
description = "Delicious juice made from watermelon."
- color = "#863333" // rgb: 134, 51, 51
+ color = "#af5e5e" // rgb: 175, 94, 94
taste_description = "juicy watermelon"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/lemonjuice
name = "Lemon Juice"
description = "This juice is VERY sour."
- color = "#863333" // rgb: 175, 175, 0
+ color = "#ebeb9e" // rgb: 235, 235, 158
taste_description = "sourness"
ph = 2
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -107,7 +107,7 @@
/datum/reagent/consumable/banana
name = "Banana Juice"
description = "The raw essence of a banana. HONK"
- color = "#863333" // rgb: 175, 175, 0
+ color = "#FFFCB9" // rgb: 255, 252, 185
taste_description = "banana"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -167,7 +167,7 @@
name = "Potato Juice"
description = "Juice of the potato. Bleh."
nutriment_factor = 2
- color = "#302000" // rgb: 48, 32, 0
+ color = "#E8A856" // rgb: 234, 157, 58
taste_description = "irish sadness"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -175,7 +175,7 @@
name = "Pickle Juice"
description = "More accurately, this is the brine the pickle was floating in"
nutriment_factor = 2
- color = "#302000" // rgb: 48, 32, 0
+ color = "#cde65e" // rgb: 205, 230, 94
taste_description = "vinegar brine"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -362,7 +362,7 @@
/datum/reagent/consumable/icecoffee
name = "Iced Coffee"
description = "Coffee and ice, refreshing and cool."
- color = "#102838" // rgb: 16, 40, 56
+ color = "#462b15" // rgb: 70, 43, 21
nutriment_factor = 0
overdose_threshold = 80
taste_description = "bitter coldness"
@@ -383,7 +383,7 @@
/datum/reagent/consumable/hot_ice_coffee
name = "Hot Ice Coffee"
description = "Coffee with pulsing ice shards"
- color = "#102838" // rgb: 16, 40, 56
+ color = "#462b15" // rgb: 70, 43, 21
nutriment_factor = 0
overdose_threshold = 80
taste_description = "bitter coldness and a hint of smoke"
@@ -950,7 +950,7 @@
name = "Hot Coco"
description = "Made with love! And coco beans."
nutriment_factor = 4
- color = "#403010" // rgb: 64, 48, 16
+ color = "#3b240e" // rgb: 59, 36, 14
taste_description = "creamy chocolate"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1095,7 +1095,7 @@
/datum/reagent/consumable/aloejuice
name = "Aloe Juice"
- color = "#A3C48B"
+ color = "#b3c5a7" // rgb: 179, 197, 167
description = "A healthy and refreshing juice."
taste_description = "vegetable"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1139,7 +1139,7 @@
/datum/reagent/consumable/toechtauese_juice
name = "Töchtaüse Juice"
description = "An unpleasant juice made from töchtaüse berries. Best made into a syrup, unless you enjoy pain."
- color = "#554862"
+ color = "#554862" // rgb: 85, 72, 98
nutriment_factor = 0
taste_description = "fiery itchy pain"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1147,7 +1147,7 @@
/datum/reagent/consumable/toechtauese_syrup
name = "Töchtaüse Syrup"
description = "A harsh spicy and bitter syrup, made from töchtaüse berries. Useful as an ingredient, both for food and cocktails."
- color = "#554862"
+ color = "#554862" // rgb: 85, 72, 98
nutriment_factor = 0
taste_description = "sugar, spice, and nothing nice"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
@@ -1203,14 +1203,14 @@
/datum/reagent/consumable/cucumberjuice
name = "Cucumber Juice"
description = "Ordinary cucumber juice, nothing from the fantasy world."
- color = "#6cd87a"
+ color = "#B1D861" // rgb: 177, 216, 97
taste_description = "light cucumber"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
/datum/reagent/consumable/cucumberlemonade
name = "Cucumber Lemonade"
description = "Cucumber juice, sugar, and soda; what else do I need?"
- color = "#6cd87a"
+ color = "#cbe248" // rgb: 203, 226, 72
quality = DRINK_GOOD
taste_description = "citrus soda with cucumber"
chemical_flags = REAGENT_CAN_BE_SYNTHESIZED
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm
index 5811f49da8f21..564f081601dc3 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/alcohol.dm
@@ -95,6 +95,7 @@
name = "glass of amaretto"
desc = "A sweet and syrupy looking drink."
icon_state = "amarettoglass"
+
/datum/glass_style/drinking_glass/cognac
required_drink_type = /datum/reagent/consumable/ethanol/cognac
name = "glass of cognac"
@@ -155,7 +156,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/pruno
name = "glass of pruno"
desc = "Fermented prison wine made from fruit, sugar, and despair. Security loves to confiscate this, which is the only kind thing Security has ever done."
- icon_state = "glass_orange"
/datum/glass_style/drinking_glass/navy_rum
required_drink_type = /datum/reagent/consumable/ethanol/navy_rum
@@ -187,7 +187,6 @@
name = "glass of yūyake"
desc = "It's the saccharine essence of the 70s in a glass... the 1970s, that is!"
icon = 'icons/obj/drinks/drinks.dmi'
- icon_state = "glass_red"
/datum/glass_style/drinking_glass/shochu
required_drink_type = /datum/reagent/consumable/ethanol/shochu
@@ -255,7 +254,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/hooch
name = "Hooch"
desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- icon_state = "glass_brown2"
/datum/glass_style/shot_glass/goldschlager
required_drink_type = /datum/reagent/consumable/ethanol/goldschlager
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm
index 36a8877b82018..938a3753dd3b4 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/coffee_tea.dm
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/coffee
name = "glass of coffee"
desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
- icon_state = "glass_brown"
/datum/glass_style/drinking_glass/tea
required_drink_type = /datum/reagent/consumable/tea
@@ -58,7 +57,6 @@
required_drink_type = /datum/reagent/consumable/hot_coco
name = "glass of hot coco"
desc = "A favorite winter drink to warm you up."
- icon_state = "chocolateglass"
drink_type = SUGAR | DAIRY
/datum/glass_style/drinking_glass/italian_coco
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm
index e788a589ad125..139f8a85929da 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/dairy.dm
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/milk
name = "glass of milk"
desc = "White and nutritious goodness!"
- icon_state = "glass_white"
drink_type = DAIRY | BREAKFAST
/datum/glass_style/has_foodtype/juicebox/milk
@@ -25,17 +24,14 @@
required_drink_type = /datum/reagent/consumable/soymilk
name = "glass of soy milk"
desc = "White and nutritious soy goodness!"
- icon_state = "glass_white"
/datum/glass_style/drinking_glass/cream
required_drink_type = /datum/reagent/consumable/cream
name = "glass of cream"
desc = "Ewwww..."
- icon_state = "glass_white"
/datum/glass_style/drinking_glass/coconut_milk
required_drink_type = /datum/reagent/consumable/coconut_milk
name = "glass of coconut milk"
desc = "The essence of the tropics, contained safely within a glass."
icon = 'icons/obj/drinks/drinks.dmi'
- icon_state = "glass_white"
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm
index 6f837d8f51587..e7ecfa331faba 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/juices.dm
@@ -4,7 +4,6 @@
required_drink_type = /datum/reagent/consumable/orangejuice
name = "glass of orange juice"
desc = "Vitamins! Yay!"
- icon_state = "glass_orange"
drink_type = FRUIT | BREAKFAST
/datum/glass_style/has_foodtype/juicebox/orangejuice
@@ -62,13 +61,11 @@
required_drink_type = /datum/reagent/consumable/tomatojuice
name = "glass of tomato juice"
desc = "Are you sure this is tomato juice?"
- icon_state = "glass_red"
/datum/glass_style/drinking_glass/limejuice
required_drink_type = /datum/reagent/consumable/limejuice
name = "glass of lime juice"
desc = "A glass of sweet-sour lime juice."
- icon_state = "glass_green"
/datum/glass_style/drinking_glass/carrotjuice
required_drink_type = /datum/reagent/consumable/carrotjuice
@@ -80,19 +77,16 @@
required_drink_type = /datum/reagent/consumable/berryjuice
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's jam. Who cares?"
- icon_state = "berryjuice"
/datum/glass_style/drinking_glass/poisonberryjuice
required_drink_type = /datum/reagent/consumable/poisonberryjuice
name = "glass of berry juice"
desc = "Berry juice. Or maybe it's poison. Who cares?"
- icon_state = "poisonberryjuice"
/datum/glass_style/drinking_glass/watermelonjuice
required_drink_type = /datum/reagent/consumable/watermelonjuice
name = "glass of watermelon juice"
desc = "A glass of watermelon juice."
- icon_state = "glass_red"
/datum/glass_style/drinking_glass/lemonjuice
required_drink_type = /datum/reagent/consumable/lemonjuice
@@ -116,43 +110,36 @@
required_drink_type = /datum/reagent/consumable/potato_juice
name = "glass of potato juice"
desc = "Bleh..."
- icon_state = "glass_brown"
/datum/glass_style/drinking_glass/bungojuice
required_drink_type = /datum/reagent/consumable/bungojuice
name = "glass of bungo juice"
desc = "Exotic! You feel like you are on vacation already."
- icon_state = "glass_yellow"
/datum/glass_style/drinking_glass/prunomix
required_drink_type = /datum/reagent/consumable/prunomix
name = "glass of pruno mixture"
desc = "Fruit, sugar, yeast, and water pulped together into a pungent slurry."
- icon_state = "glass_orange"
/datum/glass_style/drinking_glass/aloejuice
required_drink_type = /datum/reagent/consumable/aloejuice
name = "glass of aloe juice"
desc = "A healthy and refreshing juice."
- icon_state = "glass_yellow"
/datum/glass_style/drinking_glass/toechtauese_juice
required_drink_type = /datum/reagent/consumable/toechtauese_juice
name = "glass of töchtaüse juice"
desc = "Raw, unadulterated töchtaüse juice. One swig will fill you with regrets."
- icon_state = "toechtauese_syrup"
/datum/glass_style/drinking_glass/toechtauese_syrup
required_drink_type = /datum/reagent/consumable/toechtauese_syrup
name = "glass of töchtaüse syrup"
desc = "Not for drinking on its own."
- icon_state = "toechtauese_syrup"
/datum/glass_style/drinking_glass/cucumberjuice
required_drink_type = /datum/reagent/consumable/cucumberjuice
name = "glass of cucumber juice"
desc = "A glass of cucumber juice."
- icon_state = "glass_cucumber"
// Effectively misc
@@ -161,7 +148,6 @@
required_drink_type = /datum/reagent/consumable/menthol
name = "glass of menthol"
desc = "Tastes naturally minty, and imparts a very mild numbing sensation."
- icon_state = "glass_green"
/datum/glass_style/drinking_glass/grenadine
required_drink_type = /datum/reagent/consumable/grenadine
diff --git a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm
index 67802b9af20c4..ee741191771d7 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/glass_styles/mixed_alcohol.dm
@@ -2,7 +2,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/bilk
name = "glass of bilk"
desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
- icon_state = "glass_brown"
/datum/glass_style/drinking_glass/threemileisland
required_drink_type = /datum/reagent/consumable/ethanol/threemileisland
@@ -400,7 +399,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/bacchus_blessing
name = "Bacchus' Blessing"
desc = "You didn't think it was possible for a liquid to be so utterly revolting. Are you sure about this...?"
- icon_state = "glass_brown2"
/datum/glass_style/drinking_glass/atomicbomb
required_drink_type = /datum/reagent/consumable/ethanol/atomicbomb
@@ -434,7 +432,6 @@
required_drink_type = /datum/reagent/consumable/ethanol/eggnog
name = "eggnog"
desc = "For enjoying the most wonderful time of the year."
- icon_state = "glass_yellow"
drink_type = FRUIT
/datum/glass_style/has_foodtype/juicebox/eggnog
@@ -461,25 +458,21 @@
required_drink_type = /datum/reagent/consumable/ethanol/triple_sec
name = "Triple Sec"
desc = "A glass of straight Triple Sec."
- icon_state = "glass_orange"
/datum/glass_style/drinking_glass/creme_de_menthe
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_menthe
name = "Creme de Menthe"
desc = "You can almost feel the first breath of spring just looking at it."
- icon_state = "glass_green"
/datum/glass_style/drinking_glass/creme_de_cacao
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_cacao
name = "Creme de Cacao"
desc = "A million hazing lawsuits and alcohol poisonings have started with this humble ingredient."
- icon_state = "glass_brown"
/datum/glass_style/drinking_glass/creme_de_coconut
required_drink_type = /datum/reagent/consumable/ethanol/creme_de_coconut
name = "Creme de Coconut"
desc = "An unintimidating glass of coconut liqueur."
- icon_state = "glass_white"
/datum/glass_style/drinking_glass/quadruple_sec
required_drink_type = /datum/reagent/consumable/ethanol/quadruple_sec
@@ -787,7 +780,6 @@
/datum/glass_style/drinking_glass/mushi_kombucha
required_drink_type = /datum/reagent/consumable/ethanol/mushi_kombucha
name = "glass of mushi kombucha"
- icon_state = "glass_orange"
/datum/glass_style/drinking_glass/triumphal_arch
required_drink_type = /datum/reagent/consumable/ethanol/triumphal_arch
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index e434161b03d70..2941e5ecd7d08 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -17,7 +17,6 @@
required_drink_type = /datum/reagent/blood
name = "glass of tomato juice"
desc = "Are you sure this is tomato juice?"
- icon_state = "glass_red"
// FEED ME
/datum/reagent/blood/on_hydroponics_apply(obj/machinery/hydroponics/mytray, mob/user)
diff --git a/icons/obj/drinks/drinks.dmi b/icons/obj/drinks/drinks.dmi
index 4b966cb2db27568b97488286f19a2149b9ca09c7..5566cb09b2fb9a4f7fc72f8880945a84f62f8e94 100644
GIT binary patch
literal 24901
zcmb@u2UJtv_Aa_Z??FXCTEGS>MO1nTMF9l`MT)ebsDSh)Jqbut1gs!Z0)nC-O^^?UvjSLbweRp4mASh*&(Yl
zXE%x864-8gp!HE2Gp+BAUA&R3%$h^qQPXG&eHWA7FVXXSb8fZ?85=xGE+hH-^jcdX
zatSvtUR{Z+i+%Gjg^Uu?(+~fqaThvE;eqG^2)r;$U
zt@Q!NQ*2Y~7$w-BI#U-abuNr!2%W*g{R5Nr|@2OK+&cnFf?8)@tb{>X|i>G@+
z`Gwmgbrd)kbru6p1l%4iuel(&?jPE9aWN$HJLBG!v{L1I?1L4hySyUa>2X!jG9kJ$
z&hDSyZkW-oTS;fxNC7lr@4@!+y`8p-vO70Zvv_mt9^mCOFkDc#jPga_|(
z`@^v33J-mi8$!p0R+}fnl%F2wS18lvyw$dOTImi`Msfl?xfG99Hc2dCw;=I!LWItb&Dl84Pk#LVM$
zM~k@v+3L>YUD9nU@0S=ErR29Bd$cYyaN)3}?KKhWIQE01{rUWsR+m3gHuv2A)iFwlxW?a@kA@T
zx~3&fRxP&zRhC=Gh0Xn?lABKfTYoa>+9Yg-6^nGIr2rcj@i<
zf~obvU_q&R-q#I>-j^b(M~rLG!=-Xr>wO$MHrN
zJtw_4jSX3yN792|J{+e!ZDzt!(NZy$6PF4b
z2&F<%V(`6Im=5L5mmAoL!p^iI*lnOS3<}Hu1*Uu|m|K;H8*#luecrdK;&fSB!=X=f
zS)MjzJ=ke^Sfb|9Y(f{ueHgx{GCWFIk@aA;vSFAJhwpvg$ujU^^GQ8IS<&8V;E6Q4
zT)-^GiXn`RPy7gn0{3T{7_50uJ;wxGbMV+bi*53#N4;i0CHEo%3KTC>h9p-HeR;as
z3I&8+T%+=T(54{=&#aSH-JAIoA)pQz;gujBaT5Gxmxjqtt#;Q=%Rb<@5E6g!?tt);INayOjd=84T
ze%|_CaXK5F6VrIijMYc>v@|lyD^u>Yw3w}>ffZeH$4lCnl=khWnm<(cHul5ZI*Yja
zq3lEQx8WS?+p1S6Y4mytqaJaW!m9G#nR&Mg?=T#gUsL?zTahWoGb?)%)2CvsN-7f1
z`u7#BNhF4kOCzsdG
zC$M#}wX)b>#FOI1dl+~P-|2iN0D^pMP^Bkp6El4rKC!veAJRtdMDODT05NyUv<2q6
zgVXTh4OyG^Y6@gi0xmP9EAz{v(ylw`{`lQFU;EKkBKHMIpQOH@gXO~|*7e&OT{wD<
z+AAz!B|qdg&ot+hi#+LTxfm2cT+e$bVY>2J
zQrWI>#Q|MOp;uicsR!t)pnTsZDpM=wlSp?@aGkK3rN;Pbvjs5SXy??$nDtSNpiwOE
zjmj4}7>gGn1tKgd>?_@iO10(q6FS}QNkTjtjp)->^yn>(s5L=4CNvH|aeg4l!=B66
z1D>IX2G{064%llGa91yO(zAs!0NNF9VLA>+0S-1`g|!r53AYg!MA{KG1Vo-q?ZGte
z0<`b;obn}|aSFwCe`Sr(m19X414aRXN;e)Yf%N|9ms=VvY-sn)@~N?gihYHzQ~shc
z^S$m?U6A`AhJjcWXb_g8206X0>(3#wUb5fArDBNn7Nd(}WV!dRBm5ghkQ-1vt??1*
z0lmzQ<H~D@4gtR6L4!mE~|D{SEV?RWK>126B=(?Z?J^OR{
z)24g04N3#VBmWg-|LYeTcY5*pc0dI-BlP0mYAGQr{|$f*6Bl`ggu;Ue3KvC$eF!N6P`{oh2-D-gWFhB2og=f`y+J^e+=`k%bs|-+U
zV`oO%2UlgI3`MzN1e51cO
zvn9^3h{%#&ySB~{B&7x-cw}6I=>jid`jFPtnup?9mBs_VuosF!%F5PMSmS9R|F+
za4uG#OwVm_9e#8oI}_28KeN|PCMz%F{?8jkR)zD#`jnD?^qHW$@Bd4H1wmI|5`
zGpxbx+GXh=zvByAqG}g~kPHTv=kc
z{<-lI;+k7kKpZo0ug9)7RN}N6liOTSe0>Arma>gJaP3-4rT?z6+tAq3V-aK}xdOIR
zk`g&#`u3zHwIutb^cKN;@$1(?df-@tw_c|K2)v&^3?jN9n;<+sk)vDY1&u{brsa>>
zpYx~2>dS0M*=ER6Z0Sa1C0w!tI}+^s>QdO@!!|CDD+xEIa0sh_JH1Itn2!aiP@pQ2
zc<1L-PuqLH-IiJ5YcC>AF>_X$4Ea3pew1Y~BRc4Zt{ey$XlW93>gf
z=~slyVGG>~zHyGpAf-70^!o&FcCqyqkIiYY(~5~3Uf@wH@;Us71}Af{L@Fw8ONLX-
z2G?Lt>u+<;P9~im1Rc(pP`0K0rs~aGu|F4IL~!S?-PO~MGTS|$Db{!{h+i@csC}o#
zbFG2dh*v`nD3HXZyCmj{4>caiZ;pFe4t_Meg3ROOM!$c+3QfF%MB4%02c=g@Rg0Ju
z6bR~1cUPxz*3=$6%=beE>{<6c^&h?SPY0mgzT<1l0Je*i)|}B>l4Edx%)xk9wn*8u}soD@?@44Lu<`6M=yW?V+7a$ny^!nY#E&>{&gZalB&Q*`J!ye3Mga9)vU|OyA6UqL-m@Pfg4tF3L!_TX${K
zahG!*1AG9wQr+3n1*<;K=p#`C-Djt9(}EFOwRv}UIrzrv*%EOIO>zARz=dEcCXAB@
zU{GjG&uHgP-Yzarn!dz^vFMgs){5E+dj7k?_Ls=E8fr{Mllg_i@u3NNoGe6Ydgllo
zvR}OR6a^j5EoOw2A}3anWphz1pQ#aUu$chL?<_H(=6rx_z4+r)%B!B}#m12ms?)DS
zsgypa$IMoqrPoJqHTSxeB7D>RM!;F@0FAQr<;g-ob6Mdb^gB3-QL!-$z|c=a2@5o^
z*}&KH`{&YaM6lK$ryMj5|IMHOucn4UGg(a&CH$m)`??qa0hEVFqn_%cyZu6@@_mfh
z4iw#McZ84r%LdIt&nlYl7EB&$xELnMYoC}~)q(T1hhE3|AO0s!2;RZ?I79`ib2xIZ
zvxu4QIvzO@9y@#%(C~2ilsI_RmcstYhc!#taKA)23b)$1v~MB~3^`eKU%w+*uEq+Q
zPfP!l1|_i$YVOyFDf!^C{i5EUuCnU0%Rk}wJ6H_;wY4$iI))c~io(jEV?IB84FI~e
zgUT}>16LcwAMUcOafmtYUe?jw+X*gG2u*_LFPWum3z!xA!QynHNHYoYNDh%0(LH7i
z{P;V#tFOXtplU_Q;mgoNB;52jK1QO^vqL*UfGAiKP#cDm({iKsVxk)GxA9jCY+g9t
zW9GwJP16Hk`W1*>ZTlljmes0c6K1E3%#nsKB(NRtz~CkB^~W|ykLlMb@uw?O5~$84
zui?dHdtnW*zm2C2)|g`y{bC1$7+YE&o}#4PRl|(0=5VqLZNJ_MZLAiPyBmWD49-c2
zF5tty8+z{NN<`7RKP2uF<-dEyRi+k88tc%p=@_@wK5rq)g>|wMvN!>EOrA%cne+ATj4J&Gdmy(y_2$o|jAsiBQCjeOJ1H
z*K@k>%`?;vc0%~o&9^=pT>4jw@`u=v#85rqE(DWw0-*tOAT^Ph9;qi{dI)H9q*2Bvyy&jkU9ID0)E
zmm79uca)(6coyrXC#~ay0v|?caNF}JaK9c1)~z-xaNaQrHa{(Y!bY4kWOdCE9lGW$?8Shj(rWZ|GQ7(u|Bw}TF
zE4pB|mpNjGGC^iu+T!mW@wzc=I9SZp!MqdL+xH)J9J}$Oa1v!=ZJqvSzgDF~
ze*boaY;_Xp(%_xcJJ6(e2Cc^1!VX`V(DM3kfAgt=&tWpApRqsYdkfF}la^|%=wwZc
zX?s%}xR5f+(FxbRlIg!XjLU%_fdU3TCDi%pRh_}alxtlXv~N>9QDyXb5xy#h>Ica
z1n`c2ySl~Hb^pSQ{OqsNpWz*)hm3!D;qljRj>w1v93i%kvq;mBIqR7~Qt_&Yo}KZ4
z&f1zUl)Q@x2cK;W_^aGOK?4r?Zd)6h`t$%WeA=~peWP@+G+;V1jaPB(giBJ{$Cr^4
zGuN&qumjp2NvU9{RXDqlFfv$H{VW<@QgyMmvm@MemJfT(D?J=M$o-X?_RNvmx?q1*50%+0E7DOj=-8XeMkGKaF|6+=xdb
zj~OnDNlLLfm=?eG2uscH&v3*XyLzXAp6-l68o;s)aTks_0u6TbfYb)mT2w*L^rZp(
zLmWRuUJOLxgEEPls^GU`0B#sFUfVWTWN=S`l?jMgF1{q<1P$0qP`Ko<$c$<76}@V=x%;Fo0ma)6UKh)wuk8ZvHV+GSd
zW3Rx#FESc||!xW(-4<%fCiP>RB>*7lr
z7lz~$N{iL4$cdk>D3Zob+%=;V;?-W?w7Zj^h*;WiTA|)w%qLUM?NkeuP{J45CWqe3
z*|yQxF*yo{h#2=-w&otlO=zKsI);@Z&>IUO16Di>tBS!!pSA2k&`X
zUGcN+js3`}0>wnk@
zfwujEv)Iw_xPe(W*T9$2sHefNzk+{`m|-uG{0?SIoMtC%5g&(O-oPCYzsc9MZ+E>7#Cq23wJ?dhCS%;iIJSD3|?E
z3C9y69+_$yrWL
zjSB($O2=IoVtEBVoc?7I)-dsf&~ZshE9PSs47k@Ta&wGOxo-oT#P{zq?%w~|$*xRY
zdO)svAs?DE3XiEU^E(`yyI9HhNv6SKbF+a%ve7d8Kw-!XvcR$i_TX9Q9iQ)*0go#;
z^{<_rHPh=-6O|_oqzb!~o>Um|-wMh+4=1eMwHpHma^?GN{trXZ`F`RUFd`rw-!^>L
z;t(gBBmlXlZO7fgPlOF2*C5pDbfySehz*k}xA
z^;7Z=o1v%2Mcz*`>}$lcDt1qTP2%>=ESR71ibcIlg7(naM03wHPkd(qWGxubJmV12
za9`lOA13fjRcAH7hc!q*m4`Efm-waVG}!W$=UwVTdX!oIMLPi;O)mT8MB*n2
z1=swkDMO(Z)iZoRq2tG`Dv~FpwpXTW51YMLbpckBef#WkH4{*7R6B2otUJWSzB;$5ju0W6g%x@pNtk9kY
zh}KI1T8<28I$PTe3G`1v0S+MfgCK#sYnTv8rx7Rt)boM7(*lTXYnZS}OBU{e%^suC
zInzM8uL>y8PWxiLkH@z#oZk!FA-)6n4nDGr6-#5|DXc}j9y|KtQ~r{GD2hO-kwniE
z|2XGDRcs&>{DqtUzs@->ghB}(m(3BZwtz8%l^pssPnggZ>x-NJt`3BXMupTX{Z>*u
zTNI32TBFl2KDrhs{ub4yQI@WVrlC>|A!_~~P@;5g!K!_uZlI{@gmjh8@84X`VK2-8
zHEUOe>+p)jc~pwlP2i4X#|022wSzGK;1$-C;`PnT_FTT#ZBwchf8ti^u}PSE$%b-E
zG_~!>E#2MKeA3Ss7r6rwnlQ<8K|iY&pMxL)ph1|ja{DFnzJB^@EeT^l_F)>~jiq!{
z#i==4dM}vlyKlwCVp&S2?%p*+PKO;yeKw%>e($?9c7TEjTHxOPJ)vTwdXVF#u4*$6
z#c=w55d?lwW6xiU#OfM8tZPALufXYbAX`xc#Qh}>TIWZlZqt`H
z!-dFGd@#U!E_j*M40UBGwLlWi4$CD?t>ETh8{#w4$y9D_6^62j)(#Fa6;)$deX+Yu3d)q@zgMbA
z_C+bA8JGb@j8Gl#(K8&iGl7~^1d>ZBq0>86UL)(7S*ddy`}Vj7T8-4k(D&q17awgC
z*G8OUt3gue(DHz=*0TUOIuu}I1UG8$K6gM`lkC&{Q2!I4Q!hTcc$}xLZRwqPzV5k3
zT!SF5y1zA+uJR67-_9BBPzwIk_I2^V5$RO^+tIYsrUsP7?rcd*g2B`jY^D4}b?J&K
zxo2&9C1E7*E%t+tq4`_HYQ65#MuS{xG~97a|64va(?`a`pNu_n%x&JK@;#+ZJaxL-
zjuLK6tUw+u2nLx0u@Q9{m*U?-&&FX#y@A~82<}rZVYJO_HA``P^NN062DManT$%zx
z-1~T}7WI?${&68%O}Hx+uz#0{cS@?CEV!J5_TJp|x;)Hsdw!yrw#ekUR=d~v(m#C9g5_#l
z%DXj&=&oSyBCtA#y@LMk&aT+M)Ec>*Vf|{uE3AW>nu?75OA)!M^$T!oJ&Nc|^uxQg
zB*mfvo>FUOHL8C<^zw^oep6)gl+PQGGC)Lt>)in~FyHHH*kbKmf!aqz!Y(5)xg%qM
zV0vdVxQ*T_GfhIZ^e;I9+W^?qRQd~WwUYz@(OLrh^o`x-gDbQ6W9suFp87f(WFjZJ
zONp8>Ei+|9y@xd|h7&KpF(qn>ZbMzDO*1yp>w3I?x$+o3*snI
zbFRK5d`D-}w-sVfy{(ACyqMwwsja&Hb)EWUY`qH57_}5?ruHKi>y^qAzwf8OU@@TS
zCSv2$Ww&~Lnh|0Vf#%O$3gKHFGoeg0;ZBT?Pkh~*zXQ~YciKcHr7BNOAeTBjuJ#*J
zG}e}}HXeMUpMeXB9OXTGP+ow2X*?UF0(X1XLw|G8-eJYpx&80zvz7)v=;!wkH`?Ts
zRmq+Q&P@$vyEp-uBDE`6y7(-1xBW91!wn#9@HASfJuYu@V}D`~^_pX^16uvq^TEdw7+G#%{f?cDW3{Ex=H%txF8_n3wt_z%ZPwVg
z{$nP-LO_B4id?pohLK&6>49Ex-&%ZWaC2%>-4OWmW4zTC4Hws+9Xl^z#hiYZa`@ET_
ziIO&lZp39cor6?D(6buB8l?uD=DU~Rm3sV%4{G1xzI^`rcs~}TvBX5;jp@tR9Nkvb
z<+)}P0@r2h`#S}2?&sj=N==aqHSVC-Om*LZ72e)yg)JXv2nmmSvnukki-_2VKB-G0
zE_5PK3gx=ggHn7W8_ChsYL>M|(xwX7w7h$+94F@zyQ~HY3yrW>s
z%HLc7x34JOoyU1d*%@(^;%-w6q5P91HFkByihPeL8;dZlGYKNzK&k$^BYU9@{qvD{
z?121UAYA6T8q6*t%X3}7A*=eR1RVJ`aVyNPJ}-1;fz&dQ)|8TGM{8XI_Jki-yKk1t`}60wyjif6}ktW
zd!~(l-PGt9Kux0_9}p0d&zqa-9d4Vd$gWfymhW=55?DON?&~3SCvk9mIo#m&h;N4%
z>RofMj4<8QO2UVa6XY=*7z1pM61Uq{^ew$r_^3Y7r)S$%DqXuXgHn;aNQ=FX5?jn;
z^v^a@CG5o-U1dG&y1NI6SHCcIrUXJnls96qe8mk`A(62`Pw*Yp=xA(%SI!*)t%w<4
zhO8x16GQdsU2W{xx!^;o#8KEMVbpx7Ri0KLQQ<41rD>u7Y5gw)1h+!m7Ig{Bx4d+Q
z+OT!SDnP7y54!SYdJ0~gm4|49ZJsSF`S9^~mVx1k)2rSIr5P*dk4v3HM-9Fa(l&bj
z>%y*fRNc8C^y(Gn^%`zE^t<~AiNbPG5k0|>X(;)zTfM&>Zf^31qTAQ6FyQ>vVC+F<
zgS$SdN&sGHSVBrpBThtPj`VQvx(DA3@zXQ7-XZs(bssWWb@jw;+Nzq4`lwtxk+8-w&ZRP
z`3c#1!K>&ba8-rwC|`cgrNNb>(C{*>%CB4qz&&Z-(ij~^Y~GfD8;(v0Go3`HLb$Kt
z5z*y*g%}0=`)}@zw_>yd7ugycY;`63N9h0!G)DM{4A{dh3GA&E(Gvrma|Sogy~uJppw_g(#8jnj{79z!R1?#biTg`t|4VQ+ybU__b^W6gTkEbY
z|K?=6&jS1w)(m<$6R2m5bpE)Zn|dm)H_6aZnBl0#>DOX|Da3R+wTs69P;py^VlpBl
z-_eZQhk1$6wTW_qHP5z!u?u`Q4Q2RBp1NTYt?chU6chWWbJK3n-j(Dl)ag0YC-j-pm#%{GOH
z@kJSPqgIsol*o%+b(zCINA)DUbiW-)eZOi&PG?{Q4!LUArZW(5@H4@j)5rx#;X##>
z#Yk9mc=!7<2x84aSe+KVFltDs;h6#ehwB(Pt7gs`|AwRpmW$zU^lTlbFg#!mZ$3?||_&34uGWC5P0-kt=?tA9*TBw~FxLis5bUSE4(#kXWb%P^PeKb|4}UAxKZ_wCEdVqZr)S{TMIjF1RMg7
z@6+aAa|5*xy>=%!o&IeQ|CJauYqojE9W<6*o@wfnHQnz#BdGI;e=gEbfZT@cp6?YC
zkrEfsr4CAJzdLu6^%uc$Ctzq0_XzjLaAn2qzMg>D2gx~;S6UOq`uUMt@IBRN@qw-I
zhe$B{;5#)0(b@W7%6-BQCwXbvw}WWA<+A(^yVG@~OCCy%CCgO)@p^J4HH*
zqdz-;=DtN#$Rv}dno(&7Pprd4f5;&L^9%`wKwt)D4w6RsYI_&{u`xdkDeh~abqjPW
zD}PQNuTIH9Jimp)ehodq>*})YPkX%C*yyF=7U6?$K7K*`Y%`>0X#^Ok+M3n5FcaoL
zspGGm!G4)~4MP3ys1q)s=keMq-Gc18?bcjOIdERgKJ#^{r4TZBo%yK7jjWDk1#?CzjlVcyVr5Z)Pkbk-`ayxss&zj5~L$=l?}?LLon
z*syVy;qI8_-7Xj%G-T=Ar01mT_tpiz7}i?T{bd
z8iOtE(-rO>2ictUBL_2Woy^Kqgo6dOhx;9^CDoIkPVbDnd;PAuGwt;e36#tHs!^M_
z1IgVnZ6n61bcs~RKM+kv`U}wLiTtL~=%LP}?U^=iux^hO#L=iotspGX5dau=f6K0a
zP}}<^GK;_Zb%|Z{800??|4&nk?SfvVc{UGtp-*zht8U%|7}&j@k(b}SQMKvPcCVHz
zs}j)uqMHNQIvk?&q!B`V!UP?S#py9_hda#G{(k)-eHkXe`Qi$e7xg(JGXeoN)tK=h
zP*i8RK!c}M+V-Dv`HE9<>tP{}?)e+P5&7|ZU#9%ACmO?uHbq7ZAcMcgMq`gZdQf2n
z1X=sQ6|hzr4IpvkM)f@{O&KnUrY9|1IhY_HOBd&%a>-R4)B_CCE`c4*XESco+$O`P
zc#Rxv6CwO30`QeNe>+cE8?p%DuENjhXK>sc%fQX3v3vNMOtX79ooLXp`34VA>>a(V7{}^f
zh^XKWZJ`4S5f-4z3mVO`gO5iFRZpW^Cn_;53}r(y)-35hd*3%p#SzV8R7%#wP}2xV
zOdGZ3&j)LytXRjcau+Pw`8*TJka>X!L`g~CfTeOAPzVMz)KNOfny64^)c8IByOcPv
zlLMa@=_={eXCE;h6#@7UG9-n8lkcZg!GPRkE2Fj*7J$sUD^25^V@O^w%Gj5XRTxh+
zH|V-Yh3I1Fe%$Fk_8YiN=7i!$QW`&3g`NK%J!Xl6=IQu|E@B_o*ogoDA&
z4WnnGe`$5%&P2(&4x!;SqICG@l8|!}7-3ulL$KM|+41G&P*32EBGz+P~@%X7QIH{_nz7j#CpFn_1|!tH0QE|rHiSklx8Cairse#OMN{CX-g571BQO@r~BZ8DtiDZ?EQm?IOP+njzqOK%O3?AbcPmX<+L2+qA
z75=D2x+S}-aWJ{vD2N-8nTS#bVYUb^qI+g3Uh1OL0^XWJLv({6#L_0a?RU&`oFP>aF@N|A1hFQBN&O4Bs{#|i%%EN;UaQlkZUOC~ZGQV7wKb~9
zw~99{w_
z@vrMQHg-1MtgD~t%NQ*YsXlX`WHM#y7v$Kb50t%*B;<6Blf*C7;HKa&*RTJ})week
zTzV7HWflk(d}t_`GrvW1?)#Gz=JLj?WYZ2UyOQqXnflTy4{gTzZagA2s(b9=!S-BO
z7RLo$rIQq#g7W&HqC4TgOLLGMo_LHeSzj_El>8`>YxiX9}PEO!CQTi=K4Mm(K>
zd9}aYDrj8jXmdHk3!r7f%-qJ`jaa*a`Ayrz?K!`WNE52mjr&2wa6gI0Y-+qEJxC&T
z#y;f(yAk*XBW_AA)nK9{snUzS>44{#^PRCsrM^YoAp{X$W9wEunVkcJw^uab@gJ_R
zcydBJffpkkIkIm8ir)qCWn5wTQ3t}ejdztGQN;s=qqH(-Pa3a2&H1%=1u!5Q`wu{7pmvqdwd6;2+Qg%C>aaZa$yxXDc865{`b
z@iurW>6IXHhECLHDVYOwv~?o05Uz;n1dtK3YinlS{axObO~ZL>s>OkS3KbRP-^c~H
zAva3VcXtLShCY5KFAy&{|AqB*&;DaJAEDTxwS8M1enl*|1f>>fggN}Lp`I`Nc
zpqRStGzNg4x@P)rhMyz|=yqi^Kxgj(0X=_HjAkn^r{t3wsIJ}_vJcpTWRO=d&R{)G
zv(SB*>xf^*4z4xd(gjpYsgV27>$3mGbZ3)uppk;w!zTmRExGy*2uY_O);bs*s{H~v
z4&OTf^-t)0NsK~(V60qSyam2&sUwk+Qv)s+lZS3bieDY$(zar!MMHK2S^(!_u#Ck866nNp5Yt>C|
zLM2#nd0}CU(mLZvt|kn!cXY35qD3Tj7ODUjrB2z?d~lBFuxN~2JY7XH3BE?w
z^htDanlqW!Q{ov@Upq2c#yCt|_a^BFi(SfLTDP6Cu{|YKz;WOZ=>@$$REg~OPS_teu
zBHVofQrhJcvCEQV4k^;q-2!(>IQKXn!A=zjepEABBe&lNax;#*>)ZO>JydU9%fIr$
z7n)nL>}Z$L!-u0`Ye}BX(Piy39~7uyVYyYvGxAik89V$052>mXRCxUp5a+1342?sI
z4_Raww!?e7SfE&`Zz<6eyuU?W%|d;#Jw%#w)T0wsy=#LBu6z}_qyU%E>Xvck{=P;}
z>ZF3kXi>
z6XfnW&_>EsuxtCbshZF_*>Td0+xzf1{#-hAoq&c^gZa7QY_GYagG!xtFI5JsIm~7N@KEwc3>D+Z%GYGDULvG&aAFYBIh66AH*J3A)QuF3aJ6T#h-A0O`rfxH)Mr
zL+UPaQ*grBJKRKiWVH3l@BtvZ9-~GeqFUa<*;!O=W>L**Cqedob+0)C4<>VY`|Zze
zE48;K!5XVu_U9M4O2C;_+7}kVLYA*p@`{f!C4UQQljVqAL5DiEz
z%MQ>5zLmFf><1)`p&jD|zAv==f!M6*smtLt6U#q0wC(>T8x|^#N0d4zn(2e&usy}6
zE#AMO9E8>1UPkOF+|yyTK_Qt5ulDr~H85F0W9!`FA6{YrWq#k#@J8*D+w$213K(J2
zFt^vu+O@wY-)AoowYfZELf(xb5S^?+{~R>f6HeO;tlK2T%
z8jasC$tqI=)+npmkr2^t9z5=CJq_}LDVy^rh4)(FFUa%(M}%V7rDwSqTRv#_!AF$d<|f2dsTFT88}^qKj7krJB}^CJDKV9XivVJs2At7$2VI_umg$%R>Qv
z@)(Yuvv0&i2XK`$&S>@a&lXfY-T0S{4c#GlLzd(+YrM%Aq;;Jo;3Kq%ViS
zV0GH39ZAw%YpS3{JUg}{Kwv1chzlnA1N2I84Fy7tz3;w)j4-qHg&8<
zD<7`Q-bhtdoYO;h{|OzF(krluW?1@8i75ZFy+;|?
zS)AzlCbZlsR9FCbo)RbCd>gxjn|bAw1dAS#FYlJy1cVwtfs
zhK=k!c-Ht91IL@7?2PW&)PHn3yRBQCZ1t<;)PpNEO(Ph7_z8?l^z-36?#-y%b@1Z^
z2o_tu>Tg26Vb6fvdsx0k801Sl$5v_wPI_L@Zdz?D{#E4w>r{W@BN%(mlc6wHii_<2
z@x0aNq!z=-yR8Hh6vZBYnQ7Oo%J&BW^`Lbx`(Uh`75yV0Lkf{uOF0DO%~JNMJ_Eg!
z4L6579b=t83En!QbwBe-3X7Qfp2c(Lm$F$YYsbvuU7O>cBt@`3O76So5wG^D%Yiv4
zy`iM&d<6(OHo0!icGenC(%BhD2-{}flw>n9r&05HVRQORzDOHvEF_w2{q!a!?Wu!O
z`MXl=N1sw`y5V!o%gzym$$sbrZJ>FSV1mpAgy*30Z}IY34Yh3c_{5?OGgk5nAM8n8
zSNP+dg$`HedWO%|%=dhQ>!vAqln!Nj6hk$n230Akh##IEFg9Nw7h6SkQkL4$GS4|$
z3GO>stLl0L72JasMH^sp=hO;nw;yvr?i?rEU`WpbB};y6hk{1$4W;rPTgimW!)lR;
zx-Lfkpm1L~^@le^Ho_h?h=M(LE3}DAMlBmmTSof+=H1z*27mnM;|p2Z`mv{*8km{3
z@uU1(Lnc|%WPzRW>);8z;WfX~wBNzeXDPx?GUw@OBC|t{U#miW&5q$tSTmy1^0T!0
z!#s)6Sjqltgp4ukWy03^MxPfc_S*hmZXTtL@8Q7GORp^7ud*X{@!8uX>Qcs$c3Rcc
z`QJ)&PO$O3_Y+0bfQyxj3O{yZ>_je&#H#1Nr_L@O1#i3?MW%N6bq8G~2V4D=!GpQy
zZ_6)D$@P<<*nKZzkuP>Ihq{takeiSX-nw&e;PS)yih)qF!)kuy>u}D(qt4h7)f?vL
zq9R8lVuMWG<-oZCUPh@k2fETiR_}E@WsK1jD@l<)Lvhn)xxJf_wCZk(eJ2dvf1h@lf(Dmy`
z9;K*j@tv&*YQ?p#f~@XkN;#YU!To)9Cq%w+U{zWt(*9QM3(FW6j&DTg?DF5-mf-Zv
z&3jM{xuNCXIriXU)pjx24`{1!PIHcnf+p!8F&z
z71KNVb$CtCF1f(e7OwwG|Ce0{;sltE^d%?AydQks=#m-6;urEXxbORISFAX8>+Sn8
z#j>}9fXTkrJA2Fa_xn0ROXe2#&@w?6zHwy_6Cvo#bm&|WrroELukqvr2D)1>&gPaq
zK)kzb9vA`-vJgI4!4DNuLkjUFFeWwk>1#XPq*G8NN2M-pRFVc(X9_SNS|_>n!B2t1-MfT*
zo2>?`HA8M+tP60_*wdAlx%C}S5B!-uIOca*EossRbreACekE^oqy?xyN0yr!1+vO#
zG*+EV!+ULxe0<2O4%~(z^?yF&nBU8sy^L+DXGSkJxV^loLLZ>+aTUQ=um(xnU$X?Q
z6GRQeHHcv|-vx|(b~)F!(2u`X*Q#zcZ)pYnyiJ-cxkp=J#L)>69zc{JJ`&c0>M*Hh
zKDoMg@|4JCBor`-oKV(B!iI=n{OW)GZH8vA_ENu3u+dIvNaHr@o1O^1Sj`jc{-r`J
zv$E+|y?FYsn7&29Uy?zfG6pUuqkbJf?Y0ecYUe?!Zo6a<@L8P{Z(A*&hHv-@|K|Vl
z7_I-E&Q{!AM1M*{5_liLphjYn;1G43Tzk)c57!W&MO!d^ChE?hGJFRD_-&%iSs)ru
zzI&~IzN$U0Y}!}G|F1$z;wI_&*C&iy{d{xa%!+WcivdwrYv6D;H{Rq%;XNSj;Vzh?
zt_&=b)#tt_;W#{IX3^F(TTt2IHUm)%S
zxK@DM1n}J?I^a3dK+lHWo$6{P5
zb-5~xfKeqg1EI2}dGH`_vg5jj@xa5oKXhuhQ2-!fLHoY|1%ba}#BC0Zma|TF)87+g
z06>d#SUm>ufa17x;osw>-FBaN-0MM4z`x3BpA3>s%nxQ$=1wKlhyg&U$P3J&H3Lag@IEukD3x>qt-#_c`v-V<}
zq)3HC@Qpw2B>G!KIhN?AJCA8mL%8^(9ndWtMUBv+4Gg{SFk!<&QkoEt9ldRC)i*P?
zk&wjZOZdF$y4Q9+Tva_Zd@sjp)u-vo_3^U_fn%$}Z)rziL+ZuL+fNPa(%vjOyz7f
zSkT(>p2DgZ)adW)uar3qBUd_kwO5fW72?WcZ{a9+dV>qpQ
zWVajVM!_a4!2&CCsj6~5t%|_54C0^Bk8jMYUO`^D`T%51Mzx2R4SkFEOtBv3XzqDm
z|KEaz7FJS}m5b6Mt+PbTkNjLXPuDjtP>9)hjm46lag~*Q{&HSf{&)G6P3sgG4KeY73Clm)ce;)<{BI=*P_0n8OZ;uk(2W?%E@2Lu|KQOm6d-&k
zjBY+$n_JU1XLxnR`!-Y1g0=Tgy%4P^(NNuW!JFDbg1}bIvF9xM=DUs1HYiKlz!Am*
z6PKM^EQc<;a|{5-Sxjtky#XII)|z98F3$y-Yjbfo4>i`_KhI<|w2e$1*}EMl6Bghw
zkl}5TM>k&P(e?f9F6#Kh%z?WGNaHTj8Yc)W)~)!|nzmr-{M%jky3(fRt&
zS772j7^J0iuz0y0_^BQO875yJkE=1G(qWneUFjftU2U?!I
zcem1b(A1GP($L_!r6Tgf<)wz+H=nyC?-Kij4G)@(Q;hPsW~Rn}B@^PNrNa`VG4&xhv51v530G
z+NW&X>k0}hpt1hHD*5iHCcdEU1%%M6Qltb_1Vp5FlF$Sc6;bI@qzKZB^b(qYf)v3Y
z3X%wsE@GjFUZnRn1*ZH@S{Dyjn*sowNhu+n#dC>Hh@r_&pAoJ25}MH83nX
zc=13nx@n5_#S9S@G&nO+xoosQ62HX>2_VSPc*sJSB>+Ta>jOZ(EM@!H{Uda;VdXXia3$7`sQQPYiVSF95O(IhGO3byAA2G@
zjbNyk50M`3$Qf3R$g8>#ZbhMoCy`-#-CHZB5u5ToR`N^RN8LC7UGw<;={B7F6Q_GW
zE6(FTlF8_Dy%Ojv-4LNBm(D-?G`*zMg3S8(xqUn0nWg;
zc@jkiZ(!#@gqKVWuQQaDhFDX9t`eooh0|e|A64{=kr3cY(qxb;akeh~+QqG3$ArGT
zh{UG^IX+lK3`WETOV<6_G%~wEI;Fmsc@CWKx7kqw7cYh;p5586J`4v0n}SL%
ziPpc(P+@C7;(s_J(Pry)sbaI{!scPg%GqA*pWTpj7ATbLUem~|ez>!`aqosr1BgSpJ-+lQf}g3@X*uu=!;)BGnj@MhQ>^LNGe{;QcX4<{>3rMS<(Zb`r72<)N3b&7Ih
z2#0{yYfz)A)8BtBzp9$ov@kTDVY*RLW)|NM9VDM&E5CHAF|QtUQic`i
zruNen`Zf_S=cryqf}F_#2pi+|$9osS$v$M%s5>QbzkbkeNQS5HhyKbiPzRr`t5oe(
zCCkdAiDd>TmY}Z{CBNp3g6pQ2$U-72&de~sWTv0vS@6`k;me7Mz&6&rF$`PnJ
zyC9d$2;I7E+7Fq<3(pY&dqkAAHFClEK*vFwuimbDzMY{4@^a^u*b)O&l<@;uin|7gVg`dCajKqg
ztKH@~-BZ15y=vTF37zoAY3cF7g@qfU1xmeD1@LufSi7^heo^p|8Ypkc6V>Q7R86Py
z!C=E>z^1@{mWaq0lv^w(7ZgH(n^g{}?!#EogIhh2A__aeghAw_G<#0@;^#e=#fm+Tka
zFMk#P;0KalwjradsK!57zTKn^yC$VH!69{PQv*3rI74J>(d;mgkz!WA(+Tnh1j1as
zIwwT%m;DJp+J1VdbcPb+y{JtrALWcq=@=5!#AZw$h0gms$FQm{|JN4b18ZB{v;?F;
zwfVAOj-u)Nh{GH#2_}g0K{T$iuDPMjt;PW3(16hgobb$T9vlrY>^>tGf4ru86yh{1
zV|lp4M&!I{C1!D4;heO#nG~=%OIrqUH5q0Ae3n|*D?B_7ufu~HHqO}$+#3y$mrJ&Y
z;W{(*)=pD0Gf+6)z90RBO7}+A52Jxi)bjd?E4tl5APy!3G|mhao^nVv7Gm2FjO{@P
zMwpd+@hEGa^{JiQMo@$O28YMnRGhWvsIVHI>EthFSVT=|hA=YTmPA3w%CI#i4^czZ
zS|9*ud}@n(-IB-f^PU@~H#yyzNE56j=w|Moeu)${usHvuyi0W|!38Gz
zOlhkxQfoFkV1CRNxM(a{(12?IZXz(t5?Opa<$^)x;_x5EI!DJ5b!LY
zKZ6v;j&k>(%Fpl*nr8Sl3GGQ$F$PMuk6W)L-zz$FQ)r62ncWP{%EU=cwf1
z^_%}*^j<NSbs
z6yH$^z05HFB1G7D1L82F)M%RoL@)_%Kl|+2ZtE4u6mtuVxP#kX6)K9!U!xr!Am^K2
z3MmU6w8Pgkw$Q)=8|iUrdrPcm?@W1dO9q?0Z(Z_I4?R~D1Ra%KBOjMlkT&7qUkesey>;XQ>i<%(Li(Z>u>}l3LRsC1Rh%dOT
zu4DJcz3W45h#&IbxjYzQw_x|;+iO8uTj294U-B@|v*$twmUeaxAzo<*`rlj8eX7^n
z!dpr
zf`42WYk`Aoo(-)GV(Knkx}>tY4T?m?HX5Y9k*Vt2DMmW^fX}!LdxU5Zw+Ze&8wcT5
zElW=???@ebt|b-FeiPm6*Bsnw
zz*!7O>$8&H7HN6@TLR2*JB{lv-?ZR=?{(BB_3M`9FKw5)z>h53UHJseBuuh3F
zNE3qqow#hT6)R=Z`>Xi_np5S6UPoicD$jl6GV3
zqpV|)*-lwSRnSIKS5I5d$DOUIa(zXgrF*3rbwaxX7CuA@NkDGG;*2=Tj9y2wCTabr
z0OUu-rl`ulwV>s9g_Ckkxvqc;10>m{!W!1aEA*d_P=+{+UJ`bzi{(|N7i~6d2r?
zUG}RK6cS={_h+CNCS#t{%2z^ntWH~mCy+MjNL&FMh@uYv1YowYe|}Z*P$^GLua&@q
z|>SqHkHyj-sam3hwp-08ok8}wWS4umY7IIIG!$}qj7~u
z$wjkzdPY`WydAjr>E>06&9P|O|A{})
z$q2bps3^*Ue{&E7G=35hbhKoqmq;2kMVgmSy}Jm1q74nn85h0-F^QMlVy7E(Bu(}d
zL;fBHad3)>ipKE~Toqa#6#EQ8lhWXSI&Ac05}Mtryf_Q4E3A%a0;;
zQ&1={bb2Ee!Iq$@p4b#_Xcp77FF&tZxaL$#WUC34@ly?Z?LHg&(wDhN0RG0Um{MBH
z6ID_1!EX?&v`l(Or+1|_Vuu`@;kEnRyze$jnYX2B)jA?!D>f|0NNd+`6KgCshGWxm^^=hbGTSX~F7N
zrHa?yTw#Z?Q$N<@G%Rz_&q=>~=k_bBfYW`Xu$v^|ke^TOLta-?<(wB`z7d^HJ_su`3*BGO
zOnG0)V@J~xy;`pEl@9j1@gc*I%#cxu_#G9!M?&E{8oGheIQqdQ<84ROp@};w4K5=#
zCrjvBi*Au*y^S4TXA*-6<#NeQ!xPU&+ko&_2VpmE9B5k3=;>86>#dSp&o|xp)Cd{Q
z=(Fzb?!kcpAg)E!8VvzDJ~;0mM7I>W$kf*RZJHZVb=2%aBC!h|*>9-OvEvfK;ddJs
z>)%*KxV_J*dsSLsIZpBJ455EKJo_Cf<`E-LB(jO$3yC6qs{|mpLxL7rt>6AiPC_gKjYUu6dBXaO
zJ9?(+1PktL{&ZK`OOfWJH~*Ik6Co`Q`tY#Ydf+t#uE^2O-=)3AfXG0CoDq(&-hPK&PorAtB2
zdSlb2&#ki7=6pz}zS-H?LO1v@&5Y|UWvg9QDom10vx
z!d`7LEXy%L+i=XVyM7KBdlQA1%Daz;N6Qu*w;6!sqfs=4`Y(L{qw!gbdJV9rkw|~C
zOJEG-{+vTw5+SGbkw-P#OpS8tQY=)SuSM#E`xL9Mt}ka!>jkfeKR>j{BwpoUP1{E_
z!L@o$pygshpM428eMz>(7to4on?dpXDGs4?x<%t*R)CZ54!TWrw+9VW`4PsNy;s3|EfI_6E{Vkqg_vn#kte#OssG2|7x1ZnzVL&uh1j1nork6l_I
ze1==C(oA5{1WQx7!m&ZgE054Gj7<)1-L1P*;zjqGPEphUa7zdLGfD)jAb
zRNpCt*q57A3rBX{-s%E9>To>qZX`(e9k;$JpV>`&E`Cc<^jyd
zO+;bgxkaTH!i^7cP`<>ky!R42_B7Y>)##d>%jw-KRlNtGyqR#iTqDBDp+-VN^smRI
zEcnu5UOJ;E1xVqbkr^h<#)FqGC6T&b1#6Gz_Ty=Lr}K6M#>V4KCc(ym+11?xeT5)jR%7#qcu@YeZ=0
z`s|AxJG<4n^dpjgRXz64>3)rONnRd}LZ-y?%;D8f{rbJ*p@4%qXF|n@e?3hZ6W^8qSvf@gY=(tq%a6)tJ2r0V
zxtTzjBkK4W!AX4b8Wjx-+y8ddwLUsmRe6xlCv!O}`5J#3(oG>M51G`yn&u%g1@1q7
z&ec$DZ8@YEb!@*#%+$1&7cRc!V@JQ@3wF&1`60ORvCQuh4N6Hu+S+CJdX(ipJy4eW
zlm5{4{ruF_w2uAaWut96vAKmAqDFAeQ6w*vOFB9(?mx)PQ?!#D&DA+sPVPiC;Pb?d
zCMU+`)ikYNb-!)(IN|*+SFhx7b$_DLd)I7Wq^X$@;Pz%=VW
zfnSzpikG7bif&zcDp7xX8g}K1d7*Ld;p;hphe8Rz`>I&qebHnjEc7#ht0FABEWiq=
zD^Y$1-aX;o_pm0bI&bi@v6a~PY*C2)zMg1%Uq!GJxF9I1bj6KJvg!$pyx_9l=Ke{d
z<~@1gNP80->KOm-{@`^`F#Rryi@pC0#vJ;q1pE?@7EYKj$#2f?W=Y;1GmbQ1uV7;v
zj2F%YWIph5Lp>6{cH7$B!%od%s+cwUX<2OlJ@k}-jgjXKqY4*KpP}>6>Dm#xVh(>q|CX1@Qb;%?M{8x^
k2Y&{hDKqYW7$e8X!84kcyH$0C066a4exUtL(3V5CkbHl@=9{GAJd65>%8fNfqgq7MMXvX#_>2yCjs(Aq7RcySr-`
zCeNPt{r&#uyUzK(>zwOiE}89KYp=ET+V^um_j7MPYO1T!P+g+}0D$JnV`XgsfMkH5
z0LlyCk?n8Q&HzBt{Z7}=UD?vj;;pTVyREYm0C=aA81zIlNnbMcf|wM50L{
za6sr~JB4y-LjIBfAFcYmT(mDs@1x#P;U$%9{U@eF0vMDOY~}pmaCp6;tbI4JVVT#C
z=SjP*H)iYfuzX0j-Q^m-?g1ys5c}47u5N);N{ID+B>`HC(&>ujSJ#EX6WwHH1eIk7
zgy7(mt6VLjPFDQ65#|D!G(J{~R~4cr#5EuBdMa7Hh+5FHd~UiUYuENI`Kh_MMEITS
zMOq?{o*A@Ued=0q9Z4!}@rb8a--kJ0PbRH$T{OmxTTPA@o}2YkYmu
zufZ@*Ee~It70idoSngBO$WJUY?6*dI?*HVDiLY2^mwA3urz-Pm_6;^MYUU>fHlK1X
zJgvAX&lVW|QY5}NDr%Dd2Zdf?b%7tf=%vx_q=csj8QC2_sLi-t?*FO{)7QMCV)#*z
zyCRc8SApxcn9#?3|X@VvFtX?LFD
z_~_0j*Ywo}ZuxZfNCdMPtLp2!Evn&0&ztJt`$
zzA_rwo34?~O{sFP!wf_rOWg%<8}9v>(2G~A7sVQVJdR(l*V$AT_tB?!8#1K1TlX}K
zu~;N@oV*#i=Y7&9ecjxC&-g-&$Wt|D{<_aYC;1kxCFj16)2`h=)sV5tRj#(sf2rWS
zQE@x@Ph`EtVW7abd0vt)uo9(j0mhlIn~_5It_Jok99s5hB&A182T{x>)xd2l&skK(
zPU`hPgew~iK1^ZGdL?hy1
zq9B=ihBKSyhR1{mb3{a(kO^F5!_)xsh1?{liFy-5IQ7^RzOMH65mH38fhCPDy?Ktd
z#(Xat3TOltrYW>gV*!90c%rPJ>z%UG<{3=EsI^XH`{SHxk&@=)5k%Bpl9FqhTyKa`Ve*jW9mU-b}2{rv~vzhbn>&n(2=c|9&CEgZE
z?%iZ{x2kAmmE!#rB{emY6`sgVd7Zs{GDRQRFzL{J5xGz1pT}85LKZk{HgB0zQM8c=
z>t`!Aop3)Ug!tWfUGYGcnHgV~8n+lS=@7Q`06q8<_ge#Yq*^*}-`?+~NZ;|wa
zh>~WiB|kMizo&0g*J2n;?zCAU8m?$jMO~cl*b*+Q29X~>n9dK%gFwv3Qy3qL$BE5ws~5r$LM{HD`B&UNSFKDUK3
zI8Z(^N2R+92Z;Fr+-_NiPke22=gaSmlp}=cxPY%UrCE3K{zh*Ryiz%V@4oiB0--W~
z=&uz6;IKW7FRI*N8`VT-GRXmVZ2X>9PVI`Gsr^&W++Q{uniG~(VaJVMh1j{M&pw!P4Eu7|gxZq;*
zYjVJW`}$>(T{`)@etk7KMKUINzz{W2KUqp8kvv?)Bm>avSndDZO;#-(41E}M`?h;n
zgEa>@Lci%L$D1}apEF_}P}?JJD?WLWu6djJFhoN)ag_N;Q=8fcWn$x75Et4XTpfDt
z-!E68xk@(Q&(slOV+Lr>|NEp@i@d?X^mI^aE&-t+Z`A6dTjuVfdU@)X2RXTvpT6Fc
z-r4nkxi#F^IbQBpDjJj%Q|mkSYCEQEMf-v%XXl+;*8@9NAU5C2lwThKh;_0|iNgxH
z{ynFLllqa)%PxRVifg}TjqFzvvWTJXPzoWigKWCL>udWCLs5H9(lN*~soBD>mCX6l
zWh-y7*%AWH5c(>C0!jG{6T$@S5#cmucYO(}BRxRwPLny-_fdospHr1CFb1{VwKmz>
zx4E(s9(4vKgh!3H58eq=!|jWGf7{D`XV7{2FND!G{}nSUVLMw+&w((m>i;Jfm+WO?
zz)zQndXa7|xnEm)=PQEM1$cDTC@mp0w(IJdLqg`GDuLSLR{Im)+|^!7e*XQl{wM1S71~_+RZqa4--J0D%+N|H@#7Dj#obOgDSaM(ge3djCvA7s&?fNQ_K71;H
zrhh484tRgG&w7jbkJ1LZ3u#Tj1V1ssR@}<{@>GfPAY|zKlfqmXEKN+GXhNvw&{Y3V
zHqO-kT>OEM$Qzyx&gc*Y5wk8ra~2!b3(6l|sUdo$m~f|swZzZ?a8kW%s}y~~^uAh>9filQz~2o}cdVX26`uWpu&O8R!W?K@}-)!V`;Ffwko5K9O{aH5C)=
zk|Iqp-Jxve!O0oNxAUIkdEutr_o`yYHH~`-mjvn
zV%^mw#wbWS1Nn$sa&Jh=9t%$bmy1mDgTdN610-aMy{zfkYZ3hrcP_bncPH@(poLA*
zRS>E){ZpoN(L#dlExI;d`ZH3GwaT+-7H?I-liwE2l-DbXS;b}ehJPZH|x5pW?ug`FXt@+8b4MrieK3m
z#|KCU&||7f;W-#_S$yk&ecr;!M}IB<_X~@6(L9tNxD`ne5qz>84iYPuFxzlbU?J=X
zM*DKYoUr`|Cf&bpF({(~_3?SmnLB^+19wY09DkD8}3uTbhT6np0gDF=j*!wRS2fW1Y
zv{tV^d(!)gj?)sz@Vohq^eHt%QG}7SPc_1i=R{N(+4+u^XsmAiMyr#l%@Zp#89FqMCLN`%j>V(`7y
z9C)Xr)5bpxBB%XHSNEkaR_{5m1PZ9OKsr|bC*+nee1+b23NAZJ`!cGa*UX2X-7Y7e}@SWp6Z4Io+SP$w_ii7&@6*y00`F^>;ai={nAE9Y|W7Gk|93I)|^C8omeQD@&
zNB!U48Dc!$@+C}yVINMAH9OVm$ooZd0ORF%Mu_=ckx>jghnjkJ)a-_MSk#S!;WhH5
zB7cUS%Tq8`gY#$ymrYVgmoyiQ(*?E6BpP5N;N@ApVC@J(TAh8WqgPyNI4pjZ)*J=2
zOx<0+^ZMlIPL1?2=oH6H=-dC$-{6s2c
zN4neB6{nS={`rz1#Xk7j0ei)JsRCE+yHvrz2ECB`h$d?aZ;Y7R^_4Te5;EC#Cq>9>
zA^c2EZ=+LX|H1Imao0L)|9Hyp5KiqYqBa6KXZU=_(@n34|`*LhD
zJ6^U|4zv1PXUpoRMVchs3SZao)z?pR+TcjJASF1VhK604Yf#=}n$ADgZ<-lgRs$Em
zRON=BA}k#R648?T#uANH=lrjiyHK3Oel3g(>)8&}TYu2kpKj02w6D)eTJu*EnwYDcCMo;aQjIaV;66Vz&Y*WO|wEpO~bdX&1IG~AP(
zMWN*h`Yn)=gAJ^r59LkbR2B!%gJ*H+n%Y{hGBZxat4YqaxBu+Z)E>1Sv}U(cukyI}
zObzYOadPzK;yKpz!hVz}b7@%G+8=ApcjxD|{Z^uDkv?U)x%VA|tY#};E!vC~>C#V@
z+?&(`X^ZcCN*wN&Y(s4&TrGWGrALXs6nB;?><{a)l*shy@(5Piuc!}j%g!M3n{j`!
zz@BZcw9epl#SNy&U;B$7S^8joHxY>_dn0GokG>S(MMegIvkt*LT{|AYyaXACOdACt
z@psk?yjbqEm9_KNhEz4oeM8D0s&^Ji$<7~e`%oTIafQePc?Z)eaVj=~r@wX()Y4h(
zSoke(I@kU<>G0Grwl!vF9HkW&cy0U5dVPYT}2Qh-CXqDv)b
z1zf1PLabdgvtPxR;i8@lNVD%#%HK@1ZIKo>@KsfOv7UCE^1
z=v_a<%I2yPYrbX$IDOUXX(;uy<4xI5XF=gdzA?bptj};vF(XxRI9u(*-hbnL-s|@O
zP@g!)bszw(7#Y#Gi+S*f!dRqMud|{L7@whJfOCc43NK1ffy`*;v$vBkm%AC^5qsKut38lSH3OlELlqL
zsn1CdLFsq!q#6iRS}*II2k-hCSBa>^WIm#7qL-M}*I87y3xRm}(2)Yf!0wHjJhBJZ
zDGl$EwHG9tmM`l63_3U%2}@F&V34AbIvK*FO}I?B~Cxyv%DtmBj$^g)Z2i4DatH(#f6j+gzGJ63BCM
z#HX3gz)Xs)iftZb0&m_lj^-W-v_I}l3(!bgr=3f$+T=1D8x
zlt4~$nGHLGeXh@qTMO(Z6FRPllp$)ztZ`!vd6({slg`m)A02e{qlRiOixB7VVwyw=
zA$5{e@fqBT0iq7rJymZ%ntOcL^tj$5QZdXA?bx&@C6Ji=gKT_8MNz8amEgj}#8*UN4R?-l3MbP=>*V3}7pFMC!gBML#^h(&t2VMg;$~km~^k
zRTjf>*-g@6xP$9=`N9*fVU3a3C!~NYT3Uj8i&hKSq-hcx675bE%?c7JTDasnx_CV%
zJS_eWNV>*Sdtcu20~;aAbzaWU->WJ?+R(s!b6cJ^VpR6W{bp_RHqxg!U85d@o}}$7gBZ2;-BBU^
zfpHyr(Pw=oq(EBP*Y>6XVa;bA9Ti~q7jHnb-$&e935nLG<}X}#oqa-Lh7^O?#-dh{
z=)^DCCsG}Zo#>2qijCG9!zl-KdtF!s!yd9l2Mh;9i|qV
zu^%LF6LG(9Q-wW4=L|F7Hl{(ZydU~5#w={;lqD^jt_1hL7kK_3s?VU3j1g-9H)U3h
z{J*qM>^(^s$QlR8>X|iSCw5Pprw6}2`~BcR9iio`!XL~fvyu$!ZC+)5$3b88s%BhJ
z{WSTRpVQwfPvHaP`Wpef7aE%8ZsV?tWdC5irSlVrhPE%+Q
z{I#gm4^uo$c5uz$Dv)zl<3^j;*PhriFe(c9EuDB}I~g{4dH;
zttW}m`3qF}LR_0*P(mNR&+jcSI;IXebDVAd68kf?=rf;o3^cpE@iqZvJMT60s-s1>
zlqcge!7ml6)Jw13&UG+;xBTF)##6>3!KVF3(|Ef=lbrDLIe%JJ
zG4D!pzD93sELEMG7Sy*?rC*|bs
zX_^H`iRoMbuK!B}#dloUS0>)dG&yoWN|P$?>=3aNuAZ4)GTYz?zbOgb#(FhX3y;?v
z;_JS&9ToX;^0Z)?^>#lsSN!Vjffq6iu<74BVgUBL^XrEKzlC1|=zXGsc93Z2$^Bb8
zN6gmnRR;Mq{j=9v*W?_?bkVryufIFR7b(5WJ$N-@=_FT(Oe)Yu-C>dW;-&l?0S=Hf
zg*tW2iZ$ySH3aa-_+a4Tq+!AR&Cd~RMU{ka2}*@H_>pMJ`HIS@3iRmUBZm}aGyTI<
zo}-6&A-~sXPYG|H1a}}S{L1Uw<_Mm(Qu(W-GS)_2Mxp4^(N(VmvABZ!25kQ=8mLt5%PU&EqkLIuu{{rHa
zLWAA!>NJ%RO7ITSR2#0N4tM2*~-P2>w;=s#d4SZS3jTH6yqpD-e8%)N#DJ(oKO7v33H=Rj_R#cR_7zHGWA_2
zLRN!8{#4IwQF_p&r$wU%+kCYEDp=!NvHW4jjggaW^FlANOK&?*c1e*g;4i1!=D#}$
zBeF5;pmf%k54ZB!O6#h7*19WF(ET}d;N;@fy;*W*le`5XAG&bjT1=20z%JczlxK3l
z6fb`FHyRy(Y5h9ACW~!)--@md{`ZoOe0E00wWwhFg;Y>XXs3x(YGew}VNVLUP)}Jcyf+C!X(ZmMG*rzZ9sfDTx4sEby-+$?#X$^f^
zHsYJV^13czvCx;ZAJ?ATZ=BO#7Y5Na5D#ylzU@9lKV_bI}v
zUzRcIA%U8cR#8g3P`c#T+s}56^_6_OX2F9${j0nvuF1*Ml|mr&IT7?XiWhZTLCAog
z7`{K)i;u7088*ddf{zfldb+HX^%*i=KbXLIFXugPYDk2D3xwVJ{mCOq)-heFIw2X&
zrFqe3;lje3HtVZyQXyf$Jy3nz-Im;wZGtUd_B-0lCT$?hXD(~NYm0x`JbP%I=ayYM
zy$1^nos-D1m{`si5+
zakg}+Gy5gk4Lguf%@*rYhpi}F0-^N6wj2xs9Q3o^TFCF;J99M0LY1`L6XE=|h=!z|
zQ&#YPk@iaiedJot-czGrv#Q^6R3^mzp!P{ndaCB31D#VBz5{YM-?Q;Ar1BNJ2^%zN
zP5F?Q?P_0+riLv|{u>Jum$5Rd-)d#B06JrTDjkGGPCydlbnzdFOjnZ*kV
z3l4?lr7$LcQ*8Wh#3H{pT{m?v6~L_1=fQc`)+lN
zAHb${mWTB}I}p3}3=35S=sh$%#(M^gdQ!_aKEj=vvO^fUrMxm4ZJBV-A)J5V!N
z)I_*?9Q;Ek@w-uJE#<4!n*--)G)ip&2;kEq`@jbqdIor_x)DDvQv3_D=N^e
zp-)8)tO5dnj2v0lmo}2e3S)jF`aX0r{aSQ_f!1fQ=d0_rL|uhRd51oPR^bHcB99%X
z4?g8$^UtVFreUgPpY_m~?+-S=%?24n4AL2gEx@HY<wuUBdIji5
z)_?*n93l1Ux^YMoafdeIfO2P5hDyrxpd1_UcD9X9TmWqBHpu$ve}Z+DY<&kKv-
zDwM-{7G8G$H2FUn2BX$ug)inwvD4#(>4Db+KY$^ck8c|gXB*z3VC}Q4%3RP8c(TYL
zAAkhE5bhs_?Ncv$d*QWf^et<3Gs@26=B8SaP&-(bA|TiN+Khfxq%
zcOHx=Pych=Kw4=#kYY9+b2jyXkxW7P8dAq6tr{HQ!%ua+1nD3u^tjU|P
z_s}^0W52&`<;nE!DQ76J(P4257)CX6Dj^zPZj7;?-tGCAM!mgS>3|u|XY~@`)qv7Z
z?$QCGiDeyI0^3>oJEm(dWGz$eEC=feZVxy}z;caDlQ$WY3t&47vEPKIvjObUHg`>Y
zZ^r%C3-D<=z#0(ztgu|o%2a)LqUw%8%+@M;OSv(ZvlfNM=`B&vv~GvzKa
zvTa{(F55}X&Irg`5UD2J^ZC&>%tdQ6d0}x5Z-l^)giIkY==r2tBfmPoo1kvf65iA!
z@_U>xhcy@kJ8J$N7(8K^*aE8_P1jW`e9SMZFd&{0(P8C=zBU0CyCXqL9#HPpbJ?%l
zkH5MM@%PLbf&RYniB@6G1a=P1+Oi8UoV_(N3LGBp+pv(#GH?;1`GuEP6U`s8ZnZbz
z=ABFy+5D@=DiwPfV!u2~LUSY65Vxzvx-xPfTyQ+)8`Oti&NnvYm;RZmcGZwlQ1-*c
z%m`X=;TOKjNzd-IB8vwhUhB>UM$1-o;j#LVKJQ-i_i_l(5$_H<~NX&o78?B
zZnK->nPXnt@CH}%iNMwh+>6=Mo7B3e>G}A!LO44sIC`F)?=k^!lQVJy_+)ZopzIYp
zB-G%UFO%=FIWuECg#*A%Lf;eZz#1BzTJmKm^crtVfU3NZO%6x7U;4N546P$IrN_cW
z;cVEM@fkwiL3S5aknvc;#f!gnM#e}1!vX%P_hLaK0pwAijISx$9sVI*u0JIn!N_r;j8ami!i3VrvV*h
z4Ok`T1?en^(84|Ons_Q~eD;G>Sqor^E-@(XXa{5hk2d)9zxctO_q>W!Gg(jL6dFSiWG)n}6X0tayh
z4v|pgmZKbjny$HP*1TLo6+BODr_|I08+kVWVx{i&RQ6Jh@7R(9>gC47WSj1yf*xr%
zC}n_2vckKa&r+Co^u1Q?kNg#^TX-{m<;}84Y`wY?l^QTOjS5udsz{NMcvu6nSRHld
zlB#m8m`~6rgy`H>kI>ur-EC1u$U?g4GkR;N%j1cL)tSdO*blRcb*rw#o19cMI;R$~
z9pF6D9$VddpyipslBDZuU<~8?33el0<&kR0*zl~XV!$gshvG%&<|5_-KegzTwg~rjMVG`!5ewSzn}mYC^oU1;aJ^o_L~+eW
zQ5lq34IZ)UqugjerB-xKJ+>Cc$XVsN9Wzg0{NV%2LFcTqhp-XMe#^Vj8S9R`rx7i@
zephxTyjT^R{a*-S9@I1id>&5kL2Nd7Btg181Zaz*<;
ztJhU6H_zO_Nf)7sb4R^A*F5|pZrL^`tk&@n3RAKvO6QL@FE{4@jS2pmglTkXdly{P
z?jq4Sw)8MS|LhGypoR)Vd5O!?ptm<~qDUCQh_ND=#j4kdBQc+2r|Q*5>k&sSQm)?m
zm-J^P%=~O{uiiheqv;QC{T$&%1=@b}+0&S_znPo=ly{FBQ6kLtW(jUvC_G$szh|5M
z^4brR5!MD>W8*)06K3GL&4I8D_B}grQhNY;Yjhpq`sQAer(C1wZhE+WN3$CwbM)_)
zkZ0sbc7U_iGw`5BHl|?9TE~G8FQN48{5NOjUc7BqMKw7P>%Kg$h{dOe^-ZyyXjRZ3
zl!jOgJIj>efIocPL;mmaO#ySaId<>6P4}LZeSJ7+U611&m_t{jgCGDq<(es19*v^|WLz;A63qF`+M}hT;C(7^
zI%Du3y2Ssv)U+<$3RWeA{7#NNsX}0`kLwTZdF;+)z=3J2M1D&>Mt)IwH7DHf)_^1h
z#F^CrdEZ(4*Wf1$(~ykg9D=+306k83{XNl9eoOI4Lqimx>5nb}p%g5BjhIldj!vOL$@uQB@EdPxg8m*tbIOv}q!FbGY$s`a!1$Q8rxdAmOmLvHT?f2<2wcjGC
z{OD#)b=y2T#!p>__vZm51AQ`$Fi+u@tHhTd?6dNPwO70@Uu0!eW|0HR_uK79X)-~@
znneyw0k!`)GrT};M3~-*GAy;@!+I`LA>#U3&f>2V2cv=51ofyWKSLaaq!0t7Kn{ll
z7Y4?gF3yG1eFI+jbhGBCr05yjd2Mwclk9K}l~%+0M{pN`#bHLw-^o8WgMP(u#mty|
zUPm*>UU>FAxT1$wlY|rUgPtT{EyT9YHi`Vp*3rc}pv8i$Ly;1AO@sKm8#pe!TPw;6
zj1Y4&dh!7OIn|W6+bWC6i04cihQ|k^Tzp{$ggkj7@J6E-4T^;1UzQ)d;>`^Cb+P*n
zhib4t8BiccLQJi$AS;Pm=f{uvGBQBZm&_ekMjd3pd4E->Un13=J8vYqWSMZ0N0qRII`!HWnC}n?j79!
zH|f6YQ$+E{|Kzgd1XFCJsOt}E`T&3=%%i2HE>6>Lh?5#9r++;jFtQPl3u93%>4O>r
z0m1YQ7jpCgVq!(43=TKkS4}B`PU4=_q9w_j!2~NLrjo{x^5#tzAV4%|LOeq=QE3Yq
zJn+$4831dYrI12@?BrvccF{)OOlOH+rZSU89TccQn_$E0m4eneGM%xeS8qa8i11*YSrli`#=3oi$xYSUHhI(MA9F!fN!eXKfT(cIwU6G>Rf)}i&^ln2A{-@a`nTRwUI
zoY^Os9;nonB(ExyCUN4gW{)!^{iNQW3Wh9$-d~C6NpbE?F_XY;+ELv1OFM1=Sn-%g
zZdOpZCB;}ef_dbV{Kcmc&x)EMU#Goj9^a!e0OQdp@C9s_A!?Q;WLD>$f3WAA{}GHy
z%WJA59IuU!=YyILy*^fbE<=^RKRBwemmjjNwJ(CV_RcqMU%Pv29s18Ck2hk1P!`mk
zL^B2!oR<5wy;56I*W(KNmqWIXt71S$#njYP&~jG{ue9{E?{03M%0!(TUrckq(b;dY
zH*@Y3Kn9j;ABD`tzR{4+=Hl)yTcHi5HB^I3WmvM=%;G_B&JFZxHkUvn3FwZC9YV^t
zQ&8Uf$6$l!52o)wc(v1A{4>w8qjhv5Brin$@3(kP7ZkuG4_0xSsLsW?gxmOd1g@bw
znq9=JA@Tz}$`CL)QZQi>@&i!h^z
zTh3ed$N8p7c?A9cHaGk4K}y!z*)J)el?ZzNd;UIj_Tu}0ia}J|pc6=u@!f7J{SNZo
zJfG|HycKruQ25N266mP~tw;Mw2vzdx>1}^E*e#uVt*DpA$Snz?KSx5>ka8C5{
z#v|5YrgT(`u2NZ#Hr+URI&SZKd-_mJTg^2tQh}}@v7}FyH$;P4*p6<~Wrw`Y6F2Nr8$E_rK!s7O+6E$mz)hOInM8=Qi>jHX{N!Vg)L1)HnmchwM|6F*Yy2%%Q>%#FPp
zau@T1&BMp=1V6v;<73bb0F(p9)=bAi1Hna5*aOCz#EWPNfb#;4&tZ%K|1R6n5?2|&
zu$`tjWiITTiQXB(E{rSXRpl+hA6fKImsOS#KKa(7SVfXjiYuKLKmD$g!5s;3&%quT
zp<^ch_&VYOskoDSZA&n3zRgRR@tokw;KwD{=Ta-3P_skuOZ%!&r8FTa%K7bK`XtKA
za11(xi+hWOPSy5b-w$E|`^60Y@;B*gYdGfmTeh?W{c6tq<#fLUpJC8y`>~M`g&#+p
z>w~u~g?$G7!-5G11YF(1n5ss%-8??t!sf_zqTN13!zE$r-O`yc5_=Vo^E*b~R6fud
zqyrNBuN2l3zLv0eIjq89W{Z5M0;B1ynKF0<@>mc#U+K6+Hjm?3ALwZ75sdV~yW_&~
zApAbtJXZf9^U}k&3C0vaOMm~L4r=hfOt<RqR)NOfS@B3g+C3bsI7GLqb>u814zA@
zFZf~7XRC|xQUxDl_w~im3vXleAuR)2H{@x{JT!0h8nPS%gUB`
z#pt&Ztq2L}JBuuGV8y=+wesysF0f&U)_wMmCX4#~kRuJ2>)&^k(B4^Q?2?|I&Ou$W
z)gK)^21+yOif+8U4eD_w*C2p9^XJ(U
zN8)}fFNk>{OodLBJ>T>V8}j2V)8qaJ2sL24M6=`n@yFG6iRYiTA8N0>!;Rnl=bDWF
z!ORcMj2}R^AV%!_?}QZ6{e$G`ROaq~-fT#(6{FlDx2PF6=7@F+Md>
zQKGDJb~?{iyR!DBc{t5{^h#&VM87@zohfX31ru5Y-8=3|Hj6TZN4yfzeg+M%MbkwR
z%B1`1p5I4+_u-GIFa-v;Lm4T!LKg+iu$OhVoA}PjU)O
zmaU{jxE!`?4is;5johvUaT2jET85sw{CEB$Gx3+}qKtGCFI?PO1825HX`sSb?Mmc$
zD#}`U)coB})j^M~i1)yC(fDhRrJ(!
zZfX(NI^?P8Bh78+QH7f(SdYSf0ra+Z`tnwy2ILUgGdRSxKEtAQn#kol2R>W9{?>(i
z6x@%c5t$ct{H6Px4E)LX_x-@21_#q-A_#RWy(D5K#c^?MN-)RYGVK$1r7IUJ{An*E
z%XxCS$Z6e7!Z$v#)2^D`g{2thX@)PSG4AjjcDR7$^Yg~fayg5vn&!n7+-eYMud4xEt`CWurPMM|;bp+8a
zHGL%C1THslIG^_fBh5azM7G>iM_wvfkGi$7zj}}44a^4xPVLNgQ`G(s-4vG#0IK?d
z=Xzf(s*gm*1HD_Zjkb6HK1y+8TblMX%+cYQn?HB|54zdh{ksdITgQVM$OY87&jooY
z4mjtyS;D{;inVsG{Mi7;>%)%EWft<8^x!}H2kbuqCA~9gnb5YM_*S&9$xC5H`HN->
z1t)pK*MXdaJ<5cKa&wRj-CJo8m&~IBMYS3xvo0>F@rzH>>7IWLH=^AG*O?gy#0F&+
zVVZc${GbR)EUHy8R@UHJoT(7Rl=L20e;OB}XHwcG0s~I}HKjz)QKu{qJHaFh(=i5<3CA{2`ekeK4$~rGG_-Nl$$l;{DXMXlYzCMUh
z{{cjXkGov7Fyys`MT0GeDoQ}Wh%A8J3n0b=UO?bm&T8K_e-5
z3P~tQKv)7W@P{wIpP=DTa6H&H~w|E9RmGXO56hV(MouxXm-+*dMBoSd%aT{&F>3sL^>QWT4^V
zyQ@h0WBJ*y#rLF%#R|n28FNd}SuCk3cA=OEZ}ybr0mzd#7yZD;0EAAXR9AHb2D15I
zgOt;EBINOom$~!E{caB1ri{hn@l#8g3K%`YijV@mGXGuhK7!VbhfIu`#;d^oCiEz@
zZ$2A%3xcaV>N)Wht9v-B3Wa!k^%c4jklnof^$F^A
zdU)wU4CU5nw%B}++m*+}rf>hhY)cGAGXIiOV=NC&MVIJsuQmLSQ+;4fj#D`Xw4?i{
zt4Jn&a$DfQzm-n=_jDa7xu$3bXxVuPGSjmEGSg_je<8n(>!kNF^W|8KT*6SsBUkTaJM7aqWZ9yW=PQj%xO?K70YXz8f
zl_F@5EbW@y{SQbA51KIM53)I_cj>N=mYu9w9PooL+q~dow>`B!9s46X&-w&ryUw+V
zzdXChc}_~pJ%7-nxgav^=#sc8QCqbUlqB7T{czHI)-7DaS~1`6#0tKf6`PKYTS)Y5
zezE6DB&lwvYMUi^5G>1%Kl`ytm#G_WB|610A=o`xWbWFR2j;UL(ESU#h;!6())&~^
zX(FeuF!t>&D;m%4o(@t^Bq4LX%CT{F=wP@_G?x!AuPXnc@z^qDw)7o|>QB(2!BVp)
zW1~A&Q$y3~c8s
z!ymc%pkJVDR}&e(BMe})Ha3bVf5`Q+d%ejI=6K+YPP0A(QqF7MBG#F+=QYhIGKpF(
zV~J_|Ll=XUaJ;iz0$p&8Uzq8Y)B|EyXKxz&Et!T=5%+fKS>cvbnXzL~(Ekp)!lYWg
zot@rq(?s~qli`}`WG+jY;C>bK=$_qQNo{FNTCRJpAoI3oxAWL4noHn}^vd~Gqh(Rz
zB5~+`n}NNsQ|R=$fEk-+U`1+%b7fEQaXfkh<#p($#7W|NZ*Km}Dre{|+C8B&sYg)Y
z&C7x<@OHgQc*Bl7KD&Vh#SZ3wkaRv-a8^R0Y(}71!3!3;PS1*HcY8dHu86kUR_l)d
zFYQ$>nLbn*cI^%bRK9pzoUxPW7qri4>fsPYvg)7dbZY=ubi?{Y`K@$s_fvcB=HA;K
zsFuCD?`)BZ@O%19_^awxq8Z(i!WZ9^bOfIVogGzlFyPAsUi{$Ohil*N=naaRGG*QZ
z<5DHyibu19>`Crn&$^mTv_2*F5#u$IE13QY`KK%$FwoMS*w@zJ6Lqf|9
zmR97C
zSWK@*T|_v7z^n)N6smNBm*5(s3AJt0LkT3@7F}2|GgvOL07ChArL~PFK7jNwrj!ITcdxOe)FiWCCG@YB{@=t^atUOyi6O3ch}#?F*-F1Y8#eDlf6;QvWDxuFCgD@3fli
zbw9_K;&*&{T869HgxdRMSOObB%3=|um>i$Jykm}BWRQDrirr7)+w`;Ng5a_BSup0Y+
zpt`MWU>OzUtG<;Y6beCXnaym~W6t-E7+(d01eciAgN4!+X2smx+;7daVD=n=t4Ztt
z>9Dd?TU-9dUoEe}q--ZM9$o1}t14!YNIu4b`bOsUN7m8xpJ4_OLqpmz3rymefCuNl
zxx%0u#)m}zsYW|Uc|rdv!KGO0yy}#Z^%t13{{%guW6O_NfbOezZ;!vB>TS}=;T71N
zU-3YyfzxW^8lmj|2kQr4(%D*flOEY`^NA4axPQU(C9OLOW_YWrWaZSo9GgdZn@Vq_
zjxD?X({hOGfHKSj7Fsc1Y&Go^T@U{c=YEf`3wVY95=TC|v+YuKU~dX9!OjlyxqZ!V
z!YUg^wzTC6fiZDvtY*%1m~Zm!(uNig;Ncu4ZvE6w^Q^bt{}E+
z9DMsWfk%vwoH**^8NKZvXu>6%KTS_#_ZkkTw0JG1P3qoF>#IF}vqI-f2u~NjYqy!W
zxBU@1ARwhscud;z@R5S8IVBIG8urLLT57`DE{ARtZ;|^*CfrqvU-)5p&6oNTUwaZc
zE!6a`aTbtKbx`Y^T*;{IyJ!Ae^pPOcKJaldVGH5xZnFu(I`qaoMP-@)c=cuW<^!ni
zM>^Ru$K}nQw=se4WWT0G*OmJ1r+>~Y*VZO{VW3OB_c3{TapPUz8*uxCs3!#}#SjdR
z<67(-|eR(=B`LOb+LSo>L=q%?)d>SVqKt-Mi
z`6aIhP0o=Z5I+NhO-*Hi!lkTBvPjYeFcBaeA_aHZH2ssdU@X8;*MLC0X0;dMn-SE@
z*!WYh>@_2d5%J^wS-~DGzq@wTs75`-$W^fmIaI0^qsil+g3XN1uNt9pc?TYUhYlPs
za~<5SB_eUW*N5TTEWNYwhjNKp^0jEeVOrNigFKF*9J~-PRYJGtP$O4cvDm}rCE@3@
ztlr{<``DFVChU)q$QT_C*VhmPUZPJY>j?OA-Kx5M7mG1w3-%-R1)ZMOHnz82*7lq8
z>?Y4o|LX<79Zi`Cui+nPpIFiG2^E
zpqhKA)+blPc%(Bp3P!+aOM?W+gPOAtT9qt3IdKSMm(Ha#>mz<8C42Mv{nOqbVL1n{
z9Q-$Z{OleWcBjq9O3N9)lPHxS#;R@{z;4VUGCtHF<#KX1w#=mqeBPiXwVk+?8oqQD
zxLMy`@JxDTU38FR4OCM6U}ocH|AZ|TIpi;?QZr;`U&w7kz!`N%gl&s*l0rr_L?>Te
zAR2jr=Guy2AgJm50Oc;v7H6Ih0-m)Z6P6Q^qwx8SmU&65o|;1{z`&l(6VWJP0OLtv
zEgh5CONDviD>x8=)&T!#`q?3!9)?1OeB3m&r}%z?ZzUBF!orggG`0Kk-c8k9Gu)qN
z3nnPPgMqJBK<(>8%zYoS0Fb|l^Ech}(tM}3XQ{-|OtF7ZSXLG~q$KcFrtjS)w)?kM
zRu?801v2$e-LG~t^nA-bDHD+kPxz-~79>l-H)=WiU}fK;lqdQlIgW?XF_ETU!MHUx
ztVq6O9h)9wzG+0)5B{kV@J}F|H$VJ6)HRzTZLLmnc2F4cQ7;9lwrSJ*TwNW>b`f;y
z6c_*KJ#&8d5DhMY{$?m})mZLScy1G=^KQq1$Mu#%hG{SdxRFN{xUPpIYp
zRoQm{HPwG<-vH99ND-uo3eu%W?+8ehjf59IAUFpZv%PUThIZusn9BAKk{=z>Hl8{D3Vc}0kF0Qh=
zGB}(w#r9R&#*+jnIcopcyuDPZXk;byHIKsOO;OuuF|YX-6}2GFYAxNtWT@SHRi-|-
zDf{lNal{bg&$1FI8<7H-(ijaJ(G7qqNTXcMdrVABr`VE`5_r&sYOF}m3SB1p?j4vY
z`ReIs6xBj0EC^MdhS8sQVf^-+ux}^CU&5yTr8hY|_sj(OR{O43i{_h_e3yd22WAr)d~RFXf8nPc>6nSYID)hFc9GoK;N-vu(rjb;qE_Pxj#OTzzY-H2^5a`KE~*rbjO
zLUduHEEH--yMFMf8REkRwmm7he(nmiTyMV}<&8S;SJiBOUVKwtBFI(j()wFi=Rh(m
zU-Q|e(c?<-s`X&vIU6((GP0f-rmu&6FxKyPd+s!|nGOx;Mj+6s=At+fQU
zeHEJSN%{JM>`v)@^n1taCBkhLa6yN~P+A|33q|wY@R8@QSiM_gB8aRaz+L}d944uLyd|erd3Xt}(--&GICIEe|dG
zvgxu@oJAYHxA;oXPR|0vJh~^gZ4KUuYP1y3J+-~lRk1jg+r^}8y+9RaC`?A>@slHqV+}<~
zT7m=UIfB^bi0TlAPDlX<==Zcb^=_z
z(>@@~=$R>U6BB5{sDM3AWflnz(9`{o>Py}=7x#@l6uE1M7?>w_pUZc&8FB?*0a_{#
zkdvUE>IHc3mAd&PVeqmd>+_@Tp!1A4Vf+3h(=ibuxobl?Lv^5rlf`$Upjfy4*UD>0
zCq(E%Tg`_o3RzHweU`XOX*Pf#g?Q6&9auxJj-ds3c1e=!H-*4?7@|BXPy<(j!$UU<
z<>{9FL0D-c)okVNQ)Pr=ekV~J^!KxPmx}M<-|^SJE~2K#1|Z;m&2ZKG-G`BUwWlAe
zL+wh!Z2G?5YRXf6=VS{UEqfarCiWdNVsr`2e5HHTwdAfhBzeiOv^$TJxR8Sin{u?>
z8oEeer^pGmp$*%&iBZy(G``mV_XAf5?jw7kkr
zCx7E;l~pOEmd3oRtqk`Up{dXyu^4