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
Date: Thu, 1 Aug 2024 18:40:42 -0500
Subject: [PATCH 05/37] distress signal admin button (#3186)
## About The Pull Request
A simple button that creates a announcement on whatever ship your
hovering over!
![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/a38409fb-9530-47ba-9c77-cb28e8e75645)
![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/6230d9da-246c-41ee-8e08-7453a275c400)
![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/4317a4a6-0a6b-4550-89df-47a7248d31ca)
## Why It's Good For The Game
Should save admins a lot of time
## Changelog
:cl:
add: New admin button to launch a distress announcement quicker.
/:cl:
---
code/__HELPERS/priority_announce.dm | 8 +++++++-
code/modules/admin/admin_verbs.dm | 2 ++
code/modules/admin/verbs/randomverbs.dm | 15 +++++++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
index 65ea832c0e0b..fb02a93e144d 100644
--- a/code/__HELPERS/priority_announce.dm
+++ b/code/__HELPERS/priority_announce.dm
@@ -1,4 +1,4 @@
-/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type, sender_override, auth_id, zlevel) //WS Edit - Make cap's announcement use logged-in name
+/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type, sender_override, auth_id, zlevel)
if(!text)
return
@@ -73,3 +73,9 @@
to_chat(M, "[title]
[message]
[from ? "-[from.name] ([from.job])" : null]")
if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
SEND_SOUND(M, S)
+
+/proc/create_distress_beacon(datum/overmap/ship/ship)
+ if(!ship)
+ return
+ var/text = "A distress beacon has been launched by [ship.name], at local sector co-ordinates [ship.x || ship.docked_to.x]/[ship.y || ship.docked_to.y]. No further information available."
+ priority_announce(text, null, 'sound/effects/alert.ogg', sender_override = "Outpost Distress Beacon System", zlevel = 0)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 9c4f15b9d460..42193738319e 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -103,6 +103,7 @@ GLOBAL_LIST_INIT(admin_verbs_fun, list(
/client/proc/cmd_admin_gib_self,
/client/proc/cmd_change_command_name,
/client/proc/cmd_admin_create_centcom_report,
+ /client/proc/cmd_admin_distress_signal,
/client/proc/drop_bomb,
/client/proc/set_dynex_scale,
/client/proc/drop_dynex_bomb,
@@ -254,6 +255,7 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
/client/proc/cinematic,
/client/proc/cmd_admin_add_freeform_ai_law,
/client/proc/cmd_admin_create_centcom_report,
+ /client/proc/cmd_admin_distress_signal,
/client/proc/cmd_change_command_name,
/client/proc/object_say,
/client/proc/toggle_random_events,
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index f189fdf6106d..853d33e1b61b 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -360,6 +360,21 @@
message_admins("[key_name_admin(src)] has changed Central Command's name to [input]")
log_admin("[key_name(src)] has changed the Central Command name to: [input]")
+/client/proc/cmd_admin_distress_signal()
+ set category = "Event"
+ set name = "Create Distress Signal"
+
+ var/datum/overmap/ship/ship = SSshuttle.get_ship(usr)
+ if(!ship)
+ return
+ var/confirm = alert(src, "Do you want to create a distress signal for [ship.name]", "Distress Signal", "Yes", "Cancel")
+
+ switch(confirm)
+ if("Yes")
+ create_distress_beacon(ship)
+ if("Cancel")
+ return
+
/client/proc/cmd_admin_delete(atom/A as obj|mob|turf in world)
set category = "Debug"
set name = "Delete"
From 3d0cad2083966db199e7a8ad32050f61b759a282 Mon Sep 17 00:00:00 2001
From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com>
Date: Fri, 2 Aug 2024 01:41:57 +0200
Subject: [PATCH 06/37] Reduces prices of first aid kits. (#3221)
## About The Pull Request
Standard: 750 -> 400
Brute/Burn: 1250 -> 700
Oxy/Tox: 1250 -> 500
Rad: 1000 -> 500
## Why It's Good For The Game
Those prices weren't really that affordable in-game. Spending a 1000
credits on a single medikit is kinda goofy. This fixes that, in hopes
that medikits are more used in general.
## Changelog
:cl:
tweak: Reduced the prices of first aid kits.
/:cl:
---
code/modules/cargo/packs/medical.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm
index 08b576937138..075c0cc40895 100644
--- a/code/modules/cargo/packs/medical.dm
+++ b/code/modules/cargo/packs/medical.dm
@@ -9,42 +9,42 @@
/datum/supply_pack/medical/firstaid_single
name = "First Aid Kit Single-Pack"
desc = "Contains one first aid kit for healing most types of wounds."
- cost = 750
+ cost = 400
small_item = TRUE
contains = list(/obj/item/storage/firstaid/regular)
/datum/supply_pack/medical/firstaidbruises_single
name = "Bruise Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing bruises and broken bones."
- cost = 1250
+ cost = 700
small_item = TRUE
contains = list(/obj/item/storage/firstaid/brute)
/datum/supply_pack/medical/firstaidburns_single
name = "Burn Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing severe burns."
- cost = 1250
+ cost = 700
small_item = TRUE
contains = list(/obj/item/storage/firstaid/fire)
/datum/supply_pack/medical/firstaidoxygen_single
name = "Oxygen Deprivation Kit Single-Pack"
desc = "Contains one first aid kit focused on helping oxygen deprivation victims."
- cost = 1250
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/o2)
/datum/supply_pack/medical/firstaidtoxins_single
name = "Toxin Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on healing damage dealt by heavy toxins."
- cost = 1250
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/toxin)
/datum/supply_pack/medical/firstaid_rad_single
name = "Radiation Treatment Kit Single-Pack"
desc = "Contains one first aid kit focused on reducing the damage done by radiation."
- cost = 1000
+ cost = 500
small_item = TRUE
contains = list(/obj/item/storage/firstaid/radiation)
From 4e61602a46ddefa2e22c4b63438c1c52feedcc7e Mon Sep 17 00:00:00 2001
From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com>
Date: Fri, 2 Aug 2024 01:44:06 +0200
Subject: [PATCH 07/37] Coffee jitter nerf. (#3217)
## About The Pull Request
Variants of coffee (cafe latte, iced coffee, hot ice coffee, soy latte)
now only jitter on OD, same as normal coffee.
## Why It's Good For The Game
It's annoying as hell to jitter all the time, just because your
character likes coffee.
## Changelog
:cl:
tweak: Cafe latte, iced coffee, hot ice coffee and soy latte now only
make your character jitter on OD.
/:cl:
---
.../chemistry/reagents/drink_reagents.dm | 24 +++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index bf13904972bf..d37048250e62 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -316,17 +316,21 @@
description = "Coffee and ice, refreshing and cool."
color = "#112a3b" // rgb: 16, 40, 56
nutriment_factor = 0
+ overdose_threshold = 80
taste_description = "bitter coldness"
glass_icon_state = "icedcoffeeglass"
glass_name = "iced coffee"
glass_desc = "Iced black coffee. It's still going to be pretty bitter on it's own, though!"
+/datum/reagent/consumable/icecoffee/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-40)
M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
- M.Jitter(5)
..()
. = 1
@@ -335,18 +339,22 @@
description = "Coffee with pulsing ice shards"
color = "#132043" // rgb: 16, 40, 56
nutriment_factor = 0
+ overdose_threshold = 80
quality = DRINK_FANTASTIC
taste_description = "bitter coldness and a hint of smoke"
glass_icon_state = "hoticecoffee"
glass_name = "hot ice coffee"
glass_desc = "The wonders of fusion mixed into a cup of coffee, resulting in an extremely hot-cold drink."
+/datum/reagent/consumable/hot_ice_coffee/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/hot_ice_coffee/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.AdjustSleeping(-60)
M.adjust_bodytemperature(-20 * TEMPERATURE_DAMAGE_COEFFICIENT, M.get_body_temp_normal())
- M.Jitter(5)
M.adjustToxLoss(1*REM, 0)
..()
. = TRUE
@@ -617,17 +625,21 @@
description = "A hot beverage for those who can't handle the lactose."
color = "#664300" // rgb: 102, 67, 0
quality = DRINK_NICE
+ overdose_threshold = 80
taste_description = "creamy coffee"
glass_icon_state = "soy_latte"
glass_name = "soy latte"
glass_desc = "A nice and refreshing beverage. It goes well with a book, if you have the time to read."
+/datum/reagent/consumable/soy_latte/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
- M.Jitter(5)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
..()
@@ -638,17 +650,21 @@
description = "A nice, strong and tasty beverage while you are reading."
color = "#664300" // rgb: 102, 67, 0
quality = DRINK_NICE
+ overdose_threshold = 80
taste_description = "bitter cream"
glass_icon_state = "cafe_latte"
glass_name = "cafe latte"
glass_desc = "A nice, strong and refreshing beverage. It goes well with a book, if you have the time to read."
+/datum/reagent/consumable/cafe_latte/overdose_process(mob/living/M)
+ M.Jitter(5)
+ ..()
+
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/carbon/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
M.SetSleeping(0)
M.adjust_bodytemperature(5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0, M.get_body_temp_normal())
- M.Jitter(5)
if(M.getBruteLoss() && prob(20))
M.heal_bodypart_damage(1,0, 0)
..()
From 562309edd171d790d14c0b7f3523f32f7b4e22c3 Mon Sep 17 00:00:00 2001
From: generalthrax <139387950+generalthrax@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:44:16 -0700
Subject: [PATCH 08/37] makes the industrial jacket warm (#3251)
## About The Pull Request
Gives the industrial jacket cold protection
## Why It's Good For The Game
It looks pretty comfy and warm but isn't. It's kind of Strange
## Changelog
:cl:
add: Industrial jacket now keeps you warm
/:cl:
---
code/modules/clothing/suits/jobs.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index 56018c288b6a..994b4cf7cf6d 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -114,6 +114,7 @@
item_state = "highvis"
blood_overlay_type = "coat"
body_parts_covered = CHEST|ARMS
+ cold_protection = CHEST|GROIN|ARMS
togglename = "zipper"
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio)
resistance_flags = NONE
From ed9fb0cc272c511c407fed9e20f19a7455324289 Mon Sep 17 00:00:00 2001
From: Theos
Date: Thu, 1 Aug 2024 19:45:05 -0400
Subject: [PATCH 09/37] Attachments are now small instead of normal sized
(#3257)
## About The Pull Request
Allows attachments to be carried in things like boxes and pockets.
## Why It's Good For The Game
This is mostly useless since there is very little reason to not have an
attachment glued to a gun after buying it, but suppressors being
untenable to store (either taking up a bunch of bag space or making a
gun potentially impossible to stow) is a bit silly
## Changelog
:cl:
balance: gun attachments are now small instead of normal sized
/:cl:
Signed-off-by: Theos
---
code/game/objects/items/attachments/_attachment.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/game/objects/items/attachments/_attachment.dm b/code/game/objects/items/attachments/_attachment.dm
index a6c25ec8cdf3..dbb7a111355e 100644
--- a/code/game/objects/items/attachments/_attachment.dm
+++ b/code/game/objects/items/attachments/_attachment.dm
@@ -3,6 +3,7 @@
name = "broken attachment"
desc = "alert coders"
icon = 'icons/obj/guns/attachments.dmi'
+ w_class = WEIGHT_CLASS_SMALL
//Slot the attachment goes on, also used in descriptions so should be player readable
var/slot = ATTACHMENT_SLOT_RAIL
From 0ca4542fe51207fcff0f84d16be5f62623a0f1cf Mon Sep 17 00:00:00 2001
From: generalthrax <139387950+generalthrax@users.noreply.github.com>
Date: Thu, 1 Aug 2024 16:45:25 -0700
Subject: [PATCH 10/37] Cargo Typos (Contender) (#3259)
## About The Pull Request
Beacon got renamed a long while ago
## Why It's Good For The Game
Yeah
## Changelog
:cl:
fix: Contender is now called the Beacon in cargo
fix: .38 is now .38 and no longer has a bunch of random letters in front
of it
/:cl:
---
code/modules/cargo/packs/ammo.dm | 2 +-
code/modules/cargo/packs/gun.dm | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/cargo/packs/ammo.dm b/code/modules/cargo/packs/ammo.dm
index 605c0facceb3..7cdf04e25a2f 100644
--- a/code/modules/cargo/packs/ammo.dm
+++ b/code/modules/cargo/packs/ammo.dm
@@ -81,7 +81,7 @@
*/
/datum/supply_pack/ammo/winchester_ammo
- name = "Flaming Arrow and Detective Special .38 Ammo Boxes"
+ name = ".38 Ammo Boxes Crate"
desc = "Contains two 50 round ammo boxes for refilling .38 weapons."
cost = 250
contains = list(/obj/item/ammo_box/c38_box,
diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
index da10f0fb46d1..8be226860346 100644
--- a/code/modules/cargo/packs/gun.dm
+++ b/code/modules/cargo/packs/gun.dm
@@ -149,7 +149,7 @@
crate_name = "rifle crate"
/datum/supply_pack/gun/beacon
- name = "Contender Break Action Rifle Crate"
+ name = "Beacon Break Action Rifle Crate"
desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
cost = 2250
contains = list(/obj/item/storage/guncase/beacon)
From 48330a5d985f2c7209ea8dfbb36c15cf07289f43 Mon Sep 17 00:00:00 2001
From: firebudgy <153147550+firebudgy@users.noreply.github.com>
Date: Thu, 1 Aug 2024 21:52:00 -0400
Subject: [PATCH 11/37] Additional sprites for Vox - Inteq and NGR (#3255)
## About The Pull Request
Added Vox Variations for the HV outfit, the Blood-Red Hazard Vest and
two NGR hard hats. Also resprites the Vox Vanguard Battlecoat to closer
match the current iteration with significant help from
Rylie/Retlaw34/Ryerice.
- Honorable Vanguard Beret
- Honorable Vanguard Battlecoat
- Vanguard Battlecoat
- Leather Satchel
- Blood Red Hazard Vest
- NGR Hard Hat
- NGR Foreman Hard Hat
![image](https://github.com/user-attachments/assets/e301f60c-2a23-4461-be34-e039301f339a)
![image](https://github.com/user-attachments/assets/5494cba3-ab60-4a01-9c28-26c148bf594d)
![image](https://github.com/user-attachments/assets/4857d900-50f9-4f92-b8a3-b9059997b3b0)
![image](https://github.com/user-attachments/assets/b2c6cfa0-318a-415c-80b0-5e051f3fd7ca)
(honestly this satchel looks pretty bad in general but I figured i'd get
it out of the way)
![image](https://github.com/user-attachments/assets/153fabb3-2ef3-497f-98b0-a98601232e24)
## Why It's Good For The Game
Some of these sprites were some I saw people sad about lacking, and I
figured that I might as well get off my lazy ass and do something about
it. Knocked the HV gear out of the way and did a bit of a resprite for
the Vanguard Battlecoat after being suggested to do it by a few people.
## Changelog
:cl:
add: New sprites for Vox! Vanguard and Honorable Vanguard Battlecoat
sprite changes, NGR hard hats, and hazard vests!
/:cl:
---
code/modules/clothing/factions/ngr.dm | 1 +
code/modules/clothing/suits/armor.dm | 2 +-
icons/mob/species/vox/onmob_back_vox.dmi | Bin 49032 -> 40159 bytes
icons/mob/species/vox/onmob_head_vox.dmi | Bin 95755 -> 79789 bytes
icons/mob/species/vox/onmob_suit_vox.dmi | Bin 323030 -> 253107 bytes
5 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm
index 7892a098b50d..a9f37f5c2839 100644
--- a/code/modules/clothing/factions/ngr.dm
+++ b/code/modules/clothing/factions/ngr.dm
@@ -64,6 +64,7 @@
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi'
icon_state = "ngr_hazard"
item_state = "redcloth"
+ supports_variations = VOX_VARIATION
//////////////////
//Armored suits//
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index f3b864966c8a..96c8725c808e 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -325,7 +325,7 @@
icon_state = "armor_inteq_honorable_battlecoat"
item_state = "inteq_honorable_battlecoat"
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
- supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+ supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
/obj/item/clothing/suit/armor/inteq/corpsman
name = "inteq corpsman vest"
diff --git a/icons/mob/species/vox/onmob_back_vox.dmi b/icons/mob/species/vox/onmob_back_vox.dmi
index 953ff24a290e5006d73cf5298ef61206e9a72a95..c2000834877e4719b119ceb387a9af341693e829 100644
GIT binary patch
literal 40159
zcmc$`bzD?m`!>1>2}wahX(<(?lr9NDq*OWwL`12fQlu$@3q!md#(Gr?(4p`FYg-ZGMv45761SS
zz1!ON0f3?%0LV*esK6tFDPxS_7q<{oOFwOAUnid@UVcxYo&XR;mYLFFv?#^=VtCL*
z+bh4Mj&8vIu$sI~LA(MkG9)DJztJ1;tVK0Z?(Oq2SCPV$Jgmxos0zUevI65Hs;aIq
z5woi04>Xk1iG5I*d-Zs;gwypF+>ki~y6NS?-o6F~
zDxK!=L#~srCo{Sb!K~krt)?3rqTg$TEa|H{3fW#;8yX6}U8{ZVegoZI?33i$KG8eM
z6H&ns*&gU#R$_Vc8dbgfq4clVGg^xe!sa>d>ve27kpE_{qF4M}Hc;e#jzVlnAvVA8
z!z!C)=o85y>!;m&NtqqZ&B8KU>|fg;=R=zpo+rkH*j;#+7;$2#aV9bSZpSwfQ<*YV
z?aFou?YpYMWN{j%4DW0G+t|7cAt9m#eYd~5-<)giysX&7`_H{1)~Y-u|vguRd)+*g7<4OgqE2>x+3};aMD-&8crU4^tzjB8wK+@M5;IQd
z+4aAueV#>TOhe$Me$nIkyvv65_djY}>AOp~chAqv^E^Y-Sz-BeBiW6ncOGYdwAH+v
z@ljKTNl%ryAL_cvJ3V(we^@zDqqdD)Z#x_#LRCYFhidE1uyreCx2exh&H|n2=PSM~
zqtgZh559qGzxNVAK~od8y%N-u;b@Wi*_(7wjvt`7@-Q@>R*N~8f*w2&1JG~e2MOHM
zeAC7&_AQk~!h;VMUfzavg?>wwwkn8IRH&OzB?EwX6-oyO$uD#-o1TAqZs4aYiSX(>
zP88)7!FZ>hkHlC;3`>)70sy}(P5aGr%N#6;cv#BI-JY`#3f>^HBYGTurRHW02MsHO
zT^{n1aZc*rVh}5c%+OxEjCLw$)A^C|hN1k#;XrY2jb~1#xXpl@wGfulLy1=3a02fm
z^vWAD%dOXh?FV@IIx2^5nv_-A?hAn`TZjr2qN3&=hK-xU5g1d)Frn4QY1##l6%d4K
zgaMI&kHLA>J}Lcimdo0JPO)Q0xZdg7R|d65Hn(e}OQ)sGCpARajwBk}8(tdUNTZpx
zT9>^A02rpb#3F5gv8vpzIfTR3>lt<_(bzOi#@TfEgDU>xh{otUuM4UlqWQunrz;(w
zE1fJQj=NQ~7QA5M^ZaVms=jUX?yc%-%LH3Trz}_}gJ(EZE`5EyMHty0P4A{^+qQ
zxzI>$r|)EH=0{W7EL1kNuK81S9$bMftfEE-BE}!wAFh~o!{(n+W0Cb9(*;W*2l?UO
zUJPw7MDvy3Ns%aP@?TG8+eY;HH5lA@;n?*em`mQ%6a^!y3UEfTL&=2<(3D>;(vkgL
z8K`1FC1As{BJA|g>Qk&tcmwam=|!}N<*S}brkWcelp
z(h^jqwEKm1+$AfFy^&r`2QZpb=sFKyR*gq-+$?~FcTY!+6wF$&8iq%%vGO}Q(PR^f
zVCXDxA#4^B^QatX>$lrZ%P-1%+Rk*?2QMet4y7)CHLOq02#m;G4)ca{f!da&l?k7wdm_+BFn46L|#dU|%o$SuX$1q9Sp
zWo2PAu7nYO%m$)1m+_Kf*l^Y!-Z1Vgl@TouRNE{XD|zo@WZ>SQR%y`CzwV?67K&D1
zG;!dso0Y%iB#M1Zex6AL-#E*Pg~!6!6f~s$kdCNV5$bU
zP|!W0+p&v{>5}(T+CFQBeP0$TStlNx%L>V&SQ2DRhQAVo^lO3<-#+mcM
zaJ!xYmYv&IK4pAtBVgTfDJsQ7lZPrIISr%dcNcp~etmsyvpfBnN7;TW=Ax{?`IXp7
zKk=8z3LFn#`W5H_$w`cmFw8h_+|MyGokzWtg_czhyb-`uqwgm(*6aY;L$hIt)7d84
zcyU-w*j{d*P;atxHW=EB@g~GE1P>-zrrB{hr-Pr#Osq+XoKCGxpBT&L=#M
zwB7E#kwNZTK+EBj+nnHQ8!Ri&kD9S-cMhM&hw**fM$AXhr2_dcJ;>nTGW|0t@(6+n
z3tT_x>N1Sto&3E+A0MB0IIdvUb@3Cb$KZt*rfBIaOu~rxGD~v&+NbT}
zSR~#=Re9IWzrU~NYHO|xkAu*IeZ_VbxbvczRmVB{4oy@t8+Ww;I~iwHaSQRb+AM*sU15wn*b74)sag3
zuSUm07u8K|>OCz)Gsi}@=~?0Dj5!0ICHumWcwEhtX4chta@i$?{LYjgAMzc~F~O(0js7YI#dX
zkA(r_Or`Nv;Q2SCaX5m)9jn-0Jz7&}R+0?cs>q;gdDzE7RQoCLeoOKf?KI`;s^R`P
zk{am*_K=082G>yZ?GcJf`$KMe#Cyh$m*Jucqkbvn5Bu!ygoo=U3V*k$-&%o)0)o6&
zzq#E`d^PxnZ{TZ`eJT+LGA?d!tKn!kn8%WB1UnOpNLG=`b?!tZQ5Fo(}3E-
zDXq7s#JAIC3=K#2a}?PGGBjWEoe+S1$r;h-AJ%9>m*O_hd-+#ft1tLO%3(c7NO?;Opr2|O+KZ+_Fgx>_WPd4Ek
zFX;#Xz*%Y9NuPiyGaO_$0AK_XBhqKaO|U8ON8uSjqDO!iIf>Q)z&s_n6zQ{__J2bI
z)L~Ls?(G9csI#=lUE&+sF?A<$%y8;WeDe(v@=B*$u%FH;!9J&rD<7_-8JM{_VDx`S
z56&lu+RuQE?_Be{^-MD5J5H_Vl(Jf_cBwyNRbD{UgdnHc5t^PFjprHo|PpPOr+h
zXKOrfk!(BeM0jG;+5WJkENpZm;rb3ef)KbdJ@N`GNjPmLV2JDcY9tC31yU%{#4Iq7
zmGCGB9J8LiB4vW23~~SAB=)
zbsp2DAJse~f|}!hepZHrv(k*BfHR6ztoOhH{*9Qhd%T|riGn|t)b9KxHZU}pShLk4bYYuB>gu20bg`)K)v0N)!jEdSxS4?yUGZan6i%fK{
zS%1DwLMgt7im{Gb(ZvJ`s=^$tXlp#x>Rf9xvH}VjFAEJ66VVt$TtKO`bZ!uDCv&RNPT-Xe+#@&ZX9-p
z+^g!rSJOCN)kDsWcmb`JOyxjpSu$7e-)XM>q1#sSWC^=d_P7rDXV(Vi!AC-(E8rBM
z>acNaz@21hNnLs7V>=*zIm@Qlh~XAK#ro$=jq`;Y;E1M8iGFYj`_N6$J$te?P82lSHfvfBf*H`oimUK@1-_c<`D3AxQ}SRe*Xm
z-znOnq@WE_)d>lx#eNzu{^iK_Ur=NBk}MUgJGrht!SX$2&LdmGQxRD#oJ|_sc}g+`{t3#byohnL@F{x;bE3jecxa(vPGBz^w&a6#{Yk
zZO>IggxUwaux&7>Yk880JIscKg2;+)Z&{zNgIb(!HA9yO_(K%rPq+nV2n-K2xA0ka
zeUtkYpCGg9`O3J8i0q;gu`|T>1{2b*t+WTD|92Gm8Z`7^(-j0<`__;Pb_yXZe&0K&
zOBmLXC40*QC15sDEaN6oo15D>|j
znqn7_CR(2rx}})g`N+#Q(otxdlv%E=Z=;Yud#9=$-&BtN)8V4yTB2WZ^rrM0S2qnB
zwJhCfMB)H>b)Kylb3r#TRwp4qSyOX)5z6<_b|*$eqhbGNIvW{h-=&VdxINjid$n=*
zj6c}Ox`ElB{q|gIOtGYD!8*!zEvzOeXUb($MpG(5Q)EJycdxnW^z$A%acY>$jwmYW
zxj2hou*Pgkp0bdG0X|eO!a3?Jn<>Z)%*Kl!4a3aKZPx}fl`X>X7~~V$4oU}VoXh+L
zg1ngWp+}K{7|s$J`3r#nNg+aQd!HHz{mO*Uy>h
z)(!_kSR$${9`3`$>K7XsESH?u5a^uvjWgmZU
zXF}|{4&`BuU1&sr=!{6zzcGRO4l4rx<6!b*kNYo6$LJt31xsieH>6aW8U9v$m;7eS
z)b$(!?VpXk(F*?6elzVZknaoI&Fx!25Z
zF6o^Qk1B!zlmeWgVx+K6x{friG4)px_l^xsLq*15O`1|<3SWMmnb(eT=}(6P85e#)
zv=26Zj)opDM8^>Jgm`)2>Z?8pNf=-3KgO!$UXRuhm2v6X)bPY|LVG{<#P8c0?_ah{
zG#Ez=?(@;M^VAQSIB#8abH=+jd}@_1ei+tFzVqcJYb%ICkJvEYtY4<1CJSa?vPMB1
zLDD1l!XbSfqBiq7<#J9_;PzIWF_f2WCjQCl_nf)d&FQ2y80EtayJ<)PZ+hJqH1O2P
z=$h=)4d02#d8u*4oQi0JK+H9aq*H|#fvyloUbo5yQs%vVJ
zilF4Qu|LhKO}DNNGuZ{A!s=6w5T*Zj_<}N>swmHvG_)YthJ!iLkltuqi8{Nwf{(u9+gaOeFo`0WzZD~N+3
zetHf+;*O5^gU)=hSQMD^BrJDvK%Q0=n-(QBtreu3f-qEC1eum%2&j!*R
zj&~M9=^H@e7rvX`M4QOiXz^h;8fK#uw;uSRpr8HpE(nx9{E3T})&=QPE9+189@SwP
z;*Xv!;=TQ1iyIwN*#stkW0}r=P@g^?D+mYbo?MXtBRPtzW1pH>IQpFlkh^wE=+7D=
zVW{B_?x%^7;#a2j0z$ZF%P!LiUf-=5@!s!Q=*IN-azGsQ?oTR8#ssFK#7AEX0Nd)P
zHnskn+Uw+%;;^~<{;rpYc&^k|H@XbSJWgL%zsw0Aa6y`8#qvEcq@mM49(O<6;aEhR
zCBIqZfky8tm!?I&aNeuvE&&e8eVlKMQw?CVpbWlCqA5xY)k0Ew*L4%5>
z=wCB>wS(N`Hy*@Ep;e>fUym?fIUt23#&_!vs4~MxztjQTb&Qpkhd;Oi&dgVvjZ?RF
z?o!VmbU=enOCe7T0Y)2Y16vGQ()<*3hwI6#MTz4j}#d?iR@)Z4=Jwjz=zB4-LEY-nRpKlFf-9Zu>f4}?%BB%?bl!`
zj)r)BfM$BAs*al#V_bHZc!)$$I{dtOCvh;<{cOA3HRRBe^baydngPZ3-V7;!xHE_I
zU_s_T8u;yNt*=WTjT-%npWZrJpG^rBeRqw$QPru7ZvuKbO7$F^qSJ>_N+w$Pdp5y}
z{4BVMs4-9%{JLS@XH(BFk>3OW>Mv*8_04(8T+L4218=?~Va#Nl5=iyG3X=S~dIN28
zs)F|=GKI(lUU+`56B`Unk@DIC=hia+8|;=air>@pm~OMHRq*y+B2af{7E{fHN~pg@gk@{Gk3O
zcA7V=*}B%X*rLK-ha--$BTLewRIU_K(Vrq&F;Q+;(*N#S$pJnR5?M=-ZB4AUSh$^3
z`zUS71%KoRUogP0XFhZ@HFy2$lkXEawQrO0m&f1w6nI|^x6?IVY*sR6td7^FR*1aM
z0{1|c*~mjDD;=$NC4yhflk-G)oY3;}r}@!TE{om<)x+D2JP{@sR+U~Aaxd;5jww5I
zBuEVq{6CvT<$P{1ywf?G$NjcQ}5O;O&D
zo<{=;&!qljc6pp+3fFsX?B}1FCBBAQ6!4`RI-POX1*qoVNt?7;!u($^_U{?Avt=sz
z?c-v(x$iNc@Vfti5yGh)?_d
zfrC(3&Z(*h_j;V)#ieq+&;oNb7YcoTW${v~pczejnoCHa
bj3+&|J(He
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