From b3e8eebdc9d822ad70bf0cdbe2f26850d4a7bbe7 Mon Sep 17 00:00:00 2001
From: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Date: Mon, 23 Aug 2021 13:45:54 -0500
Subject: [PATCH] Kills /obj/item/melee/transforming, replaces it with a
transforming weapon component (#60761)
This PR kills off the transforming subtype of /obj/item/melee and replaces it with a component to handle the transforming behavior, /datum/component/transforming.
The transforming component handles updating the variables of an item when it's transformed. Things like force, sharpness, whetstone force bonus, and attack verbs. Similar to the two-handed component, but instead of transforming into a two-hander it remains a one handed weapon.
The "nemesis" behavior (dealing addition damage to certain factions) of the transforming subtype was moved to the cleaving saw only, since it was the only transforming item that used it. In the future, this can be made into a bespoke element/component as well.
The following weapons and items have been updated to use this component:
Energy Swords / Sabers / Bananium Energy Sword
Energy Circular Saw
Energy Dagger
Energy Axe
Toy Energy Sword
Holographic Energy Sword
Switchblade
Advanced Medical Tools (Laser scalpel, Mechanical Pinches, Searing Tool)
Advanced Engineering Tools (Hand Drill, Jaws of Life / Syndicate Jaws of Life)
Combat Wrench
Cleaving Saw
Telescopic Batons / Contractor Batons
Roasting Stick
Telescopic Riot Shield
Energy Shield / Bananium Energy Shield
This PR also touches up the code around the various above items.
---
.../RandomRuins/SpaceRuins/forgottenship.dmm | 2 +-
_maps/RandomZLevels/spacebattle.dmm | 4 +-
_maps/map_files/debug/runtimestation.dmm | 2 +-
_maps/map_files/generic/CentCom.dmm | 8 +-
_maps/shuttles/pirate_default.dmm | 6 +-
_maps/shuttles/pirate_silverscale.dmm | 6 +-
_maps/templates/holodeck_thunderdome.dmm | 4 +-
code/__DEFINES/dcs/signals.dm | 11 +
code/datums/components/transforming.dm | 253 ++++++++++++++
code/game/objects/items/dualsaber.dm | 2 +-
code/game/objects/items/melee/energy.dm | 327 +++++++++++-------
code/game/objects/items/melee/misc.dm | 199 +++++------
code/game/objects/items/melee/transforming.dm | 101 ------
code/game/objects/items/sharpener.dm | 2 +-
code/game/objects/items/shields.dm | 114 +++---
.../game/objects/items/storage/uplink_kits.dm | 4 +-
code/game/objects/items/tools/crowbar.dm | 55 ++-
code/game/objects/items/tools/screwdriver.dm | 39 ++-
code/game/objects/items/tools/wrench.dm | 54 ++-
code/game/objects/items/toys.dm | 87 ++---
code/game/objects/items/weaponry.dm | 44 +--
.../crates_lockers/closets/gimmick.dm | 4 +-
.../objects/structures/ghost_role_spawners.dm | 4 +-
.../antagonists/clown_ops/clown_weapons.dm | 93 +++--
.../awaymissions/mission_code/snowdin.dm | 2 +-
code/modules/cargo/exports/lavaland.dm | 2 +-
code/modules/clothing/outfits/ert.dm | 6 +-
code/modules/clothing/outfits/standard.dm | 6 +-
code/modules/clothing/spacesuits/hardsuit.dm | 4 +-
code/modules/clothing/spacesuits/pirate.dm | 2 +-
code/modules/clothing/spacesuits/plasmamen.dm | 2 +-
code/modules/clothing/spacesuits/syndi.dm | 2 +-
code/modules/clothing/suits/costume.dm | 2 +-
.../recipes/tablecraft/recipes_cake.dm | 2 +-
code/modules/holodeck/items.dm | 64 +---
code/modules/mining/abandoned_crates.dm | 2 +-
.../modules/mining/lavaland/megafauna_loot.dm | 146 ++++----
code/modules/mining/lavaland/tendril_loot.dm | 2 +-
.../mob/living/silicon/robot/robot_modules.dm | 4 +-
.../living/simple_animal/bot/SuperBeepsky.dm | 2 +-
.../living/simple_animal/bot/construction.dm | 4 +-
.../hostile/megafauna/blood_drunk_miner.dm | 23 +-
.../living/simple_animal/hostile/pirate.dm | 2 +-
code/modules/paperwork/pen.dm | 80 ++---
code/modules/projectiles/guns/ballistic.dm | 2 +-
code/modules/ruins/lavaland_ruin_code.dm | 2 +-
code/modules/surgery/advanced/lobotomy.dm | 2 +-
code/modules/surgery/coronary_bypass.dm | 2 +-
code/modules/surgery/gastrectomy.dm | 2 +-
code/modules/surgery/hepatectomy.dm | 2 +-
code/modules/surgery/lobectomy.dm | 2 +-
code/modules/surgery/organic_steps.dm | 2 +-
code/modules/surgery/organs/augments_arms.dm | 4 +-
code/modules/surgery/tools.dm | 108 ++++--
code/modules/uplink/uplink_items.dm | 5 +-
icons/mob/clothing/back.dmi | Bin 136525 -> 128564 bytes
icons/mob/inhands/64x64_lefthand.dmi | Bin 25059 -> 25057 bytes
icons/mob/inhands/64x64_righthand.dmi | Bin 24660 -> 24658 bytes
.../inhands/equipment/shields_lefthand.dmi | Bin 10261 -> 10259 bytes
.../inhands/equipment/shields_righthand.dmi | Bin 10787 -> 10783 bytes
.../mob/inhands/equipment/tools_lefthand.dmi | Bin 14531 -> 14536 bytes
.../mob/inhands/equipment/tools_righthand.dmi | Bin 16626 -> 16631 bytes
icons/mob/inhands/weapons/axes_lefthand.dmi | Bin 2675 -> 2678 bytes
icons/mob/inhands/weapons/axes_righthand.dmi | Bin 2545 -> 2548 bytes
icons/mob/inhands/weapons/melee_lefthand.dmi | Bin 11957 -> 11959 bytes
icons/mob/inhands/weapons/melee_righthand.dmi | Bin 13562 -> 13563 bytes
icons/mob/inhands/weapons/swords_lefthand.dmi | Bin 25020 -> 25026 bytes
.../mob/inhands/weapons/swords_righthand.dmi | Bin 27694 -> 27700 bytes
icons/obj/clothing/belt_overlays.dmi | Bin 3631 -> 3622 bytes
icons/obj/items_and_weapons.dmi | Bin 109787 -> 109779 bytes
icons/obj/lavaland/artefacts.dmi | Bin 37656 -> 37655 bytes
icons/obj/shields.dmi | Bin 4600 -> 4597 bytes
icons/obj/surgery.dmi | Bin 43918 -> 43914 bytes
icons/obj/tools.dmi | Bin 27002 -> 26991 bytes
icons/obj/transforming_energy.dmi | Bin 7189 -> 7204 bytes
tgstation.dme | 2 +-
76 files changed, 1084 insertions(+), 835 deletions(-)
create mode 100644 code/datums/components/transforming.dm
delete mode 100644 code/game/objects/items/melee/transforming.dm
diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
index 09658a8b869..ad75f7c046f 100644
--- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
+++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm
@@ -514,7 +514,7 @@
/obj/structure/closet/crate/secure/gear{
req_one_access_txt = "150"
},
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
/obj/machinery/light/directional/north,
/turf/open/floor/pod/dark,
/area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm
index f5a5cb88306..8fb1d3dc2ca 100644
--- a/_maps/RandomZLevels/spacebattle.dmm
+++ b/_maps/RandomZLevels/spacebattle.dmm
@@ -291,7 +291,7 @@
/area/awaymission/spacebattle/syndicate3)
"bt" = (
/obj/structure/table/reinforced,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
/turf/open/floor/mineral/plastitanium/red,
/area/awaymission/spacebattle/syndicate1)
"bu" = (
@@ -1152,7 +1152,7 @@
/area/awaymission/spacebattle/cruiser)
"eW" = (
/obj/effect/mob_spawn/human/syndicatesoldier,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
/obj/effect/decal/cleanable/blood,
/turf/open/floor/iron,
/area/awaymission/spacebattle/cruiser)
diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm
index adaecc5ce3e..402da938ea9 100644
--- a/_maps/map_files/debug/runtimestation.dmm
+++ b/_maps/map_files/debug/runtimestation.dmm
@@ -2036,7 +2036,7 @@
/area/engineering/atmos)
"jU" = (
/obj/structure/table,
-/obj/item/melee/transforming/energy/axe,
+/obj/item/melee/energy/axe,
/turf/open/floor/iron,
/area/commons/storage/primary)
"kj" = (
diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm
index a5b6b21a4cc..987d85b3a18 100644
--- a/_maps/map_files/generic/CentCom.dmm
+++ b/_maps/map_files/generic/CentCom.dmm
@@ -112,7 +112,7 @@
/obj/item/clothing/suit/armor/tdome/red,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -183,7 +183,7 @@
/obj/item/clothing/suit/armor/tdome/green,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/green,
+/obj/item/melee/energy/sword/saber/green,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
@@ -12152,7 +12152,7 @@
/obj/item/clothing/suit/armor/tdome/red,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/red,
+/obj/item/melee/energy/sword/saber/red,
/obj/effect/turf_decal/stripes/line{
dir = 4
},
@@ -12276,7 +12276,7 @@
/obj/item/clothing/suit/armor/tdome/green,
/obj/item/clothing/head/helmet/thunderdome,
/obj/item/melee/baton/loaded,
-/obj/item/melee/transforming/energy/sword/saber/green,
+/obj/item/melee/energy/sword/saber/green,
/obj/effect/turf_decal/stripes/line{
dir = 8
},
diff --git a/_maps/shuttles/pirate_default.dmm b/_maps/shuttles/pirate_default.dmm
index 3a9695a20d6..7b0728ecbb3 100644
--- a/_maps/shuttles/pirate_default.dmm
+++ b/_maps/shuttles/pirate_default.dmm
@@ -597,15 +597,15 @@
/obj/machinery/firealarm/directional/north,
/obj/effect/decal/cleanable/dirt,
/obj/structure/table,
-/obj/item/melee/transforming/energy/sword/pirate{
+/obj/item/melee/energy/sword/pirate{
pixel_x = -1;
pixel_y = 6
},
-/obj/item/melee/transforming/energy/sword/pirate{
+/obj/item/melee/energy/sword/pirate{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/melee/transforming/energy/sword/pirate{
+/obj/item/melee/energy/sword/pirate{
pixel_x = 13;
pixel_y = 6
},
diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm
index dc387cfcab6..009219c409e 100644
--- a/_maps/shuttles/pirate_silverscale.dmm
+++ b/_maps/shuttles/pirate_silverscale.dmm
@@ -358,14 +358,14 @@
dir = 8;
layer = 2.9
},
-/obj/item/melee/transforming/energy/sword/saber/purple{
+/obj/item/melee/energy/sword/saber/purple{
pixel_y = 12
},
-/obj/item/melee/transforming/energy/sword/saber/purple{
+/obj/item/melee/energy/sword/saber/purple{
pixel_x = 8;
pixel_y = 7
},
-/obj/item/melee/transforming/energy/sword/saber/purple{
+/obj/item/melee/energy/sword/saber/purple{
pixel_x = 17
},
/turf/open/floor/pod/dark,
diff --git a/_maps/templates/holodeck_thunderdome.dmm b/_maps/templates/holodeck_thunderdome.dmm
index e9b1eb5167a..a1ff05d6203 100644
--- a/_maps/templates/holodeck_thunderdome.dmm
+++ b/_maps/templates/holodeck_thunderdome.dmm
@@ -14,7 +14,7 @@
/obj/item/clothing/head/helmet/thunderdome/holosuit,
/obj/item/clothing/suit/armor/tdome/holosuit/green,
/obj/item/clothing/under/color/green,
-/obj/item/holo/esword/green,
+/obj/item/melee/energy/sword/holographic/green,
/turf/open/floor/holofloor/basalt,
/area/template_noop)
"q" = (
@@ -22,7 +22,7 @@
/obj/item/clothing/head/helmet/thunderdome/holosuit,
/obj/item/clothing/suit/armor/tdome/holosuit/red,
/obj/item/clothing/under/color/red,
-/obj/item/holo/esword/red,
+/obj/item/melee/energy/sword/holographic/red,
/turf/open/floor/holofloor/basalt,
/area/template_noop)
"x" = (
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
index 542f7272ec1..2b420439649 100644
--- a/code/__DEFINES/dcs/signals.dm
+++ b/code/__DEFINES/dcs/signals.dm
@@ -1177,6 +1177,17 @@
#define COMSIG_SWAB_FOR_SAMPLES "swab_for_samples" ///Called when you try to swab something using the swabable component, includes a mutable list of what has been swabbed so far so it can be modified.
#define COMPONENT_SWAB_FOUND (1<<0)
+// /datum/component/transforming signals
+
+/// From /datum/component/transforming/proc/on_attack_self(obj/item/source, mob/user): (obj/item/source, mob/user, active)
+#define COMSIG_TRANSFORMING_PRE_TRANSFORM "transforming_pre_transform"
+ /// Return COMPONENT_BLOCK_TRANSFORM to prevent the item from transforming.
+ #define COMPONENT_BLOCK_TRANSFORM (1<<0)
+/// From /datum/component/transforming/proc/do_transform(obj/item/source, mob/user): (obj/item/source, mob/user, active)
+#define COMSIG_TRANSFORMING_ON_TRANSFORM "transforming_on_transform"
+ /// Return COMPONENT_NO_DEFAULT_MESSAGE to prevent the transforming component from displaying the default transform message / sound.
+ #define COMPONENT_NO_DEFAULT_MESSAGE (1<<0)
+
// /datum/component/two_handed signals
///from base of datum/component/two_handed/proc/wield(mob/living/carbon/user): (/mob/user)
diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm
new file mode 100644
index 00000000000..60adbd56b3b
--- /dev/null
+++ b/code/datums/components/transforming.dm
@@ -0,0 +1,253 @@
+/*
+ * Transforming weapon component. For weapons that swap between states.
+ * For example: Energy swords, cleaving saws, switch blades.
+ *
+ * Used to easily make an item that can be attack_self'd to gain force or change mode.
+ *
+ * Only values passed on initialize will update when the item is activated (except the icon_state).
+ * The icon_state of the item will swap between "[icon_state]" and "[icon_state]_on".
+ */
+/datum/component/transforming
+ /// Whether the weapon is transformed
+ var/active = FALSE
+ /// Cooldown on transforming this item back and forth
+ var/transform_cooldown_time
+ /// Force of the weapon when active
+ var/force_on
+ /// Throwforce of the weapon when active
+ var/throwforce_on
+ /// Throw speed of the weapon when active
+ var/throw_speed_on
+ /// Weight class of the weapon when active
+ var/w_class_on
+ /// The sharpness of the weapon when active
+ var/sharpness_on
+ /// Hitsound played when active
+ var/hitsound_on
+ /// List of the original continuous attack verbs the item has.
+ var/list/attack_verb_continuous_off
+ /// List of the original simple attack verbs the item has.
+ var/list/attack_verb_simple_off
+ /// List of continuous attack verbs used when the weapon is enabled
+ var/list/attack_verb_continuous_on
+ /// List of simple attack verbs used when the weapon is enabled
+ var/list/attack_verb_simple_on
+ /// Whether clumsy people need to succeed an RNG check to turn it on without hurting themselves
+ var/clumsy_check
+ /// If we get sharpened with a whetstone, save the bonus here for later use if we un/redeploy
+ var/sharpened_bonus = 0
+ /// Cooldown in between transforms
+ COOLDOWN_DECLARE(transform_cooldown)
+
+/datum/component/transforming/Initialize(
+ start_transformed = FALSE,
+ transform_cooldown_time = 0 SECONDS,
+ force_on = 0,
+ throwforce_on = 0,
+ throw_speed_on = 2,
+ sharpness_on = NONE,
+ hitsound_on = 'sound/weapons/blade1.ogg',
+ w_class_on = WEIGHT_CLASS_BULKY,
+ clumsy_check = TRUE,
+ list/attack_verb_continuous_on,
+ list/attack_verb_simple_on,
+ )
+
+ if(!isitem(parent))
+ return COMPONENT_INCOMPATIBLE
+
+ var/obj/item/item_parent = parent
+
+ src.transform_cooldown_time = transform_cooldown_time
+ src.force_on = force_on
+ src.throwforce_on = throwforce_on
+ src.throw_speed_on = throw_speed_on
+ src.sharpness_on = sharpness_on
+ src.hitsound_on = hitsound_on
+ src.w_class_on = w_class_on
+ src.clumsy_check = clumsy_check
+
+ if(attack_verb_continuous_on)
+ src.attack_verb_continuous_on = attack_verb_continuous_on
+ attack_verb_continuous_off = item_parent.attack_verb_continuous
+ if(attack_verb_simple_on)
+ src.attack_verb_simple_on = attack_verb_simple_on
+ attack_verb_simple_off = item_parent.attack_verb_simple
+
+ if(start_transformed)
+ toggle_active(parent)
+
+/datum/component/transforming/RegisterWithParent()
+ var/obj/item/item_parent = parent
+
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self)
+ if(item_parent.sharpness || sharpness_on)
+ RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen)
+
+/datum/component/transforming/UnregisterFromParent()
+ UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_SHARPEN_ACT))
+
+/*
+ * Called on [COMSIG_ITEM_ATTACK_SELF].
+ *
+ * Check if we can transform our weapon, and if so, call [do_transform].
+ * Sends signal [COMSIG_TRANSFORMING_PRE_TRANSFORM], and stops the transform action if it returns [COMPONENT_BLOCK_TRANSFORM].
+ * And, if [do_transform] was successful, do a clumsy effect from [clumsy_transform_effect].
+ *
+ * source - source of the signal, the item being transformed / parent
+ * user - the mob transforming the weapon
+ */
+/datum/component/transforming/proc/on_attack_self(obj/item/source, mob/user)
+ SIGNAL_HANDLER
+
+ if(!COOLDOWN_FINISHED(src, transform_cooldown))
+ to_chat(user, span_warning("Wait a bit before trying to use [source] again!"))
+ return
+
+ if(SEND_SIGNAL(source, COMSIG_TRANSFORMING_PRE_TRANSFORM, user, active) & COMPONENT_BLOCK_TRANSFORM)
+ return
+
+ if(do_transform(source, user))
+ clumsy_transform_effect(user)
+ . = COMPONENT_CANCEL_ATTACK_CHAIN
+
+/*
+ * Transform the weapon into its alternate form, calling [toggle_active].
+ *
+ * Sends signal [COMSIG_TRANSFORMING_ON_TRANSFORM], and calls [default_transform_message] if it does not return [COMPONENT_NO_DEFAULT_MESSAGE].
+ * Also starts the [transform_cooldown] if we have a set [transform_cooldown_time].
+ *
+ * source - the item being transformed / parent
+ * user - the mob transforming the item
+ *
+ * returns TRUE.
+ */
+/datum/component/transforming/proc/do_transform(obj/item/source, mob/user)
+ toggle_active(source)
+ if(!(SEND_SIGNAL(source, COMSIG_TRANSFORMING_ON_TRANSFORM, user, active) & COMPONENT_NO_DEFAULT_MESSAGE))
+ default_transform_message(source, user)
+
+ if(isnum(transform_cooldown_time))
+ COOLDOWN_START(src, transform_cooldown, transform_cooldown_time)
+ if(user)
+ source.add_fingerprint(user)
+ return TRUE
+
+/*
+ * The default feedback message and sound effect for an item transforming.
+ *
+ * source - the item being transformed / parent
+ * user - the mob transforming the item
+ */
+/datum/component/transforming/proc/default_transform_message(obj/item/source, mob/user)
+ source.balloon_alert(user, "[active ? "enabled" : "disabled"] [source]")
+ playsound(user ? user : source.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+
+/*
+ * Toggle active between true and false, and call
+ * either set_active or set_inactive depending on whichever state is toggled.
+ *
+ * source - the item being transformed / parent
+ */
+/datum/component/transforming/proc/toggle_active(obj/item/source)
+ active = !active
+ if(active)
+ set_active(source)
+ else
+ set_inactive(source)
+
+/*
+ * Set our transformed item into its active state.
+ * Updates all the values that were passed from init and the icon_state.
+ *
+ * source - the item being transformed / parent
+ */
+/datum/component/transforming/proc/set_active(obj/item/source)
+ if(sharpness_on)
+ source.sharpness = sharpness_on
+ if(force_on)
+ source.force = force_on + (source.sharpness ? sharpened_bonus : 0)
+ if(throwforce_on)
+ source.throwforce = throwforce_on + (source.sharpness ? sharpened_bonus : 0)
+ if(throw_speed_on)
+ source.throw_speed = throw_speed_on
+
+ if(LAZYLEN(attack_verb_continuous_on))
+ source.attack_verb_continuous = attack_verb_continuous_on
+ if(LAZYLEN(attack_verb_simple_on))
+ source.attack_verb_simple = attack_verb_simple_on
+
+ source.hitsound = hitsound_on
+ source.w_class = w_class_on
+ source.icon_state = "[source.icon_state]_on"
+
+/*
+ * Set our transformed item into its inactive state.
+ * Updates all the values back to the item's initial values.
+ *
+ * source - the item being un-transformed / parent
+ */
+/datum/component/transforming/proc/set_inactive(obj/item/source)
+ if(sharpness_on)
+ source.sharpness = initial(source.sharpness)
+ if(force_on)
+ source.force = initial(source.force) + (source.sharpness ? sharpened_bonus : 0)
+ if(throwforce_on)
+ source.throwforce = initial(source.throwforce) + (source.sharpness ? sharpened_bonus : 0)
+ if(throw_speed_on)
+ source.throw_speed = initial(source.throw_speed)
+
+ if(LAZYLEN(attack_verb_continuous_on))
+ source.attack_verb_continuous = attack_verb_continuous_off
+ if(LAZYLEN(attack_verb_simple_off))
+ source.attack_verb_simple = attack_verb_simple_off
+
+ source.hitsound = initial(source.hitsound)
+ source.w_class = initial(source.w_class)
+ source.icon_state = initial(source.icon_state)
+
+/*
+ * If [clumsy_check] is set to TRUE, attempt to cause a side effect for clumsy people activating this item.
+ * Called after the transform is done, meaning [active] var has already updated.
+ *
+ * user - the clumsy mob, transforming our item (parent)
+ *
+ * Returns TRUE if side effects happened, FALSE otherwise
+ */
+/datum/component/transforming/proc/clumsy_transform_effect(mob/living/user)
+ if(!clumsy_check)
+ return FALSE
+
+ if(!HAS_TRAIT(user, TRAIT_CLUMSY))
+ return FALSE
+
+ if(active && prob(50))
+ var/hurt_self_verb_simple = LAZYLEN(attack_verb_simple_on) ? pick(attack_verb_simple_on) : "hit"
+ var/hurt_self_verb_continuous = LAZYLEN(attack_verb_continuous_on) ? pick(attack_verb_continuous_on) : "hits"
+ user.visible_message(
+ span_warning("[user] triggers [parent] while holding it backwards and [hurt_self_verb_continuous] themself, like a doofus!"),
+ span_warning("You trigger [parent] while holding it backwards and [hurt_self_verb_simple] yourself, like a doofus!")
+ )
+ user.take_bodypart_damage(10)
+ return TRUE
+ return FALSE
+
+/*
+ * Called on [COMSIG_ITEM_SHARPEN_ACT].
+ * We need to track our sharpened bonus here, so we correctly apply and unapply it
+ * if our item's sharpness state changes from transforming.
+ *
+ * source - the item being sharpened / parent
+ * increment - the amount of force added
+ * max - the maximum force that the item can be adjusted to.
+ *
+ * Does not return naturally [COMPONENT_BLOCK_SHARPEN_APPLIED] as this is only to track our sharpened bonus between transformation.
+ */
+/datum/component/transforming/proc/on_sharpen(obj/item/source, increment, max)
+ SIGNAL_HANDLER
+
+ if(sharpened_bonus)
+ return COMPONENT_BLOCK_SHARPEN_ALREADY
+ if(force_on + increment > max)
+ return COMPONENT_BLOCK_SHARPEN_MAXED
+ sharpened_bonus = increment
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 3177df30987..19f71773335 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -160,7 +160,7 @@
return 1
/obj/item/dualsaber/ignition_effect(atom/A, mob/user)
- // same as /obj/item/melee/transforming/energy, mostly
+ // same as /obj/item/melee/energy, mostly
if(!wielded)
return ""
var/in_mouth = ""
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index 81ca7b24873..bce11c884a1 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -1,57 +1,74 @@
-/obj/item/melee/transforming/energy
+/obj/item/melee/energy
icon = 'icons/obj/transforming_energy.dmi'
- hitsound_on = 'sound/weapons/blade1.ogg'
- heat = 3500
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 30)
+ attack_verb_continuous = list("hits", "taps", "pokes")
+ attack_verb_simple = list("hit", "tap", "poke")
resistance_flags = FIRE_PROOF
light_system = MOVABLE_LIGHT
light_range = 3
light_power = 1
light_on = FALSE
- var/sword_color
+ bare_wound_bonus = 20
+ stealthy_audio = TRUE
+ w_class = WEIGHT_CLASS_SMALL
-/obj/item/melee/transforming/energy/Initialize()
+ /// The color of this energy based sword, for use in editing the icon_state.
+ var/sword_color_icon
+ /// Whether our blade is active or not.
+ var/blade_active = FALSE
+ /// Force while active.
+ var/active_force = 30
+ /// Throwforce while active.
+ var/active_throwforce = 20
+ /// Sharpness while active.
+ var/active_sharpness = SHARP_EDGED
+ /// Hitsound played attacking while active.
+ var/active_hitsound = 'sound/weapons/blade1.ogg'
+ /// Weight class while active.
+ var/active_w_class = WEIGHT_CLASS_BULKY
+ /// The heat given off when active.
+ var/active_heat = 3500
+
+/obj/item/melee/energy/Initialize()
. = ..()
- if(active)
- START_PROCESSING(SSobj, src)
+ make_transformable()
+ AddComponent(/datum/component/butchering, _speed = 5 SECONDS, _butcher_sound = active_hitsound)
-/obj/item/melee/transforming/energy/Destroy()
+/obj/item/melee/energy/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/melee/transforming/energy/suicide_act(mob/user)
- if(!active)
- transform_weapon(user, TRUE)
+/*
+ * Gives our item the transforming component, passing in our various vars.
+ */
+/obj/item/melee/energy/proc/make_transformable()
+ AddComponent(/datum/component/transforming, \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ throw_speed_on = 4, \
+ sharpness_on = active_sharpness, \
+ hitsound_on = active_hitsound, \
+ w_class_on = active_w_class, \
+ attack_verb_continuous_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts"), \
+ attack_verb_simple_on = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut"))
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/obj/item/melee/energy/suicide_act(mob/user)
+ if(!blade_active)
+ attack_self(user)
user.visible_message(span_suicide("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku!"))
return (BRUTELOSS|FIRELOSS)
-/obj/item/melee/transforming/energy/add_blood_DNA(list/blood_dna)
+/obj/item/melee/energy/add_blood_DNA(list/blood_dna)
return FALSE
-/obj/item/melee/transforming/energy/get_sharpness()
- return active * sharpness
+/obj/item/melee/energy/process(delta_time)
+ if(heat)
+ open_flame()
-/obj/item/melee/transforming/energy/process()
- open_flame()
-
-/obj/item/melee/transforming/energy/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(.)
- if(active)
- if(sword_color)
- icon_state = "sword[sword_color]"
- START_PROCESSING(SSobj, src)
- else
- STOP_PROCESSING(SSobj, src)
- set_light_on(active)
-
-
-/obj/item/melee/transforming/energy/get_temperature()
- return active * heat
-
-/obj/item/melee/transforming/energy/ignition_effect(atom/A, mob/user)
- if(!active)
+/obj/item/melee/energy/ignition_effect(atom/A, mob/user)
+ if(!heat && !blade_active)
return ""
var/in_mouth = ""
@@ -63,180 +80,234 @@
playsound(loc, hitsound, get_clamped_volume(), TRUE, -1)
add_fingerprint(user)
-/obj/item/melee/transforming/energy/axe
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Updates our icon to have the correct color,
+ * updates the amount of heat our item gives out,
+ * enables / disables embedding, and
+ * starts / stops processing.
+ *
+ * Also gives feedback to the user and activates or deactives the glow.
+ */
+/obj/item/melee/energy/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ blade_active = active
+ if(active)
+ if(sword_color_icon)
+ icon_state = "[icon_state]_[sword_color_icon]"
+ if(embedding)
+ updateEmbedding()
+ heat = active_heat
+ START_PROCESSING(SSobj, src)
+ else
+ if(embedding)
+ disableEmbedding()
+ heat = initial(heat)
+ STOP_PROCESSING(SSobj, src)
+
+ balloon_alert(user, "[name] [active ? "enabled":"disabled"]")
+ playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
+ set_light_on(active)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+/// Energy axe - extremely strong.
+/obj/item/melee/energy/axe
name = "energy axe"
desc = "An energized battle axe."
- icon_state = "axe0"
+ icon_state = "axe"
lefthand_file = 'icons/mob/inhands/weapons/axes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/axes_righthand.dmi'
- force = 40
- force_on = 150
- throwforce = 25
- throwforce_on = 30
hitsound = 'sound/weapons/bladeslice.ogg'
+ attack_verb_continuous = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
+ attack_verb_simple = list("attack", "chop", "cleave", "tear", "lacerate", "cut")
+ force = 40
+ throwforce = 25
throw_speed = 3
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
- w_class_on = WEIGHT_CLASS_HUGE
- flags_1 = CONDUCT_1
armour_penetration = 100
- attack_verb_off = list("attacks", "chops", "cleaves", "tears", "lacerates", "cuts")
- attack_verb_on = list()
+ sharpness = SHARP_EDGED
+ w_class = WEIGHT_CLASS_NORMAL
+ flags_1 = CONDUCT_1
light_color = LIGHT_COLOR_LIGHT_CYAN
-/obj/item/melee/transforming/energy/axe/suicide_act(mob/user)
+ active_force = 150
+ active_throwforce = 30
+ active_w_class = WEIGHT_CLASS_HUGE
+
+/obj/item/melee/energy/axe/make_transformable()
+ AddComponent(/datum/component/transforming, \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ throw_speed_on = throw_speed, \
+ sharpness_on = sharpness, \
+ w_class_on = active_w_class)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/obj/item/melee/energy/axe/suicide_act(mob/user)
user.visible_message(span_suicide("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!"))
return (BRUTELOSS|FIRELOSS)
-/obj/item/melee/transforming/energy/sword
+/// Energy swords.
+/obj/item/melee/energy/sword
name = "energy sword"
desc = "May the force be within you."
- icon_state = "sword0"
+ icon_state = "e_sword"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ hitsound = "swing_hit"
force = 3
throwforce = 5
- hitsound = "swing_hit" //it starts deactivated
- attack_verb_off = list("taps", "pokes")
throw_speed = 3
throw_range = 5
- sharpness = SHARP_EDGED
- embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
armour_penetration = 35
block_chance = 50
+ embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
-/obj/item/melee/transforming/energy/sword/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- if(. && active && sword_color)
- icon_state = "sword[sword_color]"
-
-/obj/item/melee/transforming/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(active)
+/obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ if(blade_active)
return ..()
- return 0
+ return FALSE
-/obj/item/melee/transforming/energy/sword/cyborg
- sword_color = "red"
+/obj/item/melee/energy/sword/cyborg
+ name = "cyborg energy sword"
+ sword_color_icon = "red"
+ /// The cell cost of hitting something.
var/hitcost = 50
-/obj/item/melee/transforming/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R)
- if(R.cell)
- var/obj/item/stock_parts/cell/C = R.cell
- if(active && !(C.use(hitcost)))
- attack_self(R)
- to_chat(R, span_notice("It's out of charge!"))
- return
- return ..()
+/obj/item/melee/energy/sword/cyborg/attack(mob/target, mob/living/silicon/robot/user)
+ if(!user.cell)
+ return
-/obj/item/melee/transforming/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
+ var/obj/item/stock_parts/cell/our_cell = user.cell
+ if(blade_active && !(our_cell.use(hitcost)))
+ attack_self(user)
+ to_chat(user, span_notice("It's out of charge!"))
+ return
+ return ..()
+
+/obj/item/melee/energy/sword/cyborg/cyborg_unequip(mob/user)
+ if(!blade_active)
+ return
+ attack_self(user)
+
+/obj/item/melee/energy/sword/cyborg/saw //Used by medical Syndicate cyborgs
name = "energy saw"
desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
- force_on = 30
- force = 18 //About as much as a spear
- hitsound = 'sound/weapons/circsawhit.ogg'
icon = 'icons/obj/surgery.dmi'
- icon_state = "esaw_0"
- icon_state_on = "esaw_1"
- sword_color = null //stops icon from breaking when turned on.
- hitcost = 75 //Costs more than a standard cyborg esword
+ icon_state = "esaw"
+ hitsound = 'sound/weapons/circsawhit.ogg'
+ force = 18
+ hitcost = 75 // Costs more than a standard cyborg esword.
w_class = WEIGHT_CLASS_NORMAL
sharpness = SHARP_EDGED
light_color = LIGHT_COLOR_LIGHT_CYAN
tool_behaviour = TOOL_SAW
- toolspeed = 0.7 //faster as a saw
+ toolspeed = 0.7 // Faster than a normal saw.
-/obj/item/melee/transforming/energy/sword/cyborg/saw/cyborg_unequip(mob/user)
- if(!active)
- return
- transform_weapon(user, TRUE)
+ active_force = 30
+ sword_color_icon = null // Stops icon from breaking when turned on.
-/obj/item/melee/transforming/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- return 0
+/obj/item/melee/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ return FALSE
-/obj/item/melee/transforming/energy/sword/saber
- var/list/possible_colors = list("red" = COLOR_SOFT_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
+// The colored energy swords we all know and love.
+/obj/item/melee/energy/sword/saber
+ /// Assoc list of all possible saber colors to color define.
+ var/list/possible_colors = list(
+ "red" = COLOR_SOFT_RED,
+ "blue" = LIGHT_COLOR_LIGHT_CYAN,
+ "green" = LIGHT_COLOR_GREEN,
+ "purple" = LIGHT_COLOR_LAVENDER,
+ )
+ /// Whether this saber has beel multitooled.
var/hacked = FALSE
-/obj/item/melee/transforming/energy/sword/saber/Initialize(mapload)
+/obj/item/melee/energy/sword/saber/Initialize(mapload)
. = ..()
- if(LAZYLEN(possible_colors))
- var/set_color = pick(possible_colors)
- sword_color = set_color
- set_light_color(possible_colors[set_color])
+ if(!sword_color_icon && LAZYLEN(possible_colors))
+ sword_color_icon = pick(possible_colors)
-/obj/item/melee/transforming/energy/sword/saber/process()
+ if(sword_color_icon)
+ set_light_color(possible_colors[sword_color_icon])
+
+/obj/item/melee/energy/sword/saber/process()
. = ..()
if(hacked)
- var/set_color = pick(possible_colors)
- set_light_color(possible_colors[set_color])
+ set_light_color(possible_colors[pick(possible_colors)])
-/obj/item/melee/transforming/energy/sword/saber/red
- possible_colors = list("red" = COLOR_SOFT_RED)
+/obj/item/melee/energy/sword/saber/red
+ sword_color_icon = "red"
-/obj/item/melee/transforming/energy/sword/saber/blue
- possible_colors = list("blue" = LIGHT_COLOR_LIGHT_CYAN)
+/obj/item/melee/energy/sword/saber/blue
+ sword_color_icon = "blue"
-/obj/item/melee/transforming/energy/sword/saber/green
- possible_colors = list("green" = LIGHT_COLOR_GREEN)
+/obj/item/melee/energy/sword/saber/green
+ sword_color_icon = "green"
-/obj/item/melee/transforming/energy/sword/saber/purple
- possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)
+/obj/item/melee/energy/sword/saber/purple
+ sword_color_icon = "purple"
-/obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
- if(W.tool_behaviour == TOOL_MULTITOOL)
- if(!hacked)
- hacked = TRUE
- sword_color = "rainbow"
- to_chat(user, span_warning("RNBW_ENGAGE"))
-
- if(active)
- icon_state = "swordrainbow"
- user.update_inv_hands()
- else
+/obj/item/melee/energy/sword/saber/attackby(obj/item/weapon, mob/living/user, params)
+ if(weapon.tool_behaviour == TOOL_MULTITOOL)
+ if(hacked)
to_chat(user, span_warning("It's already fabulous!"))
+ else
+ hacked = TRUE
+ sword_color_icon = "rainbow"
+ to_chat(user, span_warning("RNBW_ENGAGE"))
+ if(force >= active_force)
+ icon_state = "[initial(icon_state)]_on_rainbow"
+ user.update_inv_hands()
else
return ..()
-/obj/item/melee/transforming/energy/sword/pirate
+/obj/item/melee/energy/sword/pirate
name = "energy cutlass"
desc = "Arrrr matey."
- icon_state = "cutlass0"
+ icon_state = "e_cutlass"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- icon_state_on = "cutlass1"
light_color = COLOR_RED
-/obj/item/melee/transforming/energy/blade
+/// Energy blades, which are effectively perma-extended energy swords
+/obj/item/melee/energy/blade
name = "energy blade"
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
icon_state = "blade"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- force = 30 //Normal attacks deal esword damage
hitsound = 'sound/weapons/blade1.ogg'
- active = 1
- throwforce = 1 //Throwing or dropping the item deletes it.
+ attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
+ force = 30
+ throwforce = 1 // Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
- w_class = WEIGHT_CLASS_BULKY//So you can't hide it in your pocket or some such.
- var/datum/effect_system/spark_spread/spark_system
sharpness = SHARP_EDGED
+ heat = 3500
+ w_class = WEIGHT_CLASS_BULKY
+ blade_active = TRUE
+ /// Our linked spark system that emits from our sword.
+ var/datum/effect_system/spark_spread/spark_system
//Most of the other special functions are handled in their own files. aka special snowflake code so kewl
-/obj/item/melee/transforming/energy/blade/Initialize()
+/obj/item/melee/energy/blade/Initialize()
. = ..()
spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
+ START_PROCESSING(SSobj, src)
-/obj/item/melee/transforming/energy/blade/Destroy()
+/obj/item/melee/energy/blade/Destroy()
QDEL_NULL(spark_system)
return ..()
-/obj/item/melee/transforming/energy/blade/transform_weapon(mob/living/user, supress_message_text)
- return
+/obj/item/melee/energy/blade/make_transformable()
+ return FALSE
-/obj/item/melee/transforming/energy/blade/hardlight
+/obj/item/melee/energy/blade/hardlight
name = "hardlight blade"
desc = "An extremely sharp blade made out of hard light. Packs quite a punch."
icon_state = "lightblade"
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 6e1a9ba965a..162c888fd79 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -183,9 +183,12 @@
slot_flags = ITEM_SLOT_BELT
force = 12 //9 hit crit
w_class = WEIGHT_CLASS_NORMAL
+ wound_bonus = 15
- var/cooldown_check = 0 // Used interally, you don't want to modify
-
+ /// Whether this baton is active or not
+ var/extended = TRUE
+ /// Used interally, you don't want to modify
+ var/cooldown_check = 0
/// Default wait time until can stun again.
var/cooldown = (4 SECONDS)
/// The length of the knockdown applied to a struck living, non-cyborg mob.
@@ -196,23 +199,11 @@
var/stamina_damage = 55
/// Can we stun cyborgs?
var/affect_cyborg = FALSE
- /// "On" sound, played when switching between able to stun or not.
- var/on_sound
/// The path of the default sound to play when we stun something.
var/on_stun_sound = 'sound/effects/woodhit.ogg'
/// Do we animate the "hit" when stunning something?
var/stun_animation = TRUE
- /// Are we on or off?
- var/on = TRUE
- var/on_icon_state // What is our sprite when turned on
- var/off_icon_state // What is our sprite when turned off
- var/on_inhand_icon_state // What is our in-hand sprite when turned on
- var/force_on // Damage when on - not stunning
- var/force_off // Damage when off - not stunning
- var/weight_class_on // What is the new size class when turned on
-
- wound_bonus = 15
/obj/item/melee/classic_baton/Initialize()
. = ..()
@@ -224,15 +215,6 @@
/obj/item/melee/classic_baton/proc/get_wait_description()
return
-/// Description for when turning the baton "on".
-/obj/item/melee/classic_baton/proc/get_on_description()
- . = list()
-
- .["local_on"] = "You extend the baton."
- .["local_off"] = "You collapse the baton."
-
- return .
-
/// Default message for stunning a living, non-cyborg mob.
/obj/item/melee/classic_baton/proc/get_stun_description(mob/living/target, mob/living/user)
. = list()
@@ -269,7 +251,7 @@
return
/obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user, params)
- if(!on)
+ if(!extended)
return ..()
add_fingerprint(user)
@@ -361,94 +343,91 @@
name = "telescopic baton"
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "telebaton_0"
+ icon_state = "telebaton"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
inhand_icon_state = null
+ attack_verb_continuous = list("hits", "pokes")
+ attack_verb_simple = list("hit", "poke")
worn_icon_state = "tele_baton"
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
item_flags = NONE
force = 0
- on = FALSE
- on_sound = 'sound/weapons/batonextend.ogg'
-
- on_icon_state = "telebaton_1"
- off_icon_state = "telebaton_0"
- on_inhand_icon_state = "nullrod"
- force_on = 10
- force_off = 0
- weight_class_on = WEIGHT_CLASS_BULKY
bare_wound_bonus = 5
+ extended = FALSE
+
+ /// The sound effecte played when our baton is extended.
+ var/on_sound = 'sound/weapons/batonextend.ogg'
+ /// The inhand iconstate used when our baton is extended.
+ var/on_inhand_icon_state = "nullrod"
+ /// The force on extension.
+ var/active_force = 10
+
+/obj/item/melee/classic_baton/telescopic/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = active_force, \
+ hitsound_on = hitsound, \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ clumsy_check = FALSE, \
+ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \
+ attack_verb_simple_on = list("smack", "strike", "crack", "beat"))
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
/obj/item/melee/classic_baton/telescopic/suicide_act(mob/user)
- var/mob/living/carbon/human/H = user
- var/obj/item/organ/brain/B = H.getorgan(/obj/item/organ/brain)
+ var/mob/living/carbon/human/human_user = user
+ var/obj/item/organ/brain/our_brain = human_user.getorgan(/obj/item/organ/brain)
user.visible_message(span_suicide("[user] stuffs [src] up [user.p_their()] nose and presses the 'extend' button! It looks like [user.p_theyre()] trying to clear [user.p_their()] mind."))
- if(!on)
- src.attack_self(user)
- else
+ if(extended)
playsound(src, on_sound, 50, TRUE)
add_fingerprint(user)
+ else
+ attack_self(user)
+
sleep(3)
- if (!QDELETED(H))
- if(!QDELETED(B))
- H.internal_organs -= B
- qdel(B)
- new /obj/effect/gibspawner/generic(H.drop_location(), H)
+ if (!QDELETED(human_user))
+ if(!QDELETED(our_brain))
+ human_user.internal_organs -= our_brain
+ qdel(our_brain)
+ new /obj/effect/gibspawner/generic(human_user.drop_location(), human_user)
return (BRUTELOSS)
-/obj/item/melee/classic_baton/telescopic/attack_self(mob/user)
- on = !on
- var/list/desc = get_on_description()
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Gives feedback to the user and makes it show up inhand.
+ */
+/obj/item/melee/classic_baton/telescopic/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
- if(on)
- to_chat(user, desc["local_on"])
- icon_state = on_icon_state
- inhand_icon_state = on_inhand_icon_state
- w_class = weight_class_on
- force = force_on
- attack_verb_continuous = list("smacks", "strikes", "cracks", "beats")
- attack_verb_simple = list("smack", "strike", "crack", "beat")
- else
- to_chat(user, desc["local_off"])
- icon_state = off_icon_state
- inhand_icon_state = null //no sprite for concealment even when in hand
- slot_flags = ITEM_SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = force_off
- attack_verb_continuous = list("hits", "pokes")
- attack_verb_simple = list("hit", "poke")
-
- playsound(src.loc, on_sound, 50, TRUE)
- add_fingerprint(user)
+ extended = active
+ inhand_icon_state = active ? on_inhand_icon_state : null // When inactive, there is no inhand icon_state.
+ balloon_alert(user, "[active ? "extended" : "collapsed"] [src]")
+ playsound(user ? user : src, on_sound, 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/melee/classic_baton/telescopic/contractor_baton
name = "contractor baton"
desc = "A compact, specialised baton assigned to Syndicate contractors. Applies light electrical shocks to targets."
icon = 'icons/obj/items_and_weapons.dmi'
- icon_state = "contractor_baton_0"
+ icon_state = "contractor_baton"
+ worn_icon_state = "contractor_baton"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- inhand_icon_state = null
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
item_flags = NONE
force = 5
-
cooldown = 25
stamina_damage = 85
affect_cyborg = TRUE
- on_sound = 'sound/weapons/contractorbatonextend.ogg'
on_stun_sound = 'sound/effects/contractorbatonhit.ogg'
- on_icon_state = "contractor_baton_1"
- off_icon_state = "contractor_baton_0"
- on_inhand_icon_state = "contractor_baton"
- force_on = 16
- force_off = 5
- weight_class_on = WEIGHT_CLASS_NORMAL
+ on_inhand_icon_state = "contractor_baton_on"
+ on_sound = 'sound/weapons/contractorbatonextend.ogg'
+ active_force = 16
/obj/item/melee/classic_baton/telescopic/contractor_baton/get_wait_description()
return span_danger("The baton is still charging!")
@@ -582,8 +561,8 @@
/obj/item/melee/roastingstick
name = "advanced roasting stick"
desc = "A telescopic roasting stick with a miniature shield generator designed to ensure entry into various high-tech shielded cooking ovens and firepits."
- icon_state = "roastingstick_0"
- inhand_icon_state = "null"
+ icon_state = "roastingstick"
+ inhand_icon_state = null
worn_icon_state = "tele_baton"
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
@@ -591,33 +570,55 @@
force = 0
attack_verb_continuous = list("hits", "pokes")
attack_verb_simple = list("hit", "poke")
+ /// The sausage attatched to our stick.
var/obj/item/food/sausage/held_sausage
+ /// Static list of things our roasting stick can interact with.
var/static/list/ovens
- var/on = FALSE
+ /// The beam that links to the oven we use
var/datum/beam/beam
+ /// Whether or stick is extended and can recieve sausage
+ var/extended = FALSE
/obj/item/melee/roastingstick/Initialize()
. = ..()
if (!ovens)
ovens = typecacheof(list(/obj/singularity, /obj/energy_ball, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire))
+ AddComponent(/datum/component/transforming, \
+ hitsound_on = hitsound, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, .proc/attempt_transform)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-/obj/item/melee/roastingstick/attack_self(mob/user)
- on = !on
- if(on)
- extend(user)
- else
- if (held_sausage)
- to_chat(user, span_warning("You can't retract [src] while [held_sausage] is attached!"))
- return
- retract(user)
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_PRE_TRANSFORM].
+ *
+ * If there is a sausage attached, returns COMPONENT_BLOCK_TRANSFORM.
+ */
+/obj/item/melee/roastingstick/proc/attempt_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- add_fingerprint(user)
+ if(held_sausage)
+ to_chat(user, span_warning("You can't retract [src] while [held_sausage] is attached!"))
+ return COMPONENT_BLOCK_TRANSFORM
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Gives feedback on stick extension.
+ */
+/obj/item/melee/roastingstick/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ extended = active
+ inhand_icon_state = active ? "nullrod" : null
+ balloon_alert(user, "[active ? "extended" : "collapsed"] [src]")
+ playsound(user ? user : src, 'sound/weapons/batonextend.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/melee/roastingstick/attackby(atom/target, mob/user)
..()
if (istype(target, /obj/item/food/sausage))
- if (!on)
+ if (!extended)
to_chat(user, span_warning("You must extend [src] to attach anything to it!"))
return
if (held_sausage)
@@ -641,18 +642,6 @@
if(held_sausage)
. += mutable_appearance(icon, "roastingstick_sausage")
-/obj/item/melee/roastingstick/proc/extend(user)
- to_chat(user, span_warning("You extend [src]."))
- icon_state = "roastingstick_1"
- inhand_icon_state = "nullrod"
- w_class = WEIGHT_CLASS_BULKY
-
-/obj/item/melee/roastingstick/proc/retract(user)
- to_chat(user, span_notice("You collapse [src]."))
- icon_state = "roastingstick_0"
- inhand_icon_state = null
- w_class = WEIGHT_CLASS_SMALL
-
/obj/item/melee/roastingstick/handle_atom_del(atom/target)
if (target == held_sausage)
held_sausage = null
@@ -660,7 +649,7 @@
/obj/item/melee/roastingstick/afterattack(atom/target, mob/user, proximity)
. = ..()
- if (!on)
+ if (!extended)
return
if (is_type_in_typecache(target, ovens))
if (held_sausage?.roasted)
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
deleted file mode 100644
index 6e8bf4fda43..00000000000
--- a/code/game/objects/items/melee/transforming.dm
+++ /dev/null
@@ -1,101 +0,0 @@
-/obj/item/melee/transforming
- sharpness = SHARP_EDGED
- bare_wound_bonus = 20
- stealthy_audio = TRUE //Most of these are antag weps so we dont want them to be /too/ overt.
- var/active = FALSE
- var/force_on = 30 //force when active
- var/faction_bonus_force = 0 //Bonus force dealt against certain factions
- var/throwforce_on = 20
- var/icon_state_on = "axe1"
- var/hitsound_on = 'sound/weapons/blade1.ogg'
- var/list/attack_verb_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
- var/list/attack_verb_off = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
- w_class = WEIGHT_CLASS_SMALL
- var/bonus_active = FALSE //If the faction damage bonus is active
- var/list/nemesis_factions //Any mob with a faction that exists in this list will take bonus damage/effects
- var/w_class_on = WEIGHT_CLASS_BULKY
- var/clumsy_check = TRUE
- /// If we get sharpened with a whetstone, save the bonus here for later use if we un/redeploy
- var/sharpened_bonus
-
-/obj/item/melee/transforming/Initialize()
- . = ..()
- if(active)
- if(attack_verb_on.len)
- attack_verb_continuous = attack_verb_on
- else
- if(attack_verb_off.len)
- attack_verb_continuous = attack_verb_off
- if(embedding)
- updateEmbedding()
- if(sharpness)
- AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)
- RegisterSignal(src, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen)
-
-/obj/item/melee/transforming/attack_self(mob/living/carbon/user)
- if(transform_weapon(user))
- clumsy_transform_effect(user)
-
-/obj/item/melee/transforming/attack(mob/living/target, mob/living/carbon/human/user)
- var/nemesis_faction = FALSE
- if(LAZYLEN(nemesis_factions))
- for(var/F in target.faction)
- if(F in nemesis_factions)
- nemesis_faction = TRUE
- force += faction_bonus_force
- nemesis_effects(user, target)
- break
- . = ..()
- if(nemesis_faction)
- force -= faction_bonus_force
-
-/obj/item/melee/transforming/proc/transform_weapon(mob/living/user, supress_message_text)
- active = !active
- if(active)
- force = force_on + sharpened_bonus
- throwforce = throwforce_on + sharpened_bonus
- hitsound = hitsound_on
- throw_speed = 4
- if(attack_verb_on.len)
- attack_verb_continuous = attack_verb_on
- icon_state = icon_state_on
- w_class = w_class_on
- if(embedding)
- updateEmbedding()
- else
- force = initial(force) + (get_sharpness() ? sharpened_bonus : 0)
- throwforce = initial(throwforce) + (get_sharpness() ? sharpened_bonus : 0)
- hitsound = initial(hitsound)
- throw_speed = initial(throw_speed)
- if(attack_verb_off.len)
- attack_verb_continuous = attack_verb_off
- icon_state = initial(icon_state)
- w_class = initial(w_class)
- if(embedding)
- disableEmbedding()
-
- transform_messages(user, supress_message_text)
- add_fingerprint(user)
- return TRUE
-
-/obj/item/melee/transforming/proc/nemesis_effects(mob/living/user, mob/living/target)
- return
-
-/obj/item/melee/transforming/proc/transform_messages(mob/living/user, supress_message_text)
- playsound(user, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE) //changed it from 50% volume to 35% because deafness
- if(!supress_message_text)
- to_chat(user, span_notice("[src] [active ? "is now active":"can now be concealed"]."))
-
-/obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user)
- if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, span_warning("You accidentally cut yourself with [src], like a doofus!"))
- user.take_bodypart_damage(5,5)
-
-/obj/item/melee/transforming/proc/on_sharpen(datum/source, increment, max)
- SIGNAL_HANDLER
-
- if(sharpened_bonus)
- return COMPONENT_BLOCK_SHARPEN_ALREADY
- if(force_on + increment > max)
- return COMPONENT_BLOCK_SHARPEN_MAXED
- sharpened_bonus = increment
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index acccb4eca20..7bf30c780a0 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -33,7 +33,7 @@
if(requires_sharpness && !I.get_sharpness())
to_chat(user, span_warning("You can only sharpen items that are already sharp, such as knives!"))
return
- if(is_type_in_list(I, list(/obj/item/melee/transforming/energy, /obj/item/dualsaber))) //You can't sharpen the photons in energy meelee weapons
+ if(is_type_in_list(I, list(/obj/item/melee/energy, /obj/item/dualsaber))) //You can't sharpen the photons in energy meelee weapons
to_chat(user, span_warning("You don't think \the [I] will be the thing getting modified if you use it on \the [src]!"))
return
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index ef38ecba4ef..cde1b0ac4a7 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -191,6 +191,7 @@
/obj/item/shield/energy
name = "energy combat shield"
desc = "A shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere."
+ icon_state = "eshield"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
@@ -200,50 +201,51 @@
force = 3
throwforce = 3
throw_speed = 3
- base_icon_state = "eshield" // [base_icon_state]1 for expanded, [base_icon_state]0 for contracted
- var/on_force = 10
- var/on_throwforce = 8
- var/on_throw_speed = 2
- var/active = 0
- var/clumsy_check = TRUE
+
+ /// Whether the shield is currently extended and protecting the user.
+ var/enabled = FALSE
+ /// Force of the shield when active.
+ var/active_force = 10
+ /// Throwforce of the shield when active.
+ var/active_throwforce = 8
+ /// Throwspeed of ethe shield when active.
+ var/active_throw_speed = 2
+ /// Whether clumsy people can transform this without side effects.
+ var/can_clumsy_use = FALSE
/obj/item/shield/energy/Initialize()
. = ..()
- icon_state = "[base_icon_state]0"
+ AddComponent(/datum/component/transforming, \
+ force_on = active_force, \
+ throwforce_on = active_throwforce, \
+ throw_speed_on = active_throw_speed, \
+ hitsound_on = hitsound, \
+ clumsy_check = !can_clumsy_use)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
/obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- return 0
+ return FALSE
/obj/item/shield/energy/IsReflect()
- return (active)
+ return enabled
-/obj/item/shield/energy/attack_self(mob/living/carbon/human/user)
- if(clumsy_check && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, span_userdanger("You beat yourself in the head with [src]!"))
- user.take_bodypart_damage(5)
- active = !active
- icon_state = "[base_icon_state][active]"
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ */
+/obj/item/shield/energy/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
- if(active)
- force = on_force
- throwforce = on_throwforce
- throw_speed = on_throw_speed
- w_class = WEIGHT_CLASS_BULKY
- playsound(user, 'sound/weapons/saberon.ogg', 35, TRUE)
- to_chat(user, span_notice("[src] is now active."))
- else
- force = initial(force)
- throwforce = initial(throwforce)
- throw_speed = initial(throw_speed)
- w_class = WEIGHT_CLASS_TINY
- playsound(user, 'sound/weapons/saberoff.ogg', 35, TRUE)
- to_chat(user, span_notice("[src] can now be concealed."))
- add_fingerprint(user)
+ enabled = active
+
+ balloon_alert(user, "[name] [active ? "activated":"deactivated"]")
+ playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 35, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/shield/riot/tele
name = "telescopic shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
- icon_state = "teleriot0"
+ icon_state = "teleriot"
+ worn_icon_state = "teleriot"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
custom_materials = list(/datum/material/iron = 3600, /datum/material/glass = 3600, /datum/material/silver = 270, /datum/material/titanium = 180)
@@ -253,30 +255,36 @@
throw_speed = 3
throw_range = 4
w_class = WEIGHT_CLASS_NORMAL
- var/active = 0
+ /// Whether the shield is extended and protecting the user..
+ var/extended = FALSE
+
+/obj/item/shield/riot/tele/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = 8, \
+ throwforce_on = 5, \
+ throw_speed_on = 2, \
+ hitsound_on = hitsound, \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \
+ attack_verb_simple_on = list("smack", "strike", "crack", "beat"))
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(active)
+ if(extended)
return ..()
- return 0
+ return FALSE
-/obj/item/shield/riot/tele/attack_self(mob/living/user)
- active = !active
- icon_state = "teleriot[active]"
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Allows it to be placed on back slot when active.
+ */
+/obj/item/shield/riot/tele/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
- if(active)
- force = 8
- throwforce = 5
- throw_speed = 2
- w_class = WEIGHT_CLASS_BULKY
- slot_flags = ITEM_SLOT_BACK
- to_chat(user, span_notice("You extend \the [src]."))
- else
- force = 3
- throwforce = 3
- throw_speed = 3
- w_class = WEIGHT_CLASS_NORMAL
- slot_flags = null
- to_chat(user, span_notice("[src] can now be concealed."))
- add_fingerprint(user)
+ extended = active
+ slot_flags = active ? ITEM_SLOT_BACK : null
+ playsound(user ? user : src, 'sound/weapons/batonextend.ogg', 50, TRUE)
+ balloon_alert(user, "[active ? "extended" : "collapsed"] [src]")
+ return COMPONENT_NO_DEFAULT_MESSAGE
diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm
index 3452362f26b..57d4994ef48 100644
--- a/code/game/objects/items/storage/uplink_kits.dm
+++ b/code/game/objects/items/storage/uplink_kits.dm
@@ -89,7 +89,7 @@
new /obj/item/encryptionkey/syndicate(src)
if(KIT_MURDER)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
new /obj/item/clothing/glasses/thermal/syndi(src)
new /obj/item/card/emag(src)
new /obj/item/clothing/shoes/chameleon/noslip(src)
@@ -236,7 +236,7 @@
new /obj/item/dnainjector/geladikinesis(src)
new /obj/item/dnainjector/cryokinesis(src)
new /obj/item/gun/energy/temperature/security(src)
- new /obj/item/melee/transforming/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
+ new /obj/item/melee/energy/sword/saber/blue(src) //see see it fits the theme bc its blue and ice is blue
if(KIT_TRAITOR_2006) //A kit so old, it's probably older than you. //This bundle is filled with the entire unlink contents traitors had access to in 2006, from OpenSS13. Notably the esword was not a choice but existed in code.
new /obj/item/storage/toolbox/emergency/old/ancientbundle(src) //Items fit neatly into a classic toolbox just to remind you what the theme is.
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 6a10293c92d..4ac024e5eb7 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -62,7 +62,7 @@
/obj/item/crowbar/power
name = "jaws of life"
desc = "A set of jaws of life, compressed through the magic of science."
- icon_state = "jaws_pry"
+ icon_state = "jaws"
inhand_icon_state = "jawsoflife"
worn_icon_state = "jawsoflife"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -73,10 +73,33 @@
toolspeed = 0.7
force_opens = TRUE
+/obj/item/crowbar/power/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = force, \
+ throwforce_on = throwforce, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Toggles between crowbar and wirecutters and gives feedback to the user.
+ */
+/obj/item/crowbar/power/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ tool_behaviour = (active ? TOOL_WIRECUTTER : TOOL_CROWBAR)
+ balloon_alert(user, "attached [active ? "cutting" : "prying"]")
+ playsound(user ? user : src, 'sound/items/change_jaws.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
/obj/item/crowbar/power/syndicate
name = "Syndicate jaws of life"
desc = "A re-engineered copy of Nanotrasen's standard jaws of life. Can be used to force open airlocks in its crowbar configuration."
- icon_state = "jaws_pry_syndie"
+ icon_state = "jaws_syndie"
toolspeed = 0.5
force_opens = TRUE
@@ -99,34 +122,6 @@
playsound(loc, "desecration", 50, TRUE, -1)
return (BRUTELOSS)
-/obj/item/crowbar/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_CROWBAR)
- tool_behaviour = TOOL_WIRECUTTER
- balloon_alert(user, "attached cutting jaws")
- usesound = 'sound/items/jaws_cut.ogg'
- update_appearance()
-
- else
- tool_behaviour = TOOL_CROWBAR
- balloon_alert(user, "attached prying jaws")
- usesound = 'sound/items/jaws_pry.ogg'
- update_appearance()
-
-/obj/item/crowbar/power/update_icon_state()
- if(tool_behaviour == TOOL_WIRECUTTER)
- icon_state = "jaws_cutter"
- else
- icon_state = "jaws_pry"
- return ..()
-
-/obj/item/crowbar/power/syndicate/update_icon_state()
- if(tool_behaviour == TOOL_WIRECUTTER)
- icon_state = "jaws_cutter_syndie"
- else
- icon_state = "jaws_pry_syndie"
- return ..()
-
/obj/item/crowbar/power/attack(mob/living/carbon/C, mob/user)
if(istype(C) && C.handcuffed && tool_behaviour == TOOL_WIRECUTTER)
user.visible_message(span_notice("[user] cuts [C]'s restraints with [src]!"))
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index 19a47c47f85..b4e9030010f 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -72,7 +72,8 @@
/obj/item/screwdriver/power
name = "hand drill"
desc = "A simple powered hand drill."
- icon_state = "drill_screw"
+ icon_state = "drill"
+ belt_icon_state = null
inhand_icon_state = "drill"
worn_icon_state = "drill"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
@@ -89,9 +90,34 @@
usesound = 'sound/items/drill_use.ogg'
toolspeed = 0.7
random_color = FALSE
+ greyscale_config = null
+ greyscale_config_belt = null
greyscale_config_inhand_left = null
greyscale_config_inhand_right = null
+/obj/item/screwdriver/power/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = force, \
+ throwforce_on = throwforce, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Toggles between crowbar and wirecutters and gives feedback to the user.
+ */
+/obj/item/screwdriver/power/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ tool_behaviour = (active ? TOOL_WRENCH : TOOL_SCREWDRIVER)
+ balloon_alert(user, "attached [active ? "bolt bit" : "screw bit"]")
+ playsound(user ? user : src, 'sound/items/change_drill.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
/obj/item/screwdriver/power/examine()
. = ..()
. += " It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] bit."
@@ -104,17 +130,6 @@
playsound(loc, 'sound/items/drill_use.ogg', 50, TRUE, -1)
return(BRUTELOSS)
-/obj/item/screwdriver/power/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_SCREWDRIVER)
- tool_behaviour = TOOL_WRENCH
- balloon_alert(user, "attached bolt bit")
- icon_state = "drill_bolt"
- else
- tool_behaviour = TOOL_SCREWDRIVER
- balloon_alert(user, "attached screw bit")
- icon_state = "drill_screw"
-
/obj/item/screwdriver/cyborg
name = "automated screwdriver"
desc = "A powerful automated screwdriver, designed to be both precise and quick."
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 259f261dc45..5582d3d41ec 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -82,43 +82,37 @@
name = "combat wrench"
desc = "It's like a normal wrench but edgier. Can be found on the battlefield."
icon_state = "wrench_combat"
- inhand_icon_state = "wrench_combat"
+ belt_icon_state = "wrench_combat"
attack_verb_continuous = list("devastates", "brutalizes", "commits a war crime against", "obliterates", "humiliates")
attack_verb_simple = list("devastate", "brutalize", "commit a war crime against", "obliterate", "humiliate")
tool_behaviour = null
toolspeed = null
- var/on = FALSE
-/obj/item/wrench/combat/ComponentInitialize()
+/obj/item/wrench/combat/Initialize()
. = ..()
- AddElement(/datum/element/update_icon_updates_onmob)
+ AddComponent(/datum/component/transforming, \
+ force_on = 6, \
+ throwforce_on = 8, \
+ hitsound_on = hitsound, \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-/obj/item/wrench/combat/attack_self(mob/living/user)
- if(on)
- on = FALSE
- force = initial(force)
- w_class = initial(w_class)
- throwforce = initial(throwforce)
- tool_behaviour = initial(tool_behaviour)
- toolspeed = initial(toolspeed)
- playsound(user, 'sound/weapons/saberoff.ogg', 5, TRUE)
- to_chat(user, span_warning("[src] can now be kept at bay."))
- else
- on = TRUE
- force = 6
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 8
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Gives it wrench behaviors when active.
+ */
+/obj/item/wrench/combat/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ if(active)
tool_behaviour = TOOL_WRENCH
toolspeed = 1
- playsound(user, 'sound/weapons/saberon.ogg', 5, TRUE)
- to_chat(user, span_warning("[src] is now active. Woe onto your enemies!"))
- update_appearance()
-
-/obj/item/wrench/combat/update_icon_state()
- if(on)
- icon_state = "[initial(icon_state)]_on"
- inhand_icon_state = "[initial(inhand_icon_state)]1"
else
- icon_state = "[initial(icon_state)]"
- inhand_icon_state = "[initial(inhand_icon_state)]"
- return ..()
+ tool_behaviour = initial(tool_behaviour)
+ toolspeed = initial(toolspeed)
+
+ balloon_alert(user, "[name] [active ? "active, woe!":"restrained"]")
+ playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 5, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index cb1bb7b00f0..3f156b1e074 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -325,63 +325,68 @@
/obj/item/toy/sword
name = "toy sword"
desc = "A cheap, plastic replica of an energy sword. Realistic sounds! Ages 8 and up."
+ icon_state = "e_sword"
icon = 'icons/obj/transforming_energy.dmi'
- icon_state = "sword0"
- inhand_icon_state = "sword0"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- var/active = 0
w_class = WEIGHT_CLASS_SMALL
attack_verb_continuous = list("attacks", "strikes", "hits")
attack_verb_simple = list("attack", "strike", "hit")
+ /// Whether our sword has been multitooled to rainbow
var/hacked = FALSE
- var/saber_color
+ /// The color of our fake energy sword
+ var/saber_color = "blue"
-/obj/item/toy/sword/attack_self(mob/user)
- active = !( active )
- if (active)
- to_chat(user, span_notice("You extend the plastic blade with a quick flick of your wrist."))
- playsound(user, 'sound/weapons/saberon.ogg', 20, TRUE)
- if(hacked)
- icon_state = "swordrainbow"
- inhand_icon_state = "swordrainbow"
- else
- icon_state = "swordblue"
- inhand_icon_state = "swordblue"
- w_class = WEIGHT_CLASS_BULKY
- else
- to_chat(user, span_notice("You push the plastic blade back down into the handle."))
- playsound(user, 'sound/weapons/saberoff.ogg', 20, TRUE)
- icon_state = "sword0"
- inhand_icon_state = "sword0"
- w_class = WEIGHT_CLASS_SMALL
- add_fingerprint(user)
+/obj/item/toy/sword/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ throw_speed_on = throw_speed, \
+ hitsound_on = hitsound, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-// Copied from /obj/item/melee/transforming/energy/sword/attackby
-/obj/item/toy/sword/attackby(obj/item/W, mob/living/user, params)
- if(istype(W, /obj/item/toy/sword))
- if(HAS_TRAIT(W, TRAIT_NODROP) || HAS_TRAIT(src, TRAIT_NODROP))
- to_chat(user, span_warning("\the [HAS_TRAIT(src, TRAIT_NODROP) ? src : W] is stuck to your hand, you can't attach it to \the [HAS_TRAIT(src, TRAIT_NODROP) ? W : src]!"))
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Updates our icon to have the correct color, and give some feedback.
+ */
+/obj/item/toy/sword/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ if(active)
+ icon_state = "[icon_state]_[saber_color]"
+
+ balloon_alert(user, "[active ? "flicked out":"pushed in"] [src]")
+ playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 20, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
+// Copied from /obj/item/melee/energy/sword/attackby
+/obj/item/toy/sword/attackby(obj/item/weapon, mob/living/user, params)
+ if(istype(weapon, /obj/item/toy/sword))
+ var/obj/item/toy/sword/attatched_sword = weapon
+ if(HAS_TRAIT(weapon, TRAIT_NODROP))
+ to_chat(user, span_warning("[weapon] is stuck to your hand, you can't attach it to [src]!"))
+ return
+ else if(HAS_TRAIT(src, TRAIT_NODROP))
+ to_chat(user, span_warning("[src] is stuck to your hand, you can't attach it to [weapon]!"))
return
else
to_chat(user, span_notice("You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool."))
- var/obj/item/dualsaber/toy/newSaber = new /obj/item/dualsaber/toy(user.loc)
- if(hacked) // That's right, we'll only check the "original" "sword".
- newSaber.hacked = TRUE
- newSaber.saber_color = "rainbow"
- qdel(W)
+ var/obj/item/dualsaber/toy/new_saber = new /obj/item/dualsaber/toy(user.loc)
+ if(attatched_sword.hacked || hacked)
+ new_saber.hacked = TRUE
+ new_saber.saber_color = "rainbow"
+ qdel(weapon)
qdel(src)
- else if(W.tool_behaviour == TOOL_MULTITOOL)
- if(!hacked)
+ user.put_in_hands(new_saber)
+ else if(weapon.tool_behaviour == TOOL_MULTITOOL)
+ if(hacked)
+ to_chat(user, span_warning("It's already fabulous!"))
+ else
hacked = TRUE
saber_color = "rainbow"
to_chat(user, span_warning("RNBW_ENGAGE"))
-
- if(active)
- icon_state = "swordrainbow"
- user.update_inv_hands()
- else
- to_chat(user, span_warning("It's already fabulous!"))
else
return ..()
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 41acb9be44a..c58ccbdb710 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -364,48 +364,30 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
attack_verb_continuous = list("stubs", "pokes")
attack_verb_simple = list("stub", "poke")
resistance_flags = FIRE_PROOF
- var/extended = FALSE
+ /// Whether the switchblade starts extended or not.
+ var/start_extended = FALSE
/obj/item/switchblade/Initialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
AddComponent(/datum/component/butchering, 7 SECONDS, 100)
- set_extended(extended)
-
-/obj/item/switchblade/attack_self(mob/user)
- playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, TRUE)
- set_extended(!extended)
-
-/obj/item/switchblade/update_icon_state()
- icon_state = "[base_icon_state][extended ? "_ext" : ""]"
- return ..()
-
-/obj/item/switchblade/proc/set_extended(new_extended)
- extended = new_extended
- update_icon_state()
- if(extended)
- force = 20
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 23
- attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
- attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
- hitsound = 'sound/weapons/bladeslice.ogg'
- sharpness = SHARP_EDGED
- else
- force = 3
- w_class = WEIGHT_CLASS_SMALL
- throwforce = 5
- attack_verb_continuous = list("stubs", "pokes")
- attack_verb_simple = list("stub", "poke")
- hitsound = 'sound/weapons/genhit.ogg'
- sharpness = NONE
+ AddComponent(/datum/component/transforming, \
+ start_transformed = start_extended, \
+ force_on = 20, \
+ throwforce_on = 23, \
+ throw_speed_on = throw_speed, \
+ sharpness_on = SHARP_EDGED, \
+ hitsound_on = 'sound/weapons/bladeslice.ogg', \
+ w_class_on = WEIGHT_CLASS_NORMAL, \
+ attack_verb_continuous_on = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts"), \
+ attack_verb_simple_on = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut"))
/obj/item/switchblade/suicide_act(mob/user)
user.visible_message(span_suicide("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!"))
return (BRUTELOSS)
/obj/item/switchblade/extended
- extended = TRUE
+ start_extended = TRUE
/obj/item/phone
name = "red phone"
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 80c6f12fee6..c61e340e45a 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -67,7 +67,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/red(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
@@ -86,7 +86,7 @@
for(var/i in 1 to 3)
new /obj/item/clothing/suit/armor/tdome/green(src)
for(var/i in 1 to 3)
- new /obj/item/melee/transforming/energy/sword/saber(src)
+ new /obj/item/melee/energy/sword/saber(src)
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser(src)
for(var/i in 1 to 3)
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index d8f9f3fae07..a4ea6ed2597 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -187,7 +187,7 @@
var/can_transfer = TRUE //if golems can switch bodies to this new shell
var/mob/living/owner = null //golem's owner if it has one
short_desc = "You are a Free Golem. Your family worships The Liberator."
- flavour_text = "In his infinite and divine wisdom, he set your clan free to travel the stars with a single declaration: \"Yeah go do whatever.\""
+ flavour_text = "In his infinite and divine wisdom, he set your clan free to travel the stars with a single declaration: \"Yeah go do whatever.\""
/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
if(species) //spawners list uses object name to register so this goes before ..()
@@ -488,7 +488,7 @@
/datum/outfit/syndicate_empty/battlecruiser/assault/captain
name = "Syndicate Battlecruiser Captain"
- l_pocket = /obj/item/melee/transforming/energy/sword/saber/red
+ l_pocket = /obj/item/melee/energy/sword/saber/red
r_pocket = /obj/item/melee/classic_baton/telescopic
suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
suit_store = /obj/item/gun/ballistic/revolver/mateba
diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm
index d6c69905ff2..7d97c568b09 100644
--- a/code/modules/antagonists/clown_ops/clown_weapons.dm
+++ b/code/modules/antagonists/clown_ops/clown_weapons.dm
@@ -59,65 +59,65 @@
//BANANIUM SWORD
-/obj/item/melee/transforming/energy/sword/bananium
+/obj/item/melee/energy/sword/bananium
name = "bananium sword"
- desc = "An elegant weapon, for a more civilized age."
+ icon_state = "e_sword"
+ attack_verb_continuous = list("hits", "taps", "pokes")
+ attack_verb_simple = list("hit", "tap", "poke")
force = 0
throwforce = 0
- force_on = 0
- throwforce_on = 0
hitsound = null
- attack_verb_on = list("slips")
- clumsy_check = FALSE
- sharpness = NONE
- sword_color = "yellow"
- heat = 0
+ embedding = null
light_color = COLOR_YELLOW
- var/next_trombone_allowed = 0
+ sword_color_icon = "bananium"
+ active_heat = 0
+ /// Cooldown for making a trombone noise for failing to make a bananium desword
+ COOLDOWN_DECLARE(next_trombone_allowed)
-/obj/item/melee/transforming/energy/sword/bananium/Initialize()
+/obj/item/melee/energy/sword/bananium/make_transformable()
+ AddComponent(/datum/component/transforming, \
+ throw_speed_on = 4, \
+ attack_verb_continuous_on = list("slips"), \
+ attack_verb_simple_on = list("slip"), \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/obj/item/melee/energy/sword/bananium/on_transform(obj/item/source, mob/user, active)
. = ..()
adjust_slipperiness()
-/* Adds or removes a slippery component, depending on whether the sword
- * is active or not.
+/*
+ * Adds or removes a slippery component, depending on whether the sword is active or not.
*/
-/obj/item/melee/transforming/energy/sword/proc/adjust_slipperiness()
- if(active)
+/obj/item/melee/energy/sword/bananium/proc/adjust_slipperiness()
+ if(blade_active)
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
else
qdel(GetComponent(/datum/component/slippery))
-/obj/item/melee/transforming/energy/sword/bananium/attack(mob/living/M, mob/living/user)
- ..()
- if(active)
+/obj/item/melee/energy/sword/bananium/attack(mob/living/M, mob/living/user)
+ . = ..()
+ if(blade_active)
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, M)
-/obj/item/melee/transforming/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
+/obj/item/melee/energy/sword/bananium/throw_impact(atom/hit_atom, throwingdatum)
. = ..()
- if(active)
+ if(blade_active)
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, hit_atom)
-/obj/item/melee/transforming/energy/sword/bananium/attackby(obj/item/I, mob/living/user, params)
- if((world.time > next_trombone_allowed) && istype(I, /obj/item/melee/transforming/energy/sword/bananium))
- next_trombone_allowed = world.time + 50
+/obj/item/melee/energy/sword/bananium/attackby(obj/item/weapon, mob/living/user, params)
+ if(COOLDOWN_FINISHED(src, next_trombone_allowed) && istype(weapon, /obj/item/melee/energy/sword/bananium))
+ COOLDOWN_START(src, next_trombone_allowed, 5 SECONDS)
to_chat(user, span_warning("You slap the two swords together. Sadly, they do not seem to fit!"))
playsound(src, 'sound/misc/sadtrombone.ogg', 50)
return TRUE
return ..()
-/obj/item/melee/transforming/energy/sword/bananium/transform_weapon(mob/living/user, supress_message_text)
- . = ..()
- adjust_slipperiness()
-
-/obj/item/melee/transforming/energy/sword/bananium/ignition_effect(atom/A, mob/user)
- return ""
-
-/obj/item/melee/transforming/energy/sword/bananium/suicide_act(mob/user)
- if(!active)
- transform_weapon(user, TRUE)
+/obj/item/melee/energy/sword/bananium/suicide_act(mob/user)
+ if(!blade_active)
+ attack_self(user)
user.visible_message(span_suicide("[user] is [pick("slitting [user.p_their()] stomach open with", "falling on")] [src]! It looks like [user.p_theyre()] trying to commit seppuku, but the blade slips off of [user.p_them()] harmlessly!"))
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
slipper.Slip(src, user)
@@ -128,42 +128,39 @@
/obj/item/shield/energy/bananium
name = "bananium energy shield"
desc = "A shield that stops most melee attacks, protects user from almost all energy projectiles, and can be thrown to slip opponents."
+ icon_state = "bananaeshield"
throw_speed = 1
- clumsy_check = 0
- base_icon_state = "bananaeshield"
force = 0
throwforce = 0
throw_range = 5
- on_force = 0
- on_throwforce = 0
- on_throw_speed = 1
-/obj/item/shield/energy/bananium/Initialize()
+ active_force = 0
+ active_throwforce = 0
+ active_throw_speed = 1
+ can_clumsy_use = TRUE
+
+/obj/item/shield/energy/bananium/on_transform(obj/item/source, mob/user, active)
. = ..()
adjust_slipperiness()
-/* Adds or removes a slippery component, depending on whether the shield
- * is active or not.
+/*
+ * Adds or removes a slippery component, depending on whether the shield is active or not.
*/
/obj/item/shield/energy/bananium/proc/adjust_slipperiness()
- if(active)
+ if(enabled)
AddComponent(/datum/component/slippery, 60, GALOSHES_DONT_HELP)
else
qdel(GetComponent(/datum/component/slippery))
-/obj/item/shield/energy/bananium/attack_self(mob/living/carbon/human/user)
- . = ..()
- adjust_slipperiness()
-
/obj/item/shield/energy/bananium/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, gentle = FALSE, quickstart = TRUE)
- if(active)
+ if(enabled)
if(iscarbon(thrower))
var/mob/living/carbon/C = thrower
C.throw_mode_on(THROW_MODE_TOGGLE) //so they can catch it on the return.
return ..()
/obj/item/shield/energy/bananium/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
- if(active)
+ if(enabled)
var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum)
if(iscarbon(hit_atom) && !caught)//if they are a carbon and they didn't catch it
var/datum/component/slippery/slipper = GetComponent(/datum/component/slippery)
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index f9aa22f913e..b66a2c96351 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -491,7 +491,7 @@
/obj/item/dnainjector/lasereyesmut = 7,
/obj/item/gun/magic/wand/fireball/inert = 3,
/obj/item/pneumatic_cannon = 15,
- /obj/item/melee/transforming/energy/sword = 7,
+ /obj/item/melee/energy/sword = 7,
/obj/item/book/granter/spell/knock = 15,
/obj/item/book/granter/spell/summonitem = 20,
/obj/item/book/granter/spell/forcewall = 17,
diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
index 83b1b73d82e..86539a59b2c 100644
--- a/code/modules/cargo/exports/lavaland.dm
+++ b/code/modules/cargo/exports/lavaland.dm
@@ -42,7 +42,7 @@
cost = CARGO_CRATE_VALUE * 80
unit_name = "major lava planet artifact"
export_types = list(/obj/item/hierophant_club,
- /obj/item/melee/transforming/cleaving_saw,
+ /obj/item/melee/cleaving_saw,
/obj/item/organ/vocal_cords/colossus,
/obj/machinery/anomalous_crystal,
/obj/item/mayhem,
diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm
index 16118b9ed6a..0be53013ce5 100644
--- a/code/modules/clothing/outfits/ert.dm
+++ b/code/modules/clothing/outfits/ert.dm
@@ -63,7 +63,7 @@
/obj/item/storage/box/survival/engineer = 1,
)
glasses = /obj/item/clothing/glasses/thermal/eyepatch
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
+ l_pocket = /obj/item/melee/energy/sword/saber
/datum/outfit/centcom/ert/security
name = "ERT Security"
@@ -330,7 +330,7 @@
back = /obj/item/storage/backpack/ert/clown
backpack_contents = list(
/obj/item/gun/ballistic/revolver/reverse = 1,
- /obj/item/melee/transforming/energy/sword/bananium = 1,
+ /obj/item/melee/energy/sword/bananium = 1,
/obj/item/shield/energy/bananium = 1,
/obj/item/storage/box/survival/engineer = 1,
)
@@ -512,7 +512,7 @@
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
mask = /obj/item/clothing/mask/gas/sechailer/swat
shoes = /obj/item/clothing/shoes/combat/swat
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
+ l_pocket = /obj/item/melee/energy/sword/saber
r_pocket = /obj/item/shield/energy
l_hand = /obj/item/gun/energy/pulse/loyalpin
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 06f3a31c87e..4ab0bc13d8a 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -236,7 +236,7 @@
gloves = /obj/item/clothing/gloves/color/black
glasses = /obj/item/clothing/glasses/sunglasses
shoes = /obj/item/clothing/shoes/sneakers/black
- l_pocket = /obj/item/melee/transforming/energy/sword/saber
+ l_pocket = /obj/item/melee/energy/sword/saber
l_hand = /obj/item/storage/secure/briefcase
/datum/outfit/assassin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -414,7 +414,7 @@
suit_store = /obj/item/tank/internals/oxygen
back = /obj/item/storage/backpack/holding
backpack_contents = list(
- /obj/item/melee/transforming/energy/axe = 1,
+ /obj/item/melee/energy/axe = 1,
/obj/item/storage/part_replacer/bluespace/tier4 = 1,
/obj/item/gun/magic/wand/resurrection/debug = 1,
/obj/item/gun/magic/wand/death/debug = 1,
@@ -446,7 +446,7 @@
suit_store = /obj/item/tank/internals/oxygen
back = /obj/item/storage/backpack/holding
backpack_contents = list(
- /obj/item/melee/transforming/energy/axe = 1,
+ /obj/item/melee/energy/axe = 1,
/obj/item/storage/part_replacer/bluespace/tier4 = 1,
/obj/item/gun/magic/wand/resurrection/debug = 1,
/obj/item/gun/magic/wand/death/debug = 1,
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 34564f13e16..9839ee46a27 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -417,7 +417,7 @@
hardsuit_type = "syndi"
w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 40, BOMB = 35, BIO = 100, RAD = 50, FIRE = 50, ACID = 90, WOUND = 25)
- allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
jetpack = /obj/item/tank/jetpack/suit
cell = /obj/item/stock_parts/cell/hyper
@@ -1043,7 +1043,7 @@
inhand_icon_state = "syndie_hardsuit"
hardsuit_type = "syndi"
armor = list(MELEE = 40, BULLET = 50, LASER = 30, ENERGY = 40, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30)
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/syndi
slowdown = 0
shield_icon = "shield-red"
diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm
index 03a1b257b6c..ba44254d11a 100644
--- a/code/modules/clothing/spacesuits/pirate.dm
+++ b/code/modules/clothing/spacesuits/pirate.dm
@@ -16,7 +16,7 @@
desc = "A modified suit to allow space pirates to board shuttles and stations while avoiding the maw of the void. Comes with additional protection, and is lighter to move in."
icon_state = "spacepirate"
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
slowdown = 0
armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, RAD = 30, FIRE = 60, ACID = 75)
strip_delay = 40
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 8f00a602f97..97b3212b3b6 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -4,7 +4,7 @@
/obj/item/clothing/suit/space/eva/plasmaman
name = "EVA plasma envirosuit"
desc = "A special plasma containment suit designed to be space-worthy, as well as worn over other clothing. Like its smaller counterpart, it can automatically extinguish the wearer in a crisis, and holds twice as many charges."
- allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
+ allowed = list(/obj/item/gun, /obj/item/ammo_casing, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword, /obj/item/restraints/handcuffs, /obj/item/tank)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 0, FIRE = 100, ACID = 75)
resistance_flags = FIRE_PROOF
icon_state = "plasmaman_suit"
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index bf907fbbbc8..da5ff41829d 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -12,7 +12,7 @@
inhand_icon_state = "space_suit_syndicate"
desc = "Has a tag on it: Totally not property of an enemy corporation, honest!"
w_class = WEIGHT_CLASS_NORMAL
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor = list(MELEE = 40, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, RAD = 30, FIRE = 80, ACID = 85)
cell = /obj/item/stock_parts/cell/hyper
diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm
index b819f322fbe..b6198419e23 100644
--- a/code/modules/clothing/suits/costume.dm
+++ b/code/modules/clothing/suits/costume.dm
@@ -18,7 +18,7 @@
desc = "Yarr."
icon_state = "pirate"
inhand_icon_state = "pirate"
- allowed = list(/obj/item/melee/transforming/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
+ allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum)
species_exception = list(/datum/species/golem)
/obj/item/clothing/suit/pirate/armored
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
index 23600acdda4..ae032445399 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm
@@ -81,7 +81,7 @@
name = "Energy cake"
reqs = list(
/obj/item/food/cake/birthday = 1,
- /obj/item/melee/transforming/energy/sword = 1,
+ /obj/item/melee/energy/sword = 1,
)
blacklist = list(/obj/item/food/cake/birthday/energy)
result = /obj/item/food/cake/birthday/energy
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index 2a8189eb084..54caffca6cb 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -7,63 +7,29 @@
// Items
//
-/obj/item/holo
- damtype = STAMINA
-
-/obj/item/holo/esword
+/obj/item/melee/energy/sword/holographic
name = "holographic energy sword"
desc = "May the force be with you. Sorta."
- icon = 'icons/obj/transforming_energy.dmi'
- icon_state = "sword0"
- lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- force = 3.0
+ damtype = STAMINA
throw_speed = 2
- throw_range = 5
throwforce = 0
- w_class = WEIGHT_CLASS_SMALL
- hitsound = "swing_hit"
- armour_penetration = 50
- var/active = 0
- var/saber_color
+ embedding = null
+ sword_color_icon = null
-/obj/item/holo/esword/green/Initialize()
+ active_throwforce = 0
+ active_sharpness = NONE
+ active_heat = 0
+
+/obj/item/melee/energy/sword/holographic/Initialize()
. = ..()
- saber_color = "green"
+ if(!sword_color_icon)
+ sword_color_icon = pick("red", "blue", "green", "purple")
-/obj/item/holo/esword/red/Initialize()
- . = ..()
- saber_color = "red"
+/obj/item/melee/energy/sword/holographic/green
+ sword_color_icon = "green"
-/obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(active)
- return ..()
- return 0
-
-/obj/item/holo/esword/attack(target, mob/user)
- ..()
-
-/obj/item/holo/esword/Initialize()
- . = ..()
- saber_color = pick("red","blue","green","purple")
-
-/obj/item/holo/esword/attack_self(mob/living/user)
- active = !active
- if (active)
- force = 30
- icon_state = "sword[saber_color]"
- w_class = WEIGHT_CLASS_BULKY
- hitsound = 'sound/weapons/blade1.ogg'
- playsound(user, 'sound/weapons/saberon.ogg', 20, TRUE)
- to_chat(user, span_notice("[src] is now active."))
- else
- force = 3
- icon_state = "sword0"
- w_class = WEIGHT_CLASS_SMALL
- hitsound = "swing_hit"
- playsound(user, 'sound/weapons/saberoff.ogg', 20, TRUE)
- to_chat(user, span_notice("[src] can now be concealed."))
- return
+/obj/item/melee/energy/sword/holographic/red
+ sword_color_icon = "red"
//BASKETBALL OBJECTS
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index 6966b41d5d5..e21110678a6 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -196,7 +196,7 @@
if(88)
new /obj/item/reagent_containers/food/drinks/bottle/lizardwine(src)
if(89)
- new /obj/item/melee/transforming/energy/sword/bananium(src)
+ new /obj/item/melee/energy/sword/bananium(src)
if(90)
new /obj/item/dnainjector/wackymut(src)
if(91)
diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm
index 07062ac6cb8..3706bea017b 100644
--- a/code/modules/mining/lavaland/megafauna_loot.dm
+++ b/code/modules/mining/lavaland/megafauna_loot.dm
@@ -795,88 +795,84 @@
//Blood-Drunk Miner: Cleaving Saw
-/obj/item/melee/transforming/cleaving_saw
+
+/obj/item/melee/cleaving_saw
name = "cleaving saw"
desc = "This saw, effective at drawing the blood of beasts, transforms into a long cleaver that makes use of centrifugal force."
- force = 12
- force_on = 20 //force when active
- throwforce = 20
- throwforce_on = 20
icon = 'icons/obj/lavaland/artefacts.dmi'
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
+ icon_state = "cleaving_saw"
+ worn_icon_state = "cleaving_saw"
+ attack_verb_continuous = list("attacks", "saws", "slices", "tears", "lacerates", "rips", "dices", "cuts")
+ attack_verb_simple = list("attack", "saw", "slice", "tear", "lacerate", "rip", "dice", "cut")
+ force = 12
+ throwforce = 20
inhand_x_dimension = 64
inhand_y_dimension = 64
- icon_state = "cleaving_saw"
- icon_state_on = "cleaving_saw_open"
- worn_icon_state = "cleaving_saw"
slot_flags = ITEM_SLOT_BELT
- attack_verb_off = list("attacks", "saws", "slices", "tears", "lacerates", "rips", "dices", "cuts")
- attack_verb_on = list("cleaves", "swipes", "slashes", "chops")
hitsound = 'sound/weapons/bladeslice.ogg'
- hitsound_on = 'sound/weapons/bladeslice.ogg'
w_class = WEIGHT_CLASS_BULKY
sharpness = SHARP_EDGED
- faction_bonus_force = 30
- nemesis_factions = list("mining", "boss")
- resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- var/transform_cooldown
+ /// Whether the saw is open or not
+ var/is_open = FALSE
+ /// List of factions we deal bonus damage to
+ var/list/nemesis_factions = list("mining", "boss")
+ /// Amount of damage we deal to the above factions
+ var/faction_bonus_force = 30
+ /// Whether the cleaver is actively AoE swiping something.
var/swiping = FALSE
+ /// Amount of bleed stacks gained per hit
var/bleed_stacks_per_hit = 3
+ /// Force when the saw is opened.
+ var/open_force = 20
+ /// Throwforce when the saw is opened.
+ var/open_throwforce = 20
-/obj/item/melee/transforming/cleaving_saw/examine(mob/user)
+/obj/item/melee/cleaving_saw/Initialize()
. = ..()
- . += "It is [active ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].\n"+\
- "Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.\n"+\
- "Transforming it immediately after an attack causes the next attack to come out faster."
+ AddComponent(/datum/component/transforming, \
+ transform_cooldown_time = (CLICK_CD_MELEE * 0.25), \
+ force_on = open_force, \
+ throwforce_on = open_throwforce, \
+ sharpness_on = sharpness, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ attack_verb_continuous_on = list("cleaves", "swipes", "slashes", "chops"), \
+ attack_verb_simple_on = list("cleave", "swipe", "slash", "chop"))
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-/obj/item/melee/transforming/cleaving_saw/suicide_act(mob/user)
- user.visible_message(span_suicide("[user] is [active ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!"))
- transform_cooldown = 0
- transform_weapon(user, TRUE)
+/obj/item/melee/cleaving_saw/examine(mob/user)
+ . = ..()
+ . += span_notice("It is [is_open ? "open, will cleave enemies in a wide arc and deal additional damage to fauna":"closed, and can be used for rapid consecutive attacks that cause fauna to bleed"].")
+ . += span_notice("Both modes will build up existing bleed effects, doing a burst of high damage if the bleed is built up high enough.")
+ . += span_notice("Transforming it immediately after an attack causes the next attack to come out faster.")
+
+/obj/item/melee/cleaving_saw/suicide_act(mob/user)
+ user.visible_message(span_suicide("[user] is [is_open ? "closing [src] on [user.p_their()] neck" : "opening [src] into [user.p_their()] chest"]! It looks like [user.p_theyre()] trying to commit suicide!"))
+ attack_self(user)
return BRUTELOSS
-/obj/item/melee/transforming/cleaving_saw/transform_weapon(mob/living/user, supress_message_text)
- if(transform_cooldown > world.time)
- return FALSE
+/obj/item/melee/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
. = ..()
- if(.)
- transform_cooldown = world.time + (CLICK_CD_MELEE * 0.5)
- user.changeNext_move(CLICK_CD_MELEE * 0.25)
-
-/obj/item/melee/transforming/cleaving_saw/transform_messages(mob/living/user, supress_message_text)
- if(!supress_message_text)
- if(active)
- to_chat(user, span_notice("You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna."))
- else
- to_chat(user, span_notice("You close [src]. It will now attack rapidly and cause fauna to bleed."))
- playsound(user, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
-
-/obj/item/melee/transforming/cleaving_saw/clumsy_transform_effect(mob/living/user)
- if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
- to_chat(user, span_warning("You accidentally cut yourself with [src], like a doofus!"))
- user.take_bodypart_damage(10)
-
-/obj/item/melee/transforming/cleaving_saw/melee_attack_chain(mob/user, atom/target, params)
- ..()
- if(!active)
+ if(!is_open)
user.changeNext_move(CLICK_CD_MELEE * 0.5) //when closed, it attacks very rapidly
-/obj/item/melee/transforming/cleaving_saw/nemesis_effects(mob/living/user, mob/living/target)
- if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite))
- return
- var/datum/status_effect/stacking/saw_bleed/B = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
- if(!B)
- target.apply_status_effect(STATUS_EFFECT_SAWBLEED,bleed_stacks_per_hit)
- else
- B.add_stacks(bleed_stacks_per_hit)
-
-/obj/item/melee/transforming/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
- if(!active || swiping || !target.density || get_turf(target) == get_turf(user))
- if(!active)
+/obj/item/melee/cleaving_saw/attack(mob/living/target, mob/living/carbon/human/user)
+ if(!is_open || swiping || !target.density || get_turf(target) == get_turf(user))
+ if(!is_open)
faction_bonus_force = 0
- ..()
- if(!active)
+ var/is_nemesis_faction = FALSE
+ for(var/found_faction in target.faction)
+ if(found_faction in nemesis_factions)
+ is_nemesis_faction = TRUE
+ force += faction_bonus_force
+ nemesis_effects(user, target)
+ break
+ . = ..()
+ if(is_nemesis_faction)
+ force -= faction_bonus_force
+ if(!is_open)
faction_bonus_force = initial(faction_bonus_force)
else
var/turf/user_turf = get_turf(user)
@@ -890,6 +886,36 @@
melee_attack_chain(user, living_target)
swiping = FALSE
+/*
+ * If we're attacking [target]s in our nemesis list, apply unique effects.
+ *
+ * user - the mob attacking with the saw
+ * target - the mob being attacked
+ */
+/obj/item/melee/cleaving_saw/proc/nemesis_effects(mob/living/user, mob/living/target)
+ if(istype(target, /mob/living/simple_animal/hostile/asteroid/elite))
+ return
+ var/datum/status_effect/stacking/saw_bleed/existing_bleed = target.has_status_effect(STATUS_EFFECT_SAWBLEED)
+ if(existing_bleed)
+ existing_bleed.add_stacks(bleed_stacks_per_hit)
+ else
+ target.apply_status_effect(STATUS_EFFECT_SAWBLEED, bleed_stacks_per_hit)
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Gives feedback and makes the nextmove after transforming much quicker.
+ */
+/obj/item/melee/cleaving_saw/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ is_open = active
+ user.changeNext_move(CLICK_CD_MELEE * 0.25)
+
+ balloon_alert(user, "[active ? "opened":"closed"] [src]")
+ playsound(user ? user : src, 'sound/magic/clockwork/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (is_open * 30000))
+ return COMPONENT_NO_DEFAULT_MESSAGE
+
//Legion: Staff of Storms
/obj/item/storm_staff
diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm
index cdcca6004aa..826acb13433 100644
--- a/code/modules/mining/lavaland/tendril_loot.dm
+++ b/code/modules/mining/lavaland/tendril_loot.dm
@@ -591,7 +591,7 @@
armor = list(MELEE = 30, BULLET = 30, LASER = 10, ENERGY = 20, BOMB = 50, BIO = 100, RAD = 10, FIRE = 100, ACID = 100)
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF
- allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/transforming/cleaving_saw)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/pickaxe, /obj/item/spear, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife, /obj/item/kinetic_crusher, /obj/item/resonator, /obj/item/melee/cleaving_saw)
/obj/item/clothing/suit/space/hardsuit/berserker/Initialize()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 98f76e062e5..51ce2ba4e46 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -519,7 +519,7 @@
name = "Syndicate Assault"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
- /obj/item/melee/transforming/energy/sword/cyborg,
+ /obj/item/melee/energy/sword/cyborg,
/obj/item/gun/energy/printer,
/obj/item/gun/ballistic/revolver/grenadelauncher/cyborg,
/obj/item/card/emag,
@@ -556,7 +556,7 @@
/obj/item/cautery,
/obj/item/surgicaldrill,
/obj/item/scalpel,
- /obj/item/melee/transforming/energy/sword/cyborg/saw,
+ /obj/item/melee/energy/sword/cyborg/saw,
/obj/item/roller/robo,
/obj/item/crowbar/cyborg,
/obj/item/extinguisher/mini,
diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
index 2b3a37ef215..8948109f61f 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -5,7 +5,7 @@
icon_state = "grievous"
health = 150
maxHealth = 150
- baton_type = /obj/item/melee/transforming/energy/sword/saber
+ baton_type = /obj/item/melee/energy/sword/saber
base_speed = 4 //he's a fast fucker
var/block_chance = 50
weapon_force = 30
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 5d31eded154..0613b78b417 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -414,7 +414,7 @@
new /obj/item/toy/sword(Tsec)
if(ASSEMBLY_FIFTH_STEP)
- if(istype(I, /obj/item/melee/transforming/energy/sword/saber))
+ if(istype(I, /obj/item/melee/energy/sword/saber))
if(swordamt < 3)
if(!user.temporarilyRemoveItemFromInventory(I))
return
@@ -439,7 +439,7 @@
icon_state = initial(icon_state)
to_chat(user, span_notice("You unbolt [src]'s energy swords."))
for(var/IS in 1 to swordamt)
- new /obj/item/melee/transforming/energy/sword/saber(Tsec)
+ new /obj/item/melee/energy/sword/saber(Tsec)
//Firebot Assembly
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index ed3fb305d15..c09d24b4bcd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -41,8 +41,8 @@ Difficulty: Medium
ranged_cooldown_time = 1.6 SECONDS
pixel_x = -16
base_pixel_x = -16
- crusher_loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator, /obj/item/crusher_trophy/miner_eye)
- loot = list(/obj/item/melee/transforming/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
+ crusher_loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator, /obj/item/crusher_trophy/miner_eye)
+ loot = list(/obj/item/melee/cleaving_saw, /obj/item/gun/energy/kinetic_accelerator)
wander = FALSE
del_on_death = TRUE
blood_volume = BLOOD_VOLUME_NORMAL
@@ -50,7 +50,7 @@ Difficulty: Medium
achievement_type = /datum/award/achievement/boss/blood_miner_kill
crusher_achievement_type = /datum/award/achievement/boss/blood_miner_crusher
score_achievement_type = /datum/award/score/blood_miner_score
- var/obj/item/melee/transforming/cleaving_saw/miner/miner_saw
+ var/obj/item/melee/cleaving_saw/miner/miner_saw
var/time_until_next_transform = 0
var/dashing = FALSE
var/dash_cooldown = 0
@@ -119,13 +119,13 @@ Difficulty: Medium
shoot_ka()
transform_weapon()
-/obj/item/melee/transforming/cleaving_saw/miner //nerfed saw because it is very murdery
+/obj/item/melee/cleaving_saw/miner //nerfed saw because it is very murdery
force = 6
- force_on = 10
+ open_force = 10
-/obj/item/melee/transforming/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
+/obj/item/melee/cleaving_saw/miner/attack(mob/living/target, mob/living/carbon/human/user)
target.add_stun_absorption("miner", 10, INFINITY)
- ..()
+ . = ..()
target.stun_absorption -= "miner"
/obj/projectile/kinetic/miner
@@ -260,15 +260,14 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/transform_weapon()
if(time_until_next_transform <= world.time)
- miner_saw.transform_cooldown = 0
- miner_saw.transform_weapon(src, TRUE)
- if(!miner_saw.active)
+ miner_saw.attack_self(src)
+ if(!miner_saw.is_open)
rapid_melee = 5 // 4 deci cooldown before changes, npcpool subsystem wait is 20, 20/4 = 5
else
rapid_melee = 3 // same thing but halved (slightly rounded up)
transform_stop_attack = TRUE
- icon_state = "miner[miner_saw.active ? "_transformed":""]"
- icon_living = "miner[miner_saw.active ? "_transformed":""]"
+ icon_state = "miner[miner_saw.is_open ? "_transformed":""]"
+ icon_living = "miner[miner_saw.is_open ? "_transformed":""]"
update_cooldowns(list(COOLDOWN_UPDATE_SET_TRANSFORM = rand(5 SECONDS, 10 SECONDS)))
/obj/effect/temp_visual/dir_setting/miner_death
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 9414eba70f3..750cf4dfab5 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -25,7 +25,7 @@
unsuitable_atmos_damage = 7.5
speak_emote = list("yarrs")
loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
- /obj/item/melee/transforming/energy/sword/pirate)
+ /obj/item/melee/energy/sword/pirate)
del_on_death = 1
faction = list("pirate")
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 9ff2a05464a..deee8229680 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -122,6 +122,10 @@
desc = "It's an expensive [current_skin] fountain pen. The nib is quite sharp."
/obj/item/pen/attack_self(mob/living/carbon/user)
+ . = ..()
+ if(.)
+ return
+
var/deg = input(user, "What angle would you like to rotate the pen head to? (1-360)", "Rotate Pen Head") as null|num
if(deg && (deg > 0 && deg <= 360))
degrees = deg
@@ -216,62 +220,60 @@
/obj/item/pen/edagger
attack_verb_continuous = list("slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts") //these won't show up if the pen is off
attack_verb_simple = list("slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
- sharpness = SHARP_EDGED
- var/on = FALSE
+ sharpness = SHARP_POINTY
+ /// The real name of our item when extended.
+ var/hidden_name = "energy dagger"
+ /// Whether or pen is extended
+ var/extended = FALSE
-/obj/item/pen/edagger/ComponentInitialize()
+/obj/item/pen/edagger/Initialize()
. = ..()
- AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg')
- AddElement(/datum/element/update_icon_updates_onmob)
-
-/obj/item/pen/edagger/get_sharpness()
- return on * sharpness
+ AddComponent(/datum/component/butchering, _speed = 6 SECONDS, _butcher_sound = 'sound/weapons/blade1.ogg')
+ AddComponent(/datum/component/transforming, \
+ force_on = 18, \
+ throwforce_on = 35, \
+ throw_speed_on = 4, \
+ sharpness_on = SHARP_EDGED, \
+ w_class_on = WEIGHT_CLASS_NORMAL)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
/obj/item/pen/edagger/suicide_act(mob/user)
. = BRUTELOSS
- if(on)
+ if(extended)
user.visible_message(span_suicide("[user] forcefully rams the pen into their mouth!"))
else
user.visible_message(span_suicide("[user] is holding a pen up to their mouth! It looks like [user.p_theyre()] trying to commit suicide!"))
attack_self(user)
-/obj/item/pen/edagger/attack_self(mob/living/user)
- if(on)
- on = FALSE
- force = initial(force)
- throw_speed = initial(throw_speed)
- w_class = initial(w_class)
- name = initial(name)
- hitsound = initial(hitsound)
- embedding = list(embed_chance = EMBED_CHANCE)
- throwforce = initial(throwforce)
- playsound(user, 'sound/weapons/saberoff.ogg', 5, TRUE)
- to_chat(user, span_warning("[src] can now be concealed."))
- else
- on = TRUE
- force = 18
- throw_speed = 4
- w_class = WEIGHT_CLASS_NORMAL
- name = "energy dagger"
- hitsound = 'sound/weapons/blade1.ogg'
- embedding = list(embed_chance = 100) //rule of cool
- throwforce = 35
- playsound(user, 'sound/weapons/saberon.ogg', 5, TRUE)
- to_chat(user, span_warning("[src] is now active."))
- updateEmbedding()
- update_appearance()
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Handles swapping their icon files to edagger related icon files -
+ * as they're supposed to look like a normal pen.
+ */
+/obj/item/pen/edagger/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
-/obj/item/pen/edagger/update_icon_state()
- if(on)
- icon_state = inhand_icon_state = "edagger"
+ extended = active
+ if(active)
+ name = hidden_name
+ icon_state = "edagger"
+ inhand_icon_state = "edagger"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
+ embedding = list(embed_chance = 100) // Rule of cool
else
- icon_state = initial(icon_state) //looks like a normal pen when off.
+ name = initial(name)
+ icon_state = initial(icon_state)
inhand_icon_state = initial(inhand_icon_state)
lefthand_file = initial(lefthand_file)
righthand_file = initial(righthand_file)
- return ..()
+ embedding = list(embed_chance = EMBED_CHANCE)
+
+ updateEmbedding()
+ balloon_alert(user, "[hidden_name] [active ? "active":"concealed"]")
+ playsound(user ? user : src, active ? 'sound/weapons/saberon.ogg' : 'sound/weapons/saberoff.ogg', 5, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/pen/survival
name = "survival pen"
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index cbc9842ed8a..aad506791e1 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -548,7 +548,7 @@
GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
/obj/item/gun/energy/plasmacutter,
- /obj/item/melee/transforming/energy,
+ /obj/item/melee/energy,
/obj/item/dualsaber
)))
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index 67a7261c104..a451fed469c 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -162,7 +162,7 @@
/datum/outfit/lavaland_syndicate/comms
name = "Lavaland Syndicate Comms Agent"
- r_hand = /obj/item/melee/transforming/energy/sword/saber
+ r_hand = /obj/item/melee/energy/sword/saber
mask = /obj/item/clothing/mask/chameleon/gps
suit = /obj/item/clothing/suit/armor/vest
diff --git a/code/modules/surgery/advanced/lobotomy.dm b/code/modules/surgery/advanced/lobotomy.dm
index 0c0046dfe5d..710fcfcbe77 100644
--- a/code/modules/surgery/advanced/lobotomy.dm
+++ b/code/modules/surgery/advanced/lobotomy.dm
@@ -25,7 +25,7 @@
name = "perform lobotomy"
implements = list(
TOOL_SCALPEL = 85,
- /obj/item/melee/transforming/energy/sword = 55,
+ /obj/item/melee/energy/sword = 55,
/obj/item/kitchen/knife = 35,
/obj/item/shard = 25,
/obj/item = 20)
diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
index a6630578d3b..1a4887b3830 100644
--- a/code/modules/surgery/coronary_bypass.dm
+++ b/code/modules/surgery/coronary_bypass.dm
@@ -23,7 +23,7 @@
name = "incise heart"
implements = list(
TOOL_SCALPEL = 90,
- /obj/item/melee/transforming/energy/sword = 45,
+ /obj/item/melee/energy/sword = 45,
/obj/item/kitchen/knife = 45,
/obj/item/shard = 25)
time = 16
diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
index a7b4af48f6c..5698aa85f5f 100644
--- a/code/modules/surgery/gastrectomy.dm
+++ b/code/modules/surgery/gastrectomy.dm
@@ -24,7 +24,7 @@
name = "remove lower duodenum"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 65,
+ /obj/item/melee/energy/sword = 65,
/obj/item/kitchen/knife = 45,
/obj/item/shard = 35)
time = 52
diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
index 1899f0deaf1..2d2de0dd1cf 100644
--- a/code/modules/surgery/hepatectomy.dm
+++ b/code/modules/surgery/hepatectomy.dm
@@ -23,7 +23,7 @@
name = "remove damaged liver section"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 65,
+ /obj/item/melee/energy/sword = 65,
/obj/item/kitchen/knife = 45,
/obj/item/shard = 35)
time = 52
diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
index 730741c3eef..d122cce3546 100644
--- a/code/modules/surgery/lobectomy.dm
+++ b/code/modules/surgery/lobectomy.dm
@@ -22,7 +22,7 @@
name = "excise damaged lung node"
implements = list(
TOOL_SCALPEL = 95,
- /obj/item/melee/transforming/energy/sword = 65,
+ /obj/item/melee/energy/sword = 65,
/obj/item/kitchen/knife = 45,
/obj/item/shard = 35)
time = 42
diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
index 7c455a1e942..466e6f55695 100644
--- a/code/modules/surgery/organic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -4,7 +4,7 @@
name = "make incision"
implements = list(
TOOL_SCALPEL = 100,
- /obj/item/melee/transforming/energy/sword = 75,
+ /obj/item/melee/energy/sword = 75,
/obj/item/kitchen/knife = 65,
/obj/item/shard = 45,
/obj/item = 30) // 30% success with any sharp item.
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index acd69fc0086..f9c0fbd35a7 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -244,7 +244,7 @@
/obj/item/organ/cyberimp/arm/esword
name = "arm-mounted energy blade"
desc = "An illegal and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
- items_to_create = list(/obj/item/melee/transforming/energy/blade/hardlight)
+ items_to_create = list(/obj/item/melee/energy/blade/hardlight)
/obj/item/organ/cyberimp/arm/medibeam
name = "integrated medical beamgun"
@@ -283,7 +283,7 @@
/obj/item/organ/cyberimp/arm/combat
name = "combat cybernetics implant"
desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
- items_to_create = list(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/assembly/flash/armimplant)
+ items_to_create = list(/obj/item/melee/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/assembly/flash/armimplant)
/obj/item/organ/cyberimp/arm/combat/Initialize()
. = ..()
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 192a8100c2b..f455824d35a 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -68,28 +68,39 @@
name = "searing tool"
desc = "It projects a high power laser used for medical applications."
icon = 'icons/obj/surgery.dmi'
- icon_state = "cautery_a"
+ icon_state = "e_cautery"
hitsound = 'sound/items/welder.ogg'
toolspeed = 0.7
light_system = MOVABLE_LIGHT
light_range = 1
light_color = COLOR_SOFT_RED
+/obj/item/cautery/advanced/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = force, \
+ throwforce_on = throwforce, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-/obj/item/cautery/advanced/attack_self(mob/user)
- playsound(get_turf(user), 'sound/weapons/tap.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_CAUTERY)
- tool_behaviour = TOOL_DRILL
- balloon_alert(user, "lenses set to drill")
- icon_state = "surgicaldrill_a"
- else
- tool_behaviour = TOOL_CAUTERY
- balloon_alert(user, "lenses set to mend")
- icon_state = "cautery_a"
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Toggles between drill and cautery and gives feedback to the user.
+ */
+/obj/item/cautery/advanced/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ tool_behaviour = (active ? TOOL_DRILL : TOOL_CAUTERY)
+ balloon_alert(user, "lenses set to [active ? "drill" : "mend"]")
+ playsound(user ? user : src, 'sound/weapons/tap.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/cautery/advanced/examine()
. = ..()
- . += " It's set to [tool_behaviour == TOOL_CAUTERY ? "mending" : "drilling"] mode."
+ . += span_notice("It's set to [tool_behaviour == TOOL_CAUTERY ? "mending" : "drilling"] mode.")
/obj/item/surgicaldrill
name = "surgical drill"
@@ -251,7 +262,7 @@
name = "laser scalpel"
desc = "An advanced scalpel which uses laser technology to cut."
icon = 'icons/obj/surgery.dmi'
- icon_state = "scalpel_a"
+ icon_state = "e_scalpel"
hitsound = 'sound/weapons/blade1.ogg'
force = 16
toolspeed = 0.7
@@ -260,47 +271,74 @@
light_color = LIGHT_COLOR_GREEN
sharpness = SHARP_EDGED
+/obj/item/scalpel/advanced/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = force + 1, \
+ throwforce_on = throwforce, \
+ throw_speed_on = throw_speed, \
+ sharpness_on = sharpness, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
-/obj/item/scalpel/advanced/attack_self(mob/user)
- playsound(get_turf(user), 'sound/machines/click.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_SCALPEL)
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Toggles between saw and scalpel and updates the light / gives feedback to the user.
+ */
+/obj/item/scalpel/advanced/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ if(active)
tool_behaviour = TOOL_SAW
- balloon_alert(user, "enabled bone-cutting mode")
set_light_range(2)
- force += 1 //we don't want to ruin sharpened stuff
- icon_state = "saw_a"
else
tool_behaviour = TOOL_SCALPEL
- balloon_alert(user, "disabled bone-cutting mode")
set_light_range(1)
- force -= 1
- icon_state = "scalpel_a"
+
+ balloon_alert(user, "[active ? "enabled" : "disabled"] bone-cutting mode")
+ playsound(user ? user : src, 'sound/machines/click.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/scalpel/advanced/examine()
. = ..()
- . += " It's set to [tool_behaviour == TOOL_SCALPEL ? "scalpel" : "saw"] mode."
+ . += span_notice("It's set to [tool_behaviour == TOOL_SCALPEL ? "scalpel" : "saw"] mode.")
/obj/item/retractor/advanced
name = "mechanical pinches"
desc = "An agglomerate of rods and gears."
icon = 'icons/obj/surgery.dmi'
- icon_state = "retractor_a"
+ icon_state = "adv_retractor"
toolspeed = 0.7
-/obj/item/retractor/advanced/attack_self(mob/user)
- playsound(get_turf(user), 'sound/items/change_drill.ogg', 50, TRUE)
- if(tool_behaviour == TOOL_RETRACTOR)
- tool_behaviour = TOOL_HEMOSTAT
- balloon_alert(user, "gears set to clamp")
- icon_state = "hemostat_a"
- else
- tool_behaviour = TOOL_RETRACTOR
- balloon_alert(user, "gears set to retract")
- icon_state = "retractor_a"
+/obj/item/retractor/advanced/Initialize()
+ . = ..()
+ AddComponent(/datum/component/transforming, \
+ force_on = force, \
+ throwforce_on = throwforce, \
+ hitsound_on = hitsound, \
+ w_class_on = w_class, \
+ clumsy_check = FALSE)
+ RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform)
+
+/*
+ * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM].
+ *
+ * Toggles between retractor and hemostat and gives feedback to the user.
+ */
+/obj/item/retractor/advanced/proc/on_transform(obj/item/source, mob/user, active)
+ SIGNAL_HANDLER
+
+ tool_behaviour = (active ? TOOL_HEMOSTAT : TOOL_RETRACTOR)
+ balloon_alert(user, "gears set to [active ? "clamp" : "retract"]")
+ playsound(user ? user : src, 'sound/items/change_drill.ogg', 50, TRUE)
+ return COMPONENT_NO_DEFAULT_MESSAGE
/obj/item/retractor/advanced/examine()
. = ..()
- . += " It resembles a [tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"]."
+ . += span_notice("It resembles a [tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"].")
/obj/item/shears
name = "amputation shears"
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index baa84431bd6..1baddb9f4b2 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -342,7 +342,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Bananium Energy Sword"
desc = "An energy sword that deals no damage, but will slip anyone it contacts, be it by melee attack, thrown \
impact, or just stepping on it. Beware friendly fire, as even anti-slip shoes will not protect against it."
- item = /obj/item/melee/transforming/energy/sword/bananium
+ item = /obj/item/melee/energy/sword/bananium
cost = 3
surplus = 0
purchasable_from = UPLINK_CLOWN_OPS
@@ -415,7 +415,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Energy Sword"
desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
pocketed when inactive. Activating it produces a loud, distinctive noise."
- item = /obj/item/melee/transforming/energy/sword/saber
+ item = /obj/item/melee/energy/sword/saber
cost = 8
purchasable_from = ~UPLINK_CLOWN_OPS
@@ -2035,4 +2035,3 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 1
purchasable_from = UPLINK_CLOWN_OPS
illegal_tech = FALSE
-
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index 97110a4c1b011b4c8c2577a9ef1698ddff8f9c4d..848aeb13fd65f8ffc35ab7f63a6295729b492d5c 100644
GIT binary patch
literal 128564
zcmcG$1yq#n+BQ6tAT5&8B3%L!(t?B_(p^eR4c#z+gwi0Pbc!@c=O~CsNteXX4MXR|
zf8+D)XYY5de|_It@A|fDg6poi@AEqAIL`C(oyH3#BK&*!AP|V?netOD5C}W?=8bm?
z1Oi2V7BK>WZprxR75EqcD(iU?iUt}&}F8Syk;Rm^#Er!WJngcG5
zkC&gdm>IfX_OH!HPApp#sKAD08bza{6-!$VTOoe@ZH4{bTK%08v+pe0{TiD%Qg-BL
zyA{@+a(A7cYF?y=yXRx}hMxHvt9Ds@S1!h{ZY>Xe(vu{I5tG;sF2vnG(DbvjVB7Cw
zV~d=uOEz-sT02_zY&FRd>QjdLmdkmVaRgDAAAlLEbQQn7!4Z2rx))S0t1QTuDCVFwP`6>gagds>3nuttEy%
zr);X?{mZO1DcB*y&~NlrYKIZE;`gru(in-pHofzUqCDasgeRAN=oTMMG=N&O
zw-|aQZBw?lWb8lFQYTV_Q}9EyYz=W-`etDa^(=-FcT%aWUX$3MbL5HL$hl-|9+X&b
z`&UD!Rbau-+RUlb0??`vd#f`H+t-BT2Wf{|g{5SCY4h||
zZjZM!
zVrvz5)v>=S`}L`;z0qu=;=X4aD@A`R|IwvFsSdF&&MK$GZYeBXi#1sxO0jT#98@7c
zfW&%YBlj%k@vLD1zVy%MYQLJmWMA}V{Rn2CMH!tgd?S*(9LRBnA2p9nV)QN#ut>PI
zoNK6wfpOn9)Y}mlv2}r~=PWp#KiKh5eYzd-wR)UXY$J{a8m-74>WwE^A=J0=L`LH!
z)&Pfj)*dYhJbO8p7-*Oz+6vb6DJQjJc;x=w^2
zy5S?-xIWooGZ42`k62;7M%6+qLzpl!F>mN%8)B!&R?%cIb+T
z5ngjMLuCnXsKx7-g@0ln;ag$)A_YR)uJE!+Ur-$9892Ob^oSyB+^{o}`IJpf%A;9b
z(^9;9$44XPRBXl-&3$j)r7^H5r&mX#+F)_If(wy-izEBMARV`cwN!
zaQO=RV4_w39$QaTO4hjeRQ_|x7)@97ioqn55n3Q0-$_JnmPBc8=g`_E043SJZK%u2
z*&y0^Q9djm#Fw+CMP4E}^Umf)lpr%UoRVK%{Dbq0g|3nXx%A1$1lZ8q12MdItgdF{
z*?J-B>U#YXkvX04{?q<@ODgm)zRf%-yF+j-AYmyOH_2O2>E>|#eHy$usMi)#stkYh
zvYXGM_AuQ%U3f3;$yBgIx;kfK47bIQwD{njfj&-Lq2uEu_V4OkMrgZqLcEgHR>6S#
z1MJ-)1-Ro44~$g5tKF5#DVIC&up+2gx)@d7O1P3=l%Jm}#$V-E3mffRz$@zYXNhCM
z?#x=0sU;)M(xB83OI*IB*uo<
zH-ayjrwbd`mvba;eA(wx@bgUnq3g`^He9AKQaL>4|H20y?mIPEJm&8_gmHW9pxnAu
z9!W_Fqf~UY=rgS{p8Cluuj@i9x|Gcv)YgBztTU&xfLpSl44Te(kdm6I;4)-(aIzmW
znp9gF__(Y+sD3u`f1I!dOJ~E8t+g2>;)22h
zLM_2Kl>((0jUq%+r%~&ICYg9
z)_ykzw-@;si9k>RiK(d()6)h`EiF--n|2`C-J`W8a$0WS-V&3NLNAXuqEoo_x%7g3
ze441mT$sG}e&eXC4{c}V7h=1ya|;M)PFW4N)Y_UtL$Gl3tE)8%i;6h4WC||8Z|mwF
zbt8MayWe$o%7MPdiY~l8-Wa0&jZS1yvfpb}xy+G)bo}h=vp)cT`SOJv3^7KnEHCr)
zK#1-GSJmo*dir*EcSoGVDorIkw#R!%*{bDl5i*3H#5iWQoLe^)vspegqeKOnlJjrG
zCDwNLhAEA33e%*3RFcepkodpnVW(vcxAlMuJ`!ul0cMF1bg|pdU-Yd88RmICSF^@?
zcuECUKHG%+M&5N@{(c*z(T)BfVENR_>cP?RF$PFUi{wKeWG(@}7m86R(h>}DHy$2SA|mWF^SSlrt)EgPevqAE64
zDs!H3GZ?A0Rp0$xuR8K2W?6=h?}e4Et@&|~hDHJxYV80wxab&c1?VDcBP1|S3s8mx
z^b05S(V;nRUIe9YS*O@GRIWc#zxX7%;A#OF4a
zP5!J6ir;g0dTDF6)jZ{hn`2&-^rrIr@9>Y0uqbYNg<6;Gw(PzC(XTZO>UQ&kql4k}Fan%`tOxCS#XrJ1@{D=8S6D
zSet-g6<)r~{XBaKJ)Jbxg)I_L@qvIR_dbK66?W++W7QlPPMW|V4FC#btH(Jl*Y@!GSWLhVO&C(SFJF^ISX|7aP5HtdZRf_~1<(&7@+RfmDj7yPRdB+$ShxUsQuo0i>t
z|jIb=KTl_N-z}qU0KsVA&nAso-=T09$j5sWnyQ?Wo2dkbZD-nWl_?Y6vH5p
zzmV4em~if7;I!xK6?c{w^VfoLj544642e=kH2m$J1Ui|~)GDW(2}D6gep8I?=X~DT
z$Vx<>$GnvTOjFGFsL=EZz77wMRgEi9Yq-KtlDDRwK)-)4UOFnRcnBM77dAU`jW|AZ
zoandzOjvNmI8j-^wP#6=E@HJkj8vjJI)-M8K+i*HF1iW`C}h}0(;>W9bZ7g}UY1}v
zIl1Z}q~F$!S_A}0I=7$dm77D&M!7hnmuh+u)s)tQ-j5&E}CeT3|G2Sh$JXtIaTu9-O*zS!sIM7Nsw)#JlZi
zgq|w%cSnj^HyiapJUr^wSkaYwzS-H?sh9Nwi{_P8_nfp~8pibzi}&cI8ja(>{1cc?
zOQRFBofXi(r&xc$sA#HqB6n1WSXNTj4*2*ri|F7-WU4g1w38oyK#n3jQ_q^sX2nE{
zz5-6UKkTgx>cX-j=i|qZF0QU4R$csNlHoHXaoyL9j$IX4EHzHoLvKwxYW*H*Smfth
zOJxRN14@8d&Nk(#6SK?+T4waX1!WG1ztbfm1hYK
zee*_mrZWA~i6<;9?6aS6u4${67zEW;GS}!ZMf_J}pC*u(%7SEIl^e9XtqN+4PCjxP
zn=RP`@43@wrfUZW%*IQS74By~G&(@x&bsuBf4gv&&H
z&*3q2I02Q5;Ld}&xw(Y;mHU3D`{B(!0Xp2^?BLhPq1x6N^SYwy>gsQaYKrHKWModozvm_u@JPkd)PtPKs+vqK0T%b2q48Y)(IQnK2iO}!ay~8Tu$V#(^
zu@Ga=ig+M(QBY8*7e}Wi}uoFXXW~{N&VFsH?LRh;FeTK2VQc#J_v@1c*rF
zIamYAs7A(*A>3)m8stwx&!NZmePYYvlad=jm6p6WqK2lUBuoN!887Uw;NwKJ_I-8|
z3zDeWI7WxpjQ*$4`Z=7Qc*d?tH_xGKU{*pZ*7$t*C%PV?V5+BIC*7#J`9U<@ki1s*
zFYugb_p-_R*QjO=k8_<0y5^V<{+~WGpbELvpG@zuD__GzR3io(v
z?E>l?4&$FuHBPVjHQ8hC;_|S;amM1(v|?pQ@3NtjfhZ0#HmBje`ty$N8OCJ^?i
zN*>`nmAut+cGq*typeZY`gRii&pqcdX?T%eF7?EoWjtyqH6;(w_vtp@T5FFuBa{q~
zFww~b(Oq6%emcy_%#6`4ev#MIG|h*^(xo0>8gh}i8}fu+tL8QkyrFv^o2kc{DSDM!
zGk!pZR5R|3Es4$jdOBT*DEwRO5`wHa@;5j$R_63CTTyAn90n(f@{I
zvfR)z$}97+`zKIva4;wU>QrWW1##0-`hFr6w;DKqh={b+J%(<>_=V_w>I
zE0btiHW1S%xN8h#Zj28ZZ$EVh@REmWy%YgKW>RQ0@yRzJw*-Nrp~8`9>qh-+#_g>b
znN{-XBD6o_hY;Y0R@c`pkgeddb@WJ2&QoV+KG0%bB!i%WM90;3S?Ulv4TX|KjzQW_
zZ9q?fNB3aIID$?{ej6#JQ>qd|j>-Jz>%W1){wu)l|8~)-rNl$$P|rfhWFpE?>B^RV
zE9XB4u*w}EIt7d*ou@2*+}h9Q>`&pU(uHZt-D}aP+m=xI-rY^(taO9lCOvfu)c(SU
z^dmqf)QE?NN4l`E5OE4NRr(u$ZJhrlL@00Jr=LT8eVwVi#@k4l+qZAu*!)edK0f_Z
z4~s3jOj>GD$AwV0RVHD1Wu+U?pu!da@PS=2v^h99z7mPf1t%qu^}`;pv8nh)r=j<@
zw%!#e#dr4f;L4cnW3tYM{ehk4>gbM+j?Re*iZnjc&aJUxUepesenDGx^+WATb#?W~
zBqzB)(XFZ&-3oVP4aIt3wT2(iR?)W%-FFl2lQ0&T)Z8mLGspxBS%s=&5T->Ne
z2)S*
zm{^#*UwBxiQvN3#{}+}Y+<^9CXxP};yieus&c{HdLeTJNCZ2nX@tJcb8Gz*Z*+tLO
zq3?is4hadldPhuH_Yre_b$uCPjy*G%n)(M3J#YQMoEv-=CkNfPRQ|o{fg)$&J
zuliK}{miXOd@bwee_wgX5jA0V_eMb)`O&}Bcpm{M?e*)|B5C?MI-eVA_~F00BBA^W
z8jbBgrCl-4QS2nTtzL_fA*PjvfQ*I^1}~4{e^N`S;GM~e_l|oY92}hK>P2~M&z*?f
zyG4Iw4NXMAMz^B|*G|9?)KsNu^c3nEmhL1T0+Twzdyyj^d&0Lh#RF)DZMOd}9aK)>
z)$8sX9fB#N+S}Wm_=+Ld#}LF~|IZTy{TXU8{7bC@9;YvjL`RuiPis(GHXM@==K$&hsa=lW?z#VX)Of$1WxURg((L+*bNpa6@t4mX5
zfz9O%_d&P%KB2o+l?E6f4n96Tk9Oeq6c6DuH7xi91Y58t2-t|%<4;5#_y8O?y)75@
z?Lq?5esiyC>O?{*=*FHlU=N&@-6~~R205F9-r+4q?_7I_zH5fqg9rPz{a0eAc*gv1
z9b9d{EUP@jLrOG2c;Wp;5QaZS1Ey;!n_J5Ldo*+m@jnG`gX~~c(BIaEaXR|{gLL_a
zfYFCms^JF%3`at0s*TX8imK{+V4ySm+1O|e1o~|%7VJeuoa;S<(bU?U=RFf*)V~JR
zZjtmB6&>3J?K?ZC`Wb^&RsUrXkfHSA=O%4Fcc}Qy!T|U+H$Qg+>AaqwVp;0k&3ohR7@`}#zzklO@96U%IJUTjB7#4^q{YPmp9w(liAa(Z~bm?h?F)Y
z&@@Ym#3+Jjm;db>Pmf?7^0+s5{ELsT9%0O{KMFnd8(fFYbmIWe@bsFP{x2u021joU
z7*|`y3!zRIa*a?GY1~^dzjm8rbk+H-S3L~2h)iFCKOqSkNP6cE^S!GQFJBu+7XQ%y
zUlVtFjYhq4=o(+p5E3bz@B3#u{`te!cvNO~lo@gNze6zo-{R2!n$ukKJ<1CYt$y#gZ$Ssx{?k|HtW=O7>hWO
zE7D_pu^v-=0;smm@_)v}Ynyil_j&KA8UgQ2haeT3LvY#tqrR1#VVOLLKM6*I<8KaW
z!)r5k;Yo)GCqSNHo)>DDE9_{O_jbM4DuMwQE_dkZc_T;|EA2myjEpP;akO)G*4S}w
z>^2Y|<@)y=qiA=;rG@5A0g{TKs6Q8SW9+Km$$EEDDZ2=XD0I4r1JPGc?Hsifiytyo
zZQIA&y0sUOiH(V}o3Z0|Z3$U0ckrajE-t_*Qt|ql-_HKH&zJtiq~z$&etccJ!{@pB~h{w!B
zkNT2C7Ly@fVbCk6&wDDU2Fh17-GWIYMa4mWMn`aCrO>Nd&W?AQ^z)H)m_fXFlQ{eC41z1m5%B_{|K!c(~D)
zQ&LLm4h_vasp6Hz&&?Am~QPg4EUO0wRjiZeo;j;zwB0e
zK#u8;y{xmu$#X~5WHnfx8T|`1CvrODu|SN-!Clm=RpZ@8SX)~IY%hQuO1&^~0g*Jo
zJsLe+{uMf>#5u@{DmxD1sO`2~X!2O>OiAExLpVH76?Sr!{{(^@6#W#$#AMD>;(Tdo
z={`UQPV6C3UDN_Q{590)Tjr#TiQ#D|G1AxlHY?Ys$S4NtwflflWH)(FzKM$SF|8k0
z^|^((>%<3rdGQO9(a--?XfY=Wms0T%h2{iZ-FCLX1ufQsE5BZWwY9VgQ&Z{h-HU2#ldN-|
zzbE0fo8agflZ`&-Zy~IK+{_Z#``L6md$Zo<;o%{md$hj3zBg%I^lS(qVGUH)0~1Fn
zY^3v6WMNLyqTZpDi!R4HlcVr0=Xgu
z$}BVX*1lp~$EU6-1a)Zuod(g-kL6f?M*-j|gH;Ymqr^d*Gy&z`*-9J*m%6F+?T9F4x}ivv=s
z8+F@CieqWsa9uyKR`~rVEu^1efXFkYT?da|EX*IAr)gIsi&eTM&@%g+
zT^HArFXzTze`-p(dS4HJrv@MTUV)T&xuC5OHTe;>*AIDLg-_httuSrB`l=D(CF~)K
zrq*oK{!Mnnb$t0EsH3NMU*Z^aL=ZBzrVm8A2w-k5T8g`dXhEI!NGH|il{krq)e!Wy
zB7h4sAhq7-7^V-{pVr+m??4lrWwnTWCm_W8+9Y5J0=1s)K2cGLvRE6HLGJ9KpZhu_
zw>19fjb=~ue?Y~s7CAiAF82)m0`zc-=7k#{6
z`Lj9sjkaO&a3un-t%v|5mvRC(89L;rnTA^JTvT0Vdu!#-B_xmn<%$^-GfmCB*RzOH9U33v_P2}l_yqHhmd
z&VqbI$Sv0E1LQX}-LnXCeFQ56ad14q|B68fh-@{BK%vU4-R0uo)kWh_aE>UcM=wQS
zs}7gn5jc>n!(oV_?L;ez9B`TUl_>9@gdhI&u@EK>x)ZUNQ>+{>?H5^%noaczfTFG(
zfSb)LFDI-pZtPe`{+Of8qlA+CEwjPNBz?`l3+v~)ySX3!NEhbd=I#OtHx%6OQCsF<
zG`$%eJX884ntQ~O>&_!~GKQ)g**@H*rnTC{UkebP*8Bu?8HjJ{6n2+cUu_X>Z;Ds{1
zXS17waL*hc!}FHyfPbm7A0koOVj5)Yh~}Ij$N0JuonI4pPBGwb4_%IxL!YfdpJ5~f
zd@;_dE4nW%OaV&3e|dGXwH#Yv?E2mt$7TDA1+8Tu8K1X}aieo=)Ii9z>nt%S4-~b7
zoK4lz)4K)CDM$4Tg9_|u*x*HuG_TWRq6-fhm%#*7Xeg$Sj}M0#8*&V~fa`kF=>JthLm{h#bZ(QXyN@bkV%~l$*h|MnAjH
z+o9t2Z7quXAwe2<>F~r5PEUh>G(#6Y#k|ZGtOFtHYv6OLyZHNgjHPU($=faI=5Gc+0hL3~F=*f=SgRH%
z{OPyJurxr!x&e63YMh0|D!xQPLGk(XXIT%O)2od%TPDj^8LznpESg!Q08|o-Al@Vi
z06~R5J&oGM+r|C$4paN-=O-;!{_WyFJyUintv2ETGq*+S7gI6*NaUYozVz-DJF=E|
z&MzGk+7+FZdW{=mNZJ59!0$L0cC&)MQ2Q#%)zoDRqor8=bBiukpTAQCxtf}VY$QNTc<0XTc9_m(S3j-Z|0zWpe$C+24v1bLUrCvL0!L5MK&(#p=!%N(Qz4;NRK
z4!6UE7JtoR9*bjiSrw2FskZM`rQ^jWW5DR$LQN$5pjmDBV
z;2~+hL4G+&Z~+G9z5R}q9i$)syua-pBcnPxZUy=f)p~Izb!Qnf_vmNcfcxX-W)a3Q
zRdk;wj3pQ2XTPq*QZm91OFw=^+1Zm+e|wt%K%mK;R9Tu9hJ2T&x8nA7+5k{0GnNTz
zX>DFob`IKe(#-t>@?fq=V_)YJxB8~X`J@hJPz)ps0T58lMsA<$y#glugAm`)BNR7R
zl@TVHWYKQRA5YP|c9Sv!`9hm}p0b)+%KiKI!w}@uEQIgaxBua&(wluU?K_~@!DVNX
zqut669z1wkUe1G!i)-1R%A17nZ*-nNSW7c6-9}G7dGo#bi(nmm7=zVz=!O>qSdoL>
z={rY9jNbdn;~YcXGlnU_nnXYftgx2CU0U}KBUN$fXBs1Bx*PRk4?p1{i+sHskoc3`
z+&f$}q{;T%6YUFF^?j}H#Dm{bPb(h6OYSS|JV(dvK`HOtxnqI2IFvl}()bI*&X7Ir
z53J0~u}`!8A(Ha-kdC`POn|6SUbINqH1yMs%0`1$p^h
zU^9q=msfbL#nAT8E%xMVVhqQ_0(i3_p3PPfL|2CyRk|c{K{Al+Jj}FrciE$0LpeR|
zAOC6g8B~ha=;k?{|MI%v;Wl0_Z-&UWUKP6%(aB1p9G>e_ps1*Oy-P$uAT+=ELTK`@
z^9){nBDL%P6uS&0u%23$?Kab1`xRlN`SgUr1Ln4J=>Rhrnqclobj5z6z6m1~6FnpO
zHx>jks}jG~X?4b)w^3ZOd{2{tjeFRApC#!Kf~;9tZ%|FQN@}xxN!shxN~3Mobt&D#
z8D9T4{q%Y&%+Zf=78)b#71=#MpWi+ea^ATj8M;|ycv^Va(lf#xG`
z#!Jgfhq7@&Z%?C%JXJq=zy&ct6^b(N9DXY>6EjG1+-G4aTJNZ`x?}|ZwsLhlzc@@v
zUo%eAZG2vkt3baol*6xAX~HRd9#|w7dvxU1)Y@vC+7FEk4}W)Z;_+|4)zz9_EslFLQujg9X4#_SiqEEuK3N&x7!`n73kwTh
z0!G#1*cuQD=^_#Zf#MjX0J`jIs~7{66L55!&!mYdSy}{W(ZL4!`1$o+V*zBgP16c=
zUy$_%R{fz?Q%>RIVJb`jxHjQO0PLx@Zs$4UkGDN7jy;GT%R7sSI5pcOK8GVA7eRs0
zd|bumx9XD}?E6`#x%rrSfYoJVpq~O@ky;w@+Wis-K#u4r|0`r7Xh}_)-lqKXPkV$p-ae#Cp_}i(_kvA!_(k1FEOVnttX*FMNwP
zAvyeJF>Oy()R{IA6LSmACd7h;OTwU2q*mUK_8DUn*xzquhOQpS#~xMm20;1S
zpaht<->NFG^Wg9>1c4b0q=sSP;kQ|0z9jB2N6Jik>V64QJV2i-Y>CYlk$`e_#~&gB
zHN}k-h-$+GA?C@IQD`W?iV{4RP<4i0eNQwK@)+?LIMNT-`tvAdmW21Dlf)YFPoU0y
zkRuZm3{7+Taj?{d0rEfJ?_Oy4zo8x)oMyQeYTP_M6@YFp0gp`$AY?L0Nzs?-S5Y>I
zoBDYm$|X1eTKlFQ$i&n%&jb0F_u4XljE-f%cwlZ=1`dmFlLX3-o-`z^;h=aBln(Qu
z&7Dt}Obztu(yTj~T#`EOY(qzhNW`-_}
z&Nu^7+uYxd
z0yWNcjfH2tm;YTk_vcULXT(yDv0oCg?$s-Tde{0x2G|)Pj=n?UyBY-uAT}CAnoqJg
zNH5eq+Z4XHxuTX~-&{@HxtgoOd1EURCLtx~*X%&K#Xc5PLNmw|8XCH|zfUY9BlEor
zi}Cu>P!R%jI&q6{KOxSNl$5+lHOR@ybKBbJ3=N?;`}T3-_Ro>!{lvt?ls6#-nANH(
zen4y(vWZs}Ce2#-BqUTsSrCJq;?Lg@r|*~c#%Oel=SK1hsJwPv6(i%!KD&7<`RDxl
z01Xlpw}9sF%?daRqMAv>^ghM`Hb}bw>CwKfY3+ZSxj+>W=PFArtx*^xtRL77wCRCl
z?E)z-I>QO38^MhE1qCDC1BRflyVNf)4wj}{JRK^a+DEI9&am4*2L_(Hx(WadJ9f>b
zW`>5Z-`?4p)Ncih^{KTrE6~e_0a73IA!<~Q*Itbh`@^EjAh~y7%_V4Np#IPxmwlDW
zt>$2xyBOd-Hvz{Mf$zSnc@wu-R_MIB$$G;R=z2x{4RYCd1hh>vqFi={3)fUe?bq$C
z7Si866IK5{B*Si)3JY+T3Ah+h!h3>O8BpMO!BW-g-?$%)Z5iq7hQ$7Uc(+I3wS}hy
zCk1ABSOgICJJ#gAtw*p-F4LMucttP5|o(U4G(KLF0>iGM_TSq
z*W51AXS9~yHmOikQ5iiI
za{igXOf6`IcXV{b({D4FZhbl5A~Z~vpP&B}XenD;m0@Qu*0Xg0eC+7Ug~Rr2hU
zHNU2&rni-*t@&_j8IbKApc&5qC`kTQ%cDWRP(zZOW?7Z^9$62jl*v9hq>wzZAP1_r
ze}RngDESR3-3LG@=>edw+TA3{4vu?Bi>_Dv1rU2{LgB_&!d}fr4^F$L3xg(PD9pVH
ze;`ia+*78FfJNph9873Xd$-RHCtbbT1?q;Oh14-MX@M?t^WH4??_)yHOXR@xJOo^$
zE~jnR7V+D+Z$EoKilrmn3a2|5KR0{&6k8-y&lycfOzb>ztwIX$n7|y+N%{;QCCM|_
zi}@Vn7QHb&Z;zM0QdUt{PZK03W~2q;8`jp=)~FI=;DZ^wr3X9W+_5=1=0Furt?cuw
zO&@!iQewx(Hu3D=;ASb+*QuZ@#>KZJS<7HOw1(oVo*um}|^KgI`}KuPlck&gpz|mC4s_T(;({_)WTFMm9^Z
zmAxX`vGUTh_SB9k+z!#A`@y4S#H1K#b;Opi_}vF~*`Is--1suq-ujUZ(*A|t{M(05
z?VrFCMhLP~m_2ZqKRK0hye}{oPoc*OIRxnm`szL;6}h>&>455JCZrMkK3Zb;7Kp5h
z-UG?GCG>GvBvOTTVoum-tuG)w_A%(2tDZS(<=#*f{lx{<2U{vs)=R;Ng*2Y-?z&Fe
zs{QWWNQ=WCW&Q&9f89QOKk+g5vcCfM3;@3_D7m87zc&%#D&*M}ooU8U?K-sL%30dOvFpG(;XC~JtXMagv^??$_PJA&cYF{?TKnBgYaD;{vYcwnkCJH(}^dQ
z?$8I09cv`NHq&C%jg9nd6mMy1Yddx5d*@pTCv2=dQ&Us0x94JDoa;UU3$sag^fZ<)
z?BT=+uxrSB0;sH8s-q957MLBNA-Xn9D%cuDugX#Q!$~YjXTEK1ZH)+J`Z=Nz)2xc8
zxzcSu<$;V0^jUw3jawrT2anhrplG~FElLA;Pz?i@Tkl()G>Y0yWfRuPOD*}{;nC)#I<(mag9C-tsu#W&kC#9#41&(NJ
zGE<6YsF)~80GCxy{83b({wwUt?=5z(v!#-Th9*8z{Ou;F{%}oIAxMa)r-+%0}J3X>~yJL((bCmY(T4YPolDs4ez4wy`85-B(v!G4OF0E#LapyAfp<1zo}rC=l_YB-QZ
zYk51+O0Vk0Ej{k@dyY0pQi^hY8(wId^QdaJUKi%DKA2$c=}pNVzXyA1)Iz0
z4(V5qt@;|sehb(iO=TE{RGjjUu~(*HfihEc~`o$z8
zfLSb_v38*3>-+eZ*W)(`Fac{(JbH2QC7|sqwL{XiJntni?Xj(Zz*a*C0k`W0c8rzk
zmKi}<;-$GcI6xYKrwv8dK`t)UMcSH%hVQba{LS1$!DUi)vJ5y(jsEj~r@J#_NAR?+
zE{dH@pnh`G#07OjWtco`7FfM2d3g@Bk}d&6{P^yJlO0ciWse$e@p^9A&KSapz6u5m
zo$z)T_Hs53uA0Da>#iu}I}(p@jVBwmPM*C4pf17Auu}Yp3^OE1o$hhwEfbCqZC`=P
z7H`boe)+alE>Uhw+&#I#YQ2PmOBq}61Zu;PZB+HsxYqFOY5)KW#94R
zHs$}jD`RR3DqjQOcLSg@Ddrc5drnNL9(Ru;n@(86<9MH`$(B^E?grWAv%>FQvEMK<
zt{xw#6BPxTysO{t(11V*jF*O^c&(ex7gu`WB1}7zn-R%Rt{pT?YIX|#sTU^Kwgb8Kjt^q#UfcS#fxIx+R
z&L18n=jOn{jS2o2Dxjw`+Y(PBo6TvDBpMt~>6hOP(zuyYm{u*!I<9)L4=UB%bnWb?
zj|&0Idur&}n34mvm)Q^x{HU#{LYX>xhO(L6ut
zw6nE!8-zzd&;>Nf5_&%TTeW47WlM~pPjUO)pqG2L*M*JUP9rKhi
zkZiB|$%)$Y_ICzo-zoGd0O0NbI4;R>O1+X1v;C_3Sq8ja`q&Et<8~Iw9}$5S8$syVrUocq1bQAAvYccba8!M0IbD|$}wndX~_pF
z9n|6;95*X100yVrtlg*$Sd0;sV|8P>e_phMke9{l?ZqCK$NRKyYSU{oEzeT~)8f2q
zlh-!J7;5z=_FwX6FX(SlU`}&g$NFYdxp3%N@ZPmO62EXB$a?{*XzOxW
z-WI6$OHq-ssy(gmpeS>Rez;b=kd~#yvXKYMi8rTxJLUnI1Ri#aF+ZhBxUAoMZNj$m
zjRJ$SSKq--0-O|MD9<;`%)>c7^%UrUx(P69<@qX1&Nxp2@5J~b@5NJX4GkuWP4X`v
zSY1ZToTLpO$(dAs)@sju?9h?2T5X98ZT;TP-H|j-3@OL@aHS|SLG}E#W~4f0EGfvP
zIUnCBOh%F6Re`k>Eb!bE1H?-dN}h$KEIs1x>Usz0n^u4c1c82W`LRCaM{ns
zhe~U&RZkahsrmrCt2-vFwl}wDHO4!Tg@yT8HnI4)2@#)%`RW%kgt_Rzf!Uu73>o?3
z$XC|0ek{zNgFwVqnV1JPgR*i}Ooe9ZjEY}p%c6^7QCARJQX026P5v`adIwPMQ6U0Y
z5?EqU`xx~0?V>g>Z39|%Vl1rN1*&R&T((&QE>=LGul$j}K-0GP==gSDEaz=gDWl_@
z_YIRp~fjJyuS{qGXAXom`6l?diW5g8Sex$bQR?
ziCy@%K3W>sJmR
zjdXAYWX<|WQqxY|ihee2MvKB|!lp53)8`nBhNs;uaUH*AzzOAkD44e%KqMQ>pY>;`
zYG!aqo~;vo@Yr!4yUGDRZ$=#UcZ*(==IP>nKTtAX1<4WHjB{-Wlf)ZU_Ov64Rwo;z
z=6*NyY)WH!oHNI(Y%gx-8-4^t_3HM*4`4srbtqkVa$4F-BxBISfy47I5}CI^a;etI
zxI?OpI*%ZtO`oS!BMx>{J2RjHx`N56^v&YO9(z6N8&y5*CfFot6}
zXt}&p!$(SNA3|+FTDR&xL6oFWBy?Xxun-8KtM`ld*|W#p6OFmg>F4!-z8|)CC3wEL
z*6!nS^`h3LD00MeYUFHU%q+gT~qojBDn
zi7$Ub3>hc>ww=lebMu}e*b$aOtp*pVWr*A?3*7I40Tir4hKSQ6B1pMBlehOdWkmtd
zXsoR+Mk0Aa8bL^tKdrdqN-^C+2k?)|?(c(Fn{PNHv;Pym%=y5LfxLe5lHqC0Qvk~_
z3Y0Mqs^tUN8@%=wReuPUqNzlj6x8SJy-x+~{tLsqmq>4wFCJ|fZwZ?*AlGBQl461E
zdeS+1I~y>R2SXyW=y-Zvb2A~_$jb2iX3MNdhbe?(qQuMp^B$~auu2ruYW7FtVWUh|
zW8KI>rNXCE^oFaG0za(bqF+_lK$4RJj=Z$1$btBl;I{|Na%rIk=|>OaapNu4LIZCO
zQT|;!=7D;Dw)@@OthBQa=lTHHxx7xi<#iWDEsQ;CpK)6GM)GPEF!uCYr00GYxz!Hp
zH63-Jek@G;6es%ccHw#~x!VMpb@wi{)4sjIHCDvjo34>>Tmb`#Vrrs{TUOmV06r3f
z*W)qm-9Qg=TtvbovFSj9f`UBp{klnog%5zmMkNckfsS?3u1Jzb$t&;92B){_G_ji>
zTko6#%O9ZrKxN}*g)>n5AY_zo>pm6tJF%;H5f1cV?2!^tKLh~_IMa7sPM}01Lf$Om
z;!!C235W-IzK!A-v>*tjq@WAkG#5f6uk_VhOkk_EM{bw!WUGZh`R`eGZC=i`jU7ba
zi-RJ!5W@V>&r8&z@JGN3wu0^gdSV-f?i;b^lpl2ihc5oQEwt##S-apgxx%U8_OT(r
zN1q{ls_41uyo}*mG;jq;;0)m+bV03$KA_a9Uv`xozu%G+kJ(3sgVZiph
zA{JNToQ_~%d${OSOTIb!$>tPS@LO;4SVFH(lUy)0e{a1}w%+fseJPU>h-S)v8Iw-&L()xGCGrx!?@vnc8z)G!tIAg)-0K?jPGeHykm?9`)a=x9u`mrHNkCv?Tj~G{w#Ox{pd)6
z(yZhmz}*$E!T2L1xxL)dft6+e@Qh)Qy648u#LeBWMN%Yw&r{teobPTF@Ke`S?LM$=BLBkV{nh
z_CCL!BD&z?&+WGEQy;lH=)p*35BYd|$FF~Obab)jr#dW2o=NykZiHO+WX0k`yTiJw
zD>I%2D(@CUhd_-E6ztAUt)FhSj__u@RewLVeTBhFB1ixyv&p3J*+1*rB0$oia*)=uJ8
z84+sTm#WBxRc4%}aa45MO_Mn~ZD`gZs`C|JcX#(T!@hc)5G*DC(#>%+xNWqN5)lzk
zMvI)d=IYSZuna2yB8EV0WLBif$eTA?*YDo*oMK+|eN$QVf`bsvDf{S4gj?lvZkA)q
z5V`V}_yP&xehV!wr%DeB9(HU_eBnJWjAY%!D+_l6HBsCY_C#*g76>4e!sPpM+wapM
zL|g3Rb5mCy^qJM8f|1)j-CV4f>kg!igP>mnthy%@$FhSo7R|r^go1{D!a6$UC*Ue2_ks+lJaB{v~MuX
z&s#orzPe2VhvCTthkOKI67A4MnVx!=$bIB4x#r9e{u}+u6f#nf%!Ha
zw=IXzSIfG=Yr3j?OqfZ}U=zsK`_%TgEM}S32Ip1xzVM4aj}9-H*zA@*nPG+De?&&2
z(#4nl@Ee+S3Uoc&E+Sy87N@q~{_Je$W`;>n2eCylJZBD9I2Ksz+Wu3+9gKx1{IWWD
zs&?WH)%hEy9TU_?!dC+o9W%56B
z{{QPeuNG_`4@WM}_S|ZH@vf2nzt3!CcqZ<50!?k0Zb<1`mrp3WRq#w@9cvxX&{LuN
zzM$m42M@ltJ*U)BTGvg&bK{1A0Tk2#*;Zqn-r1jXnf9mp*InXfTEhHA5D%qPa2?1=
zcDdX)RB5~KdEwu?M3UG!CucsS931dVIZ98TvU+0s?s=VtuA<_mXM>I|3SQA8?0t
zW;?GEj8`D55iC*As><^AuQo|wk&EY(SN-44Yj(#gC+rhKU~a9Ge7~{%8+q0pSuYU?
z1z03t*U&w%-Oqj+Z=nL&piTxsQ_vnFOBFVHTJv{*2FilXU=N=dF5(HniP#6=pab*o
zc@Tr?=w3vDFvL6a8WV4CZ-91q2~g=RxgT9!U8`0NYJ|^9=fgG^IWc!=qTiirhbaXW
z)H)lBs2=Ko#E(39J2pe#IaVkH7{N>q={UW8Ro-sCF083z>pEO=EY)4G{VZQd5x$U<
zaN`XG&=k7SKz8^*GTpv(CKr#Dxmz2EV3;g^%Vq)dr
z5$gBv-&Rs01yF#3yPP0u3|R5#xK#kh%kJ8Y-Sw#
zSK$GH8s%6v$1le2%kedVM3(OSUje*}+F32fl@%gIti<7ixWxX-t)9(}y7E2wG
zCCy9C>Ky{`17-)8gfrGBre#hN1Ca?$t*y6Br&gTT
zuQKfzmskY!y;xI;79RU{Z1&=XE*WO|lcM>M`@B`~bmCEee}B>DJcP5;s&kjT@Vrn{NYL
z%>NBd@$C`oM_Pod9`OM^`udQkKO1+BpTNl`=~ceD_eu80j{$E-}|TJ
zlz9|TGCwv%P(*v3u?zeq!X}{2lp6ePL^%JInj$t)_!V+%SX1HMYI-nwl&Vb63nWK|
z(P>;hLrOB5ZGSA(_woYeHSVNtv`*h=`>4j>6cs^|Crn+%C&mfzVyf?NDM=jqO78>(
zHD1Dz9kUt%3<^MTTSUF!g2ui_=o||YgtTaoBDru++}4pfJM_u-R5A#;s1XC*|3fbT
z+9iOb;{ySPiHV8NiH=0aBfz^5dl2w+J6yl*OoT7|6Xi5xeDf|Tsn8Eq@mdBh7R(Z)
z>dzr#6j>tIH-F!iod%IDXXNMj!zB%|3xp?bA}90=Yv6C3_E^~sd;^K)yGETNx`%{pEgUMnEv8vq9It1tm0BnTyXaNvg;yO6%mjH@`hSKFC5KPCm8_x
zsL(9%cA2u9bNLRB|GLZg{{bU#!J^=3mIw#P&C9!I0oco4WK)8$#Mzo?Ni
zy_w)LxIDRF5+$SHmiNVZsei0k#7#h}P{Y-#dj-6&2A5;0nr-qwzzKOOa+nA=_lzcK
z_Q#K{fDynUZM)mf6HD|;0{5AxBauz#!BX}=!_OAN?bls<;LXqh+65sieQa*@x3f892OBl0b=8?6B5XP
z%LimDWL8#=xXC6CSsxu9rj#@o87-zlACTLd<|AnW?k5jvUNAhl47ptZA$AZ~Rs>oT>`GQVTg_v2ogH~SGqc$u
zufd^^XcPU~wYwITdC&;v?I?!+aybE%XaThMvmYeKs?F&R&e2~u&Wvr}aY6HoUc1Kl
zdT=l$jl4?$E{>(NsI~g&DT~IFv&j9!>k_+S?u-WJra?d5ZRjRp1z|6NzGMNc%(xtV
z*xUE-Cjg-7H2_$Ejur*_rb$83ZF~Cy>$MCa$%=Fr04N&F3+~MM^obZsJ>C1fbaz)O
z_X;;RcX#}a+_E6jSOyt5mJwd$f{#zSH0qjweEs2RkFgxv=b9m61`A^0uymcDKA4h<
zN*lkzGX_$=aw)W!US}S>G=H{2!Xf(gXl`hgjjPNGS}^8rn(doB+9PQQ$=kP}_-ECq24tmv1uIBg8L>qe~W8HJ;+~9m@Ui
zM4^}U^|D~Di^^_~y+s+4naM-R`)qq$?9WWS{yXCZV#@E_+}uf37-%5W!quocjnln9
z%+1VVfpKVOC?H%OG`*GkW(;YvlO*db&zb7YWU_W61=EFS7&*o%_0F3|Ns}xlAjW(t
zJY)~Zf^pP8yffgpru-aM6b^rqm^O36Zs-`{#bu0;y7!2zSc!d5DT1&%py?-0YSc@0
z8~PE3f`nTh#)TkevuCS(&ISP0YH@8X7Eq)BWF8+NjRG^v=V;vP36LN67Er~EN+II8
zZruyC4hJJ8V43SoSK!c%do%~;U?Y**1>2beM+XW)*7!FGj@}=8ymk=I0s}=m$CzTHN)ymDM*HP-&j``fV
zW7v{|_~6T^%~*I4#Q2d+EZ9J@=Fqy*uQ#RuvUZ7U{3oGJN(NipnO&y@qsOXS
zP;0>2@=NH6cUf1ZYvDM0n=fnliHnf8`>+qXCbkVY2!n!xULCAYRuvK*YLe(2_=`g#
zd!Lq-j@`jHa#&%0Pr*k+oui7;u9fzkiHNa?Q8ru&x~*X3hSgtcz2`kn0;uai1qg(;
z|Cg-%pUVDUtnokf{$C5>|2LP|MTLH9-{Jqtcy#^;HTd+dZOqOf
z^`^o02X7fx7BRP2nmrlSU|vLz^^)|K!^%WAHhig1EV7!o;iCObXkdFS%KOACY{Ip$
zGrU?4AHI!z^-4S-^$Pn^Z&TFY*QJR}cq0@=G!v%2Z16PJ2ysDEi1}X_N2!=Uzc5kl
z(5_4Cp4T0BWe#6X721%sHS}epRcCO2u_cj`XQw$%UW-s{t0%qF-o)|M+Y}6}Day0L
zM&_x(F!I|fY(e$hgmt@~gD4>d!@mYstHll0VkNRqcuup~MuQ3u869__2dJik+IPf*
zZ{GsNEGAK@4P3sQP>oyK6@(XLGNHv?&A+NkooI*A|j;~W94GyW8
z+)N1n`!Z*3=9|Ns@1sZAm4PY0{92(mgA^9Ij(L?htC1t%k1*i9j(4MiZR8#3Udi@J
z>7IDBFv#ci?QuK~sEPNUev&XAX^$~>CuSCvX+VcTmnfMhC5If6gvW***gfid)zBR8
zlzGvex2!d}UBN7*Nr-Kv_|pd#GA=0PDO?%VAH0uWhnL>v1fa<_o~E@%$oM8Hh@kfk
z@lt*DjJ9Mt@2{-#-XC^LlYbRf(NNCeh&
z?W@4aK8FavNTq%^1}FV&E|?r<^&^_WGfuWamf$A0Sl8*P_lC$3T2xd7aP>k$_eSYE
zkVt)yqC;(NZcYLt=3kGwUFi1rkDv0h(Ry_>Kwo*C~*0a=efT^
z>k={!R4v{~EN%oOW8IHXyu|aw{3Q<$j|NZuZJgt8p9hn-3f+2!4y5j?ebk#!IsKgD
zJHkLu?yxNqQ>xm)k$az7XxHIdm&%GosP$!~p35;R6M~%4W%qabyB~7kb!#}3gCMka
z=^-f(dMfKI9xFCptck^39plvk?@Ao(9o~&5)2j%rQU{Nmf)UL?zymZ7s6EBj$9Ur(
z5n|54@>k3`whE-~3mOMT&;znPPCQ@iLF6mFw6Gh$`9PhwRTk(1cA&e70xn3f`+yPl
zAXTR7(ab2yPFc*@x)1<)MtKLu%dJi`k}`qO{+EEQ(Qll#JG^kJ1o$f~!7b{lUKB4N
zaEtdhyJZ(17U%*&Py&qq4u;u*(;v36oE>MRviJ>$?H&z@i)0{HUy^x{A(8NCf8S>l
zoW86>fqs1l+x-Y;B>^e!6uV-Dh^$81+A624qR)}qv%(}ECT53bL`6iEi$Xh80j{88vOlmK=rx|D`$33u9t>3omb9s(Wpe2mnXe2MB
zHcldgZrN{3)c%HMg4yHfK_#A<-vXbfNVH^O1G3xkH4KvTnllWF4)1C`(T_Hp$mm9l
z5Zb?CUkLaR3NCt(f~r?#rt+2ZevtTk4v-o_fHgfoLEQ?r+sf_f46$(Iork9mu8T~-
z0j?*M<5WQ)H4Ci#G2Tzi>yN>`eLi|Cs*oQ5w{^Y9ymTBBr_>sG8jXyS^WQ!Gj*O&K
zjv+YY(}E3<0FYTaw*R+c;2Sl*GqgVwI*a0Xn4hTcAaJ0>JSKohHt
zVgoz{7XeYm_wIHIzfeUiWs>_t+?gL#$
zm-536S5iROGz8M0a%kNViGXnLd@eu%3TS)?re9q1-e&=
zkbCnud8-fJD8*{O{;5Fb6eSdB(A*c7rAoS0Af&cFIHtl;vsu^Q+iyP;S&2fzaaL93vCzmJ`_FNtek}B*
ziYQFbiFmH-2MOPeIA9kpUR*uTdr{?xLDWfG_bSLZr7e}=4k-;zM!K}
zgWpdW>8CCutlb?&&jEBdQ&RfvU#n05m|>#2MkfqhSJd0O3rx~X(cZ?Inc|4&cb@BkbLd994E_AVe3k0mF%fdV?LpO$WEllLrK0C*P#~Mv
zI^f0N4l3Fr@0ARVh%le2SQ5w)xvPupokXC|k;)w|X9p+2F&Pf!mZfT`3fqSS?;sk!
zX*Pi)%~Yv}rc#AF)FE7f+uBWtKFzAb+CrY8i>A=NrbamL@1^qnjO0%#?0lgLiCYQ@
z5sI(kV5hFi1jJrx9iM3GKJ^9(owdqMo$Pk#0c
z;Vi(KZ3$@1d2jt54CFK+lhZR?U(__pUU*Qgoc@|_Cb~1D^3mq)Z-)mhph*(p{qxUx
zw(+HOCiJ1e;WsQUu11i}^%Ziix5o*YBBj!6jjwR7U;IRCCk$HM8M24F-I2iZo^Zd(Is40S24e#N+d84d0WcT)1X~
zjxZ;YA{UgK)iIN%heG_uHGaLIMT7LGlUu+0m8bn*Xrn#^z6w)Z@t2^McQ~L!n`0D;
z5T6MYrAJoTI7gXNb{N!!E0OP>&a7Hv;2U)cpV4s1oW)a^=X8#cSkP!YJUXMU9pTRx
z2QLZ_Js*QB4S#!+?oF|ALlM4S$Oor?aCjF*Vi_Mo1jyLY^E8s(CccfgUV&JDT*Z)3
z4!zjljgxe{O0C^@Hn4u|*KB&e5(Hyx
zHUO50N4VIJylH1lq_~9Ey0Y#o{?zmxbwn3cC#ow2;S%Gl$%u_I1kL97Jbjl(8s||O+2~vv8LyXoJC`z&&KG=Q7
zXNsp?A#o&B+-T-ZwNd>7YGpgOkWN+Q=iK)fKX3$!oCu&3hrF238xYNW6&-!{hELf6
z=CeoGWn8w_Ja;ZeU9s1WM^XiZNcvMGDOdz``
zzk@j<3+wHM*-*}&Yv~}wNN~r0B5;T2=xscO!
z!*m%yIzpGXtNN2g$?iIj6-#$tE7$Ne9`*PlRZ^#!Iz1v%=8mlSj5HjCUY+Y!E^^3t
zbez3P+%r`Iec?3Q|#=yi)lE1ft9Y
zkns65y72scj%W7%9h%fQH(ZII?t@6PXcCZ74JQ
z;2SPuZ;n~gB;nc9)!?y@HReJlE;)lEB*kHGO0az&+7h4xdJ){bneq|co{Naw=K9WO
z&b;9@P7;fT_^J7q@KRRpO|gr)^r;D+oBubQWo
z`kGgXj~XCOeFXsEdbho`nSJX8G23H&1e8b*xZXt?_elXSSNJR;hF$6|F@y#ZFu^}w
zmB@;V>wJ*)ruCk7jo3d#mtKGwe0`P$tfQt{_a%^DcPZtX%-v10ZD2N4rN`%bQUcV+
zD;$_yL(cFH05^9TQ1e<_X^_IW*F>XkJ}yWOEf}GA*UXdU8ANMx+nZP!Ar&ly_(|Zz
ztiG{4;Eq=**#gX!&vY}q8PYuIXp7BVQUcG*tZ`LhwytXAqDt)ce-4*(201fQyIy$^
z@Sbp8CA7B*C(yz$Q_hLiqclq~*33m7tfby^oogcbwh`ffdYy29($v|(Esdo%6AQh#
zRb*XSd~IZR%3txx3~xobNw0YCki5P{nY0Ws?-=!saP8VPF}FpvE9Q;U8&e8kFJQBc
z`E!vh5DZ`@k5|4}`vEXDeUS0&5_RHPjr}nAf`ZFO@wJSBOO#n$Iz=$xLwdz*=JS0c
z8)oJ+f1(`7L3yMCx7c%TG}}i%Q&2%#m+0AP@ZTHrO!boE76Erj=~g{
zeh8m+q#}-^jr;O#X9FDUXzks|sAm`5$
z307OJA>+cp!PJ(u?q@ldAp14rUlu_zrfQX=WL_4&|3CTb{^uPOlL4Cixt8$Lj8CbE
z=?HJz|3V>NoHwvl;)weA@w|_(@Asm#rpGPeFFO+igmkx&Vtes=Io_C(>i9SBhFrIr5XZWe+7U((t7d(!U;1-_nn_ao>F!
zm+e7XEDN8iaY<5K&KN+DX!FC2zCPnE^ZDRvuL1tz!G5W{(9S&0NSjY{`>fltUHQ}57HTt<+=?zoVh^dCt
zX&?;?gA~#YT4})3^>c^-oj2>Q9MRt5N|&A;AdF7#qTgLYfMIErhWSg^`nfTZ$k)%~
zim>&1r5T>mepO)%Qz%#@zhaST{iEV)2BOEHge;nzP0S|Lhj5TeG1ns8$~R#
z+!2Z=9Uf#~4A24h&-N=ID%JTye)pw0O%Rqc%rE=xB5qB~JPsakBkzk8<7;i_cKP<{
zTMB&#ecFR;Pr}HDeB@YN%)mKMbmn4f4Kc>;VgbE?Z62W@GXtn(Dyd9mK3ZFurvY#@
zp)F<(YVwGVAY?r)F&3^5>MELz)ZS2}mUA(QYwDC`OtOUi8yHXMt0e_>8aT~M&wX7K
zO5y_f=hD+`MhG^Ri5G)1Ar9VzRWxjM=3I5xBU#vSfRwEA&df%;U+r)6X0`}%6`GJr
zTJu#Q%{bt;(Wqrmh82?qA9fA%MP|a=H%s+5vb;rgP={5{)F&0I%0d-_>v&_H#lt#g
zo4Mboy?hySD!51$T7FqPsG!m;n5HN!13&Ev+i{3G>>4@$&+|B^K4!(MqG4*KqCf0-
z;}gH%Q?|C}gsqISN*PgRTEhmk42>ulw%2_KF*iun`o)1qMOsbmp%89|vt7Pd2s>^fo_0~UPRg(j{`E#|v=7S6t5A_d4;_Fp
zK}rdhQ%cG=X|IB>&Sg!CiuOK8$niRBGx4vw3S8zah*ma~&!u<2
z;o=?OHaCd)8Y1;`ck1VrQsPdWNRe(HncuJqgVcr!hfGjsJVrao|I^wVT24eLxIih7
zUaeQWEk`|JV?KhLloqSzRUFUlJ*$(#-ZP?l@Sa*Hu8e(-dDif&x3iF6=uGg3?AngQ
zot&H>UR`nVNcMxlbsLMBI?p$3X-(hyW`rTa+zUGX+O53Z>~tzT;~|oCm|Rh>u~COe
zW25<~SrpVcp(bodK!~?)`nuu6gTrc_!Vjo^kLuclewJs0YjoJl=H~VTnYW0(`tTK;
zaRdyTT{gPC9?2&M`g$p|pB+=ccA$g-h&e1IJ^SVM{?~NOBNb3wlf4ooS{b~1W*9(y@S|7icPH}e
zK|G*8h?7@dYxwvGKrKs6t8CYIffL=|N=>a}6u652Ondjl6TH`CFW#YJi3N*-q;#=J
z*u^V{l5Ve$6WC9kucUdt=CkYDLDJqr6>(+0hqGV4)ad;+luwN|8tHd-;JN?RdplKw
zJyNq(c{9=Tabyd#wZ+ezG10@)w$GmQYwO`t?H6MhWJ5fYI%`}dn4sJ^;f#Yx&3M^>
z0#`A$m?#q1y`_Gdn#BRgs@F?mt11J;xI$YaowwH&3HT)W>VV%p?=7)Vpnf;v&rCXw
zT^_dTHuZ$z+_{ScuOqlCQuuv%3EH&g$xoLWh#A0wK6X2Gp(vym6fmWRzgMM(e!KY-
z^&?_d?DooVc*zpr$^)FjF#sInDbF%_XkH;GBQyEi?a-S8y6|p|7WySZam(nf+5~vsc38cS`v$?iHIzmvfUXC2bq+A)D0eR}N`of3&$X>(Rj@vC-+Z
zUuz*xtiD`;a2lcx{r;x!mklgdr-6`_mGuepge_~WcV`{3Ew-sgXCCE$=zRt9jKhD+
zBk&qVsPFznZIEaI8Ua_p8FG{0#zLt0{VEF)41urh{qDy^jvr8)rTd3+SG}HlmPtID
ztxz&^?*F#cC#!b;`zW0iirl6%BAACSSEa$Op0k
zNSK%08GaD_c}QF&?V%ya=q@iW{|U4Yzw}fnZintsF;b?dihB{w|fj)XYeA6&E?kn
zH71^G-?=!V;;@&fwf748+!QN}z3%th@(Q#?z5ldV{5Jo^mhNuqYqou7odG+!@2!XU
zzRr&L9v0Hj@Ni&@(}3(S>piMju0(6%AgzDG>+SDfADDKR%{O6!Hw-3xPZ5*d0rO2Z
zAX3r&vk!PxvKI>QYMPq*0ZW3OLMo|N^}r0hvesDfu4Cr#+$6_Tj82VZy?p9T&(*i~
zGPNM>@&?$uj9wcpWF`{lfmZPvWM`gXWOM}_tJ|xi-J(;aKbDh*^E6Yt5GepdU7SzWcZxSixV>nWTJHD4_A1g
z0)jm-nFvKUpW$iIW*Jer)yuQf8ZL`rbBW{jD18FQFZ`h~g9IaudB7
z9Rr6I01iu$bj*=-98(jnZOFgGX(%T%bl1ZKjeeW@9d5ek22+D}*A>*p
z$k%%4fz^9#if;hS>=SEK|L6KBY~mTvX#hD?%Xd1+ai5IWZHVvVYLk~9DNp|_=8nbo
zeZXdM3rNhhwjJhkb&c``V)Vk-*;|ukWw_cp20&%%+
zClx-`*j8rqfDk~w+0k9)kO73~x-oaFpuBs@i3g(
zz`J!##*57{$eTKzWJ!i9}HAR{^#IJqHG?VNaCfMQykDAJN+UNkeMV|Qz
z$?j#;cYJ$pdJ_e_uD1jyE42jjDY5ws1XzA!E_i?4KcadR)eBFPrQhp_V1*nM6lc%s|L)Jc<=Tx8pQ!g1
z0i^V5e0CacEcNP-7w*&|Dn$RPgqfLTK@@4cF;Mo!Wr|P&XDVQtB7p(M
z5ul!j5`c1|Dh&x;4dMiP_6q4)>3wZW_MWrhmkg1eZEe&=lg?S4I1zn^zyAZ)DG3ai
zm7nl9sl)3xE;Tg&wNk0W*yzCjS*|}#7R?U0FlC8d>};mNfVIg=N3J6=l*#2}*$-#l
znIsujzdu$afZa0%E&lw8EPio<(Su+M(zt?5Y2jVn-Awjm_mZDjjN~tY(2BT#kv?~e8&r!X-eM~V+60IR8n(>P>jsu*HCe8#Z1-QvpG!y(0UiYeftLH
zcXA~tXT`w$K+;&CsVME-u}6!D>5)4~<8RmmYizj}y*QEZ_u=>#8fm`+1`38hfW*@P
zHkKO^HNlb-P&1v3r_p21E6J@8mM9VVg(f8>
zE&lp-0YLEpKDMKbFZo0CY_bgvNs%n{E$}75ez07IWNc>WfS
z#4Nu*N7g1403yehKxqwk(vp;gu%R6Q-JEExVo!bSY1msdH}ggW;b|}mAiui`_>ccd
z?w9=p&-Th+^}73Os?mWoTI%hU7C(80?8-Y{Ue(q|Gcz-#E0wbO5R)WV8&ncq
zp$Maz6GU0D+cs+wCF%VQRH0){uUN3px%l+r_flJ|iUWwCP365YAK-Lo>kY-Pkvw(0wAq<=~n4(
z07Z4zwK}-))a^p2l2YI_0mQj$jf&vQoHlsX*>;8=q}=Y6S__ml3PDCASz_*mcG_|1
zcUij}qQ}LD8?$^O%m2-sF@2CB?QT=-G*q{R8izGeg4&sif@gaWc5akk*OeRH=C%q3
zuYzVLU7i7kXCNLqLst|B*{=R!cX-Qcwe#NU99Z56lgnsVxMf>Oo5?VcolblL>gERv
zihN1(>!t4A-H2c9M(n?;xdGJ96dG$GWSrpVJAEXudQ{q75xgB_C%D$#kqM{R7V&;Y
z(&VQwa2_U_$|#I3eg{2K{IYXU`iSx@S>zMNyCt=lp8Fj;W0u@nN9QQfu}M1%#k~W(
z-sD6XB7AR5bZcaGsVm;!>4*a4K9=KUj}sYK{@{pkax;PWG;;Id$U
zil|T$w*+Wi_AC<U+odwG)X+Z~htj?XTl^PcJ@JAwnPiq6Zk!9^tJm5S&bsT;#
zyw}(px4n$J1{**kdTIx>>}H4$=YW9v{?o)xu<{Q$C7K9<2;jM+s-4hbqoAeAw?`mT
z_y|+M7UVUt8d9X7_dZ0qGK|>RTyFL`l-!h%c(@#x8?fEeX0S7&
zkg^SLT%C8^f%G#eg7rc;F973+ivJ>6J{Rl9JNTG^@K`j0U8UcIW&oi)I&=60GU=rf
z*5V{QdGbW9f9%8C!az463K)#u;Y)0$i3{3EG#fs?A>#dXWbH%T=b)Fi4_IK|FMm_J
zzPU*UE46(xH^l~FB>zNqAB|rNR#Z7TTXQNanhT~F0aNTXNw@9b(
z1Nf671%ck!=@myL(+xPb<`-B^_H39GUD22A7ShMp{P?qZ41!3lmJ
ze+xYeReQ5O!{fOq8LUzVmaVPmq0YVtrnNWk8*!jx?`)gb6sPD$0PS9#0QWQV{Y44G
z;}K@V2ML32x2aWOEKB=IdnC0B+`5cC`3-?soRtj~d=b`k_e(rNBHr*$CrN8
z%BW|U)Ln-0e6-na|5vGYa8BB(>-CXrDhb`o}Y#I2(XKlohj3CnD&76T0h0^LLSvnqT9v#-$Ihu}qczuk2S#8rgF#DIw>
zXN1umOnNy%{nP~(E<2wWW4UFa?f%41aDTVJ{}zFm3qZ~lkedoA|i)iA@{MG`4!1Ulphxx
zpH-sYbtLg&J99fJUTIbvM3lKNZfoD=il6zW$mPptuqOPVek44M4K?37iV(9D5Dka=
zf6j>#odHR*-EI+vW;QnR#ufLG8a2>Rdnm_el2MY>#F~+DV>#oWsNUWf%&G-}N{qCI
ztm^l9OF7Ocm&g8GY-0&T$moMRn+%HBocdibC2_qhSILu!cK7@;^7viI)Yz4sr=Q`{
z9hE^c9}=(Nkc>i$aQGvxOJD*Tn0Hpd+HD;#7ra*u=h5Q@7_+R+o|Loq`%=~;cFp^O@li}Ujmougm
zq3M%{OCU?FCWKIXdb{5#6Yi`Gd~z)(Q(XnhoFjm$6d}z*9CH8PACwOvEqXcpj@)IZ2dG79;Ye2DR)O~IOaiaM5Q>hL#)0pst_g>F|%2moP
zN$y8fbi1F*7QMuYh&oVir_gu*V#aUXBYH=7K|BI1^Q3hAo1C$5<0#!scR7DI*G+V_
z*QpmC1jkXjeW&pxos|qW%;(>+rDf2s1TZPEjKhl$2NBqvN`j)KCHn}z35=irkB^j5
zy^K)#8zNKda0yC%h@GC)%FWG8YVz6V!{!W4GO{I{#+zBK&opP5&4SRnXXSA%=
znSx~1jSLpxAtd-I8o2yv8k0@%kNk(M7q<~61(+m-{Vx?2VGI$vlZPAnh3Ph%r4s+W
z{ofsz;OcxK^WM(SX5fbBWQ}!K`CLkGs)DSi*ByO*k31UBqunayH&W2%F~&RKn%eI;
zkaG&(r{pG#ITM#a2Q#yc{KTC@qMBts=13`#N-3YaJ4?5KH
zZj?Ioz5!MJ_Rod~5&qE;iL>l&;}QL`M{$M2?gC{R_|?X@TzEdfcIcolH~G_#Fq&R8
zHAhGi`U9_}!i#u6gd7s>&p{3pqJ9UZva1OM&rO7hD%8D_u>}85FgCmEBhx>SM}%t)
zL#2oOfG$QzelJcND17YO2&K+imt~X*VaJYHb*mJqre(apLU~b`=yLOeZ3t0Ykn+Hie)S2#8ES%es!@gdrk&VS5@$<&3Xk72L_y2cm)RAAph)`}FYq6PM=Ii$Qnqk1sL`&EwQFkFvw+Z-ROY<#2^*>QD1^IufFgko`b1#90dL
zFD)Sw4W6@yjqRk+SFE6Jwj(Zl)wVM&r7HhGI5==AB`|T5@T0(r+k;Bu)P8wEz`kw1
zf^m@3PSjS&KQ;|af&7*>`xl6VZ3ZM03Ud*xy9!vA(Sr)uCnGjn3I~JDNZ!z^HKan)
zN_oziIXlbTzTysyhvr%fsO{|BKL=YG35tJb6*UZfa7}=8HGCF(r(-8ymi(>oPXo+9
ztAhL;iQTs~jea;P^(1mzi$GHyfWg@QM`z(_AV-{_{{iac9%8z#Pokq=j~J3BPLeTn
zBsNorQs@;?LK5*?{qO((PdY@D)K0&7EyNrqNCJ}^AWJPb{CKtf-vt&q6NHUu03DvR}4v;43u64h;qZ8Km96Xf-_G`eeN
zmrr^6v}6Fgpy{zW2P)G0J~YNja?Q))?dKzkJrutg2e;F{myc^e<^CKY^}pHBxb<^^
zbRv&nolA7V?u)A--<3-IqxxSAg!I(CD#mc&1k!mn=o_FmW8S2PNhy1EEY?iQtK
z)1oH=1Au?v^g)-)N?oc&c!IhAawXANKK`J43qD-2pPd9bj4B_&>lpYgm9oeL4!>qg+vaJ4A?wPtk!pKe+}2T<&i@z?^B;}iS~0n0WVjl
z@1?4ll)fCob@R>2ai<%K)=*pv6QZ<3KTXkSidx9N1IpmwX-SDs_1*{Wf@lj2?yMRnJ7aR0lmC-{k=1AeLwO49k`C=lR53oHEbXl%D34*TH#1&%RZZ
z3cckzvG`=0)8g9odr<_P%NN!Qn}$VvT9#Yp6hNsWV?DluLVn-v!hEPdu0<+*f(^Dk
z|7>zD`J0jYacIP^u39q4%E!ZW7TL_`%jI(1|qtg|mS~l4tk$oeif?
z$v2wP1hS7y86)D;C%yQHMICuT!9)$`TB%@inMH69AEmc$HwrMF4*BrTKpl86R&~zd
zb03~My~6}diEz1mC1vF{xW50wtZRY6c9IU&c##h)(UVfSQ|F1M89X=UdH3$!f0j)F
z4Z}scUy%p4zff^$2*|CCTPl}j46)M*acAoUKX`Tn`s$%or7;&p@$oSmba`}`7vD}g
zPOUekrw&oV2$WpJ5g$r)yDV_;?kkQ<8ovT~N$6G5>199z+StTAH$KNqtWY0{@4_W6
zJCS*>KUz#(`f$n4+Hm%Q=s1g$wiHg=@67T^@9QtpaH@Ci6kONNEAEv1$7izpB=?_*
zRApNMq_Q09PeRP}KEG=Y&PMy4Fi6J@=^#d{&@(zuACNlSh8*sbM%nU|)zt|6gKjpHUP2&
zYfTJEgc;R1r#-3EPz3#GV|Vw*ukNI*UrY`SQ^dRlCG^>pW7QEANuUPn;hNiDC-d2@
z$=ZfbKMcGuZYKaCqj4Q~b~;V~(UwbMfQmp8%*Gqva%k@KWdSl&yG%n^B+fmY1l&4k
zk2$uK5+3_%+EUZ6RS5>D-P{qAJJrwmeUChyq7I#pbo|NVclvDKCcq_2aYjkH=B$2|
zcLJ>)cD`Ev)rvsRR#_o8asP!(sa-WA0Sn?(sRk!EBUJblIes7vz
zp0Dj?Rftl0RQ_5AcW(FOx3BMry)a%C=1E0!E=u)YRoC!0VYZYl)k2t>{Denn0`%j9
zf#U%$5f0!9`#VekUBGdcDw$k+&+9CJ79i0umQKVYPFTxPMxiO}HpB)}liPtasTpC$
ztL1@WakX^H1f8qMXkS-~T&DcG))g*cQ$~W_>^WrWhG92MtzRQJQ2>gOD9P
z@}1Nz*0AM6y9h$=yrSxO-)Dbj72@F5fVPCrhqP{A3ccCi5A?;t`!l}JE*^R4cuMpQ
z$-?g>HCZq)u)g$lBx3^0{0SE=F*+=Fn)mu%PGO3AzX8IC+e
zO=PMc4$#w@vUGY~#POfIeYl4a?XMk{5VS4nxQ
zWJs{jywCtz$=MF^(42W88cFcQQTv)_5|v-Xrd=6he3X&qo7$`WisP%ItK!(~-=8a1
zI_?zbNewE<2G<>OPmn`9Dm$NuQ>*O6@Ij
z!_qr^&VTy7!~wf`;7t#`5LJUUJ?)vbYTzC~v~WT~MSEm?sQju7O50?Z(cd};_E~}3CE&6vgKGEBK3FZS{JQ(w%4;0La}TyK|tw7kgh>V>24TWx`!AhzCE7fdEfVoKYm|a*LSYV
zIm0vY?Af)}zSmm!tsepWhaUcYhUN+Bt$%f%A-i3c|#WA`Q
zC#YbxhsxFo{ZB=_q!?CVF5$RQYjj&XTcgt+JUh$alwk@!w?6&|Co+7jTC@w7XC|ni
zmT*Til%zPa4kfrg+)~2-lmOmqJCwduLRBqGAJd)cSya^yE1=YvbR}~b7DEzzV3Gu(Q)aQH{GuJQ}r=%=}!8_@R2RZU=>(x_v
zDI#VZc`LcmC2)m-$?|d#JoeJ-Zk(
z=dS-d$-vjLfGCN86&?|w
zTrI%J1R!l}9*4hVtk1_%P1*={YD+aE%fTO4gltIPYvMe@7JiNy`
z>Y?!=V3$)WD#bdeEgbAlQPhAG1H|kcSw6#pvbNgUPG~C4QkQ6pO94CD#&hDxi;?oo
zLrme#9^#*HNsIj~XOC=GJQ4xK(*LM{D*~Jb`Mx%+Ss&bPG|%}BZQ)&6I9-keVKDcf
z!^401kYFj6A01$f`E$mIT%K#@#4}s{b)m$T7IIPDj$>c3?ht$RN7VYuKs7l=QrW-X
z-Wot~flm^A!SRXo`A;%(Uw!_3@{xcsHXSx&ahXzxn;XG2dMnLYTr
zt*?LHdCroV5ESQK{IP=c>~4~Y6)$>x$)uGUc2%ySrGwm={qOh5^K(N!?3C
zP04p%p2apVb3A5+u;zY+->N{UZr{f4_T0;PCQlID9(=Cp>~nlUg0a=DunmQq9@EsO
zq}5cmkK(#?13ym6a}ly6#YAonv|fpg=bd}?oet8Nw>>o3+Q!Kd{O!z34Q?6B0@hQqQK!7oS&mJ=?RRj3BNN?i_W_Hvgt7&xb!2X
z!n?!!=zDvmZ*sv(IB5Uy2yet2esT4!S}LpQvoAC3(!-4;4iep{CyvYWuejWJCf9bK
zU`1$`(~0r&=f`wb6%q8#sr>E5-+{i)u=cQUqR7{X1Xn$!ikB15+?d75ddt48l)*3X
zoT`}4*zlQ5G~UqcIJ)O@@m_ZFT^r*VT4rzmFGv2n7>`g(qV#}XOD;E-T8sEL+-5!J
zI~5zWoo8`K&dJT88*Ft8g;n*V4~Ni~&8=9zjntRS$+?PXliRGn-+EnC{)18=_WAN*
zzr@tJ9ox4G3$?6`aLvN6GC%p}Noq|7j$a3}Y~=lJ?z453V74zHDFJkl(zfR%$X8+A*s;lhE{8E(92+7*2-C==kj{=jdcSb(}Zu&Guts(F0Yf0$!IB?Q}3f`
zE+BwGE`gE_McETa^8E9vc>D8vdy%E(<;%r|OPbBgFQ(Q);5~#%(JHrR4mwvt6~0xL
z-}`3LQ~9!NyyM(3XJe@n)*v^EM>poL{%NmqBK=-e6lb=#{W#pIKMg;JX6EEZe%>N>
zwLwlE4x@{P9$n?`xa)X&p)F%Oa*hyk=ndB_MWz%kSq*==HUt1u0R9mTWxQw
zpNEV^FHo=`?!60yLh@w7wP!|bNYHz+m6;cP@!fXU_
z)v&z&c{Ntx>-s~(`pLSR$Q)wG(b*h{^EWI^I7*=o-<2a!U#^{!*YxH*?9k)cVR5GW
zn5vLdkoTmniy^C0es4X#f9d@#c9yyqD<8@R_7qp#<*)4BbG_g7>9Dc*&>4NiyyhPk
z_U#-6@?;Z;gkvU~I%4K7JJCoOj9oxGY`&$_d;+}4^F~eSO_O^GErztjZG4j7W*54PfWgSudlCVE{
ze0CO{1Uqq+ro+*-)qHPiBBE<6Xpph?iGTyLF@g8aMU`9JHmO0(9*^o!Yxz$d5w)uFbxV?_gIUTz8&dTnf6G&?=g(Oo#z5>Za1Zt?+4VdGoDD1PfCBGi6Xy+y7ga0F
zQahO351bmxv~|eDqgr_?FBacC)=2%JMnjQd6eq(#wx=pY=X9=B%W8P880NVP=ol?_
zxsCDLEPzK8e13MuQo_Q1#243bF9BYeFgJ+=T~J(ZGwOeYfEj^m=MP~X3_4CuWt^QP12cEjmIE33Q%?CG{5BqLEgPmT&oh29>wEU!3)^{P-yp(QmC
zBS6vc9munSNNfEtD%nq2ZGU`h?R@vbB?S#wq51{xeNM}$7KBk2i8yJFZcd(%^v7XVJq8{Pndc
z-`OscILXl6qa)z^#iP-q6dE?)wLoaNx9U&fCk_&NmmxprBGB74+mq{qji4$3)cRY1
z0<`;zjw=(W3%Ba7YjCG;1*hVNa#R{1O%H~Mp~w+6OSHFsr1q0%wf_1~NMS5jhbu*Z
zd>f#utMK>Rc%{EhoSC`tNZihy)GhzIHjsdU0->V^FU7_*;kHIoo7Dp=ESe-MY<0F{mpr195j1O6uVt1j@=%e
zJ%%IJj^Vh81w`KaztMY+NcoY6vg0W)RSkk&NFCCGEK5%1Pon)_Pf^Vw)R|_T
zaS9IS*cGC0vH2bRSTf-||7{?C$lHwhaZ;T74IAC(TBu9$p)Gka$>6U<`gNO;D(Ceb
z5{Syu3x(}Q0A=0UP(9JyRrnkp*#C>TR33G(>JPZHgdb8^AsoyyN`EQS@~n|D?VZ0>
zoD|9ZD_Qh?H^es*Vx~G;04do<*L*DgdXAMZ7^D3_Vxi9pz2Z`4fiB5
zm|5%?bujsM$X7$D3ruw9M^^$jk(v+D(XX)6X|kbC>!zdH6?p!;y^4fnUtdTVoxs`YT37iXN}#t<U+#
zh|pz+75k;__J#B-21do6CJ&24M7{tOy&_wv{(5~4oTxRywoQxa)o?wySkE~#v~j^g
zNogTvODN0s^!u&|Sfx*09Vy|Bz4P$W-$S6&awA>y7
z*&^D~lnQ*s@y%VRrB@}mN)Zkjpf68-{K`B3W8p<1|;We5;Z2sn6
z#s_K%fhT}f50LD3dMqKj8$l88TkuR?Nw1^xIig1FJ*Lj
zrGJfUdeJ-;0=bM{DVX@s*a7R3(Tt;d_u-Rr3DspTvGiM=Bumg`@S}~eE7zxHtgm;l
z7-X#M;?_fwT|Ch^50mWaW2larAJ#_S?rYiuHC!=fKOq-GB<+nga^FdqKHjboqx{h7
zDl^(`{|<%Q&3;uYg@vJiq8$kzN562Syq5Wf@*}W4I)qtZM;&J*co87~eKJo5&`5#I
z(6gV#*^@v;-X(&_tt}!#!ag_*=Csl`mv|)ZwBn1!oaSq(>Y3dth2EyaqJ>GG;C*w3
zdEu{O3|i;QSt4HFwmVPj5Nh_!u`}NPGTpZ>ffrJj9$#
zmj7WA^(P?cc@gnx++Wyd(@qR0iFYM|Fyob4!1Pse`kKg-6z29F=(YhZ$oAe|JS#2m
zOVofc+ao%wN>y*?UYUz38{)4z7EE=Os;WMz1t-ih-=LSE?5PU-ROhvUh!3lkQ)vvr
zH3U>Vy&V%&-WKG^e|fsq%)Uvsx|Si@73(|CQ#9tx-uBf-^y|ydD^6>dOwLjSdY;JM
zQ7J1H6I)!s^@*HW8EU0!iQn({%!x2*gQdPElGTHaE$zZssm5R?@h_;b#Xd+TFMZuF
zpG(iHxK3v!;J!EbrL6@Pxvav6`#&7dIlVVHZi}_SpM9q4ZZ)2$w4fsxXAC}Z?|)MS
zW@B+7w6HD70Egc!0eS2~qo1`r6Npcc0@(yjnW)``wosr83W3mYqiha-b@IZ=A;-Y+
zDzO~olk4Ibu<_czH=6ox{-dRP;}0LF;J-nZD-7i|A9$DOBtF%J};A2TiE?
z12V<_t&#J=2CwsC#?N2MQ(11TH#+mqQJ(@Kw}rX&#F?L@u&#b{@7R_5`~}(g{2-63
z20blbY<&%aV#nb}sbd^-#1SwyTcd;3Z`YA%v5W@8uwb#|3%kRvW6pvGQJbe=Faid}
z4s2&PYx(xV+Qpxpfq;j%vqh6%tw%4)Ruqe06H~znS2?XlcLP&P$tZfwd1Fj%xPJv`
zz(fn%OtAl^2w7oMr#^RcIU5Kl>Hw!a^Al?9Oa|q&O$tG5Lwy#5A`A`EpoIoGlx{o?gdiy=i)3GPvmd)7!|%r
zWKrt55?f_g-l4JSG-q|C?)I(C!(*z|J}MCxh5#egjfcBtOSZjLk=h1wSC5!QHGRlG
znk}zF5~{btIU3Tr%%w(1+r+U@&tJ^Un)dMBBRj50&j;t&1Bfq0UwCxwGe@Man%bMf
zH=mL3-vpOcJXS26ps|4I#y++wd3Wwz`TX0Y!Z+vNB}hNHHbs5SPv2KRE|S5|j$;4R
z)G_YESA}byJ>!lph~E8;4==9vc)gqvs1?}udAZEr!JCH=nPd@r$JcN#*kY9OB%aq)
zU9;SBqP45U=(YlMH6RK~+7id|{@FKQjn>ip%lJ#}K1@-ri`V&KRmO=G{kIMQEx0A1
zW1a^EX*q?3Ee+nMcR{6=8_>oD5-1+rA<;gVb)!jvL=A4wlf9)&kll479DU`KLuf9)
z1xT2@vKpuN`Xa(>KfIKu+1H|!(AUWH#6J9Y`G?hd|%z1+YAP3t7qblYDyC+R<1o$X_jc|VUa
z@P6V_dOm_&?49;|iM9X*Ppfx!aRgs9Pt5r>rn=FrTR}8g5ds~?8>4L{SD5(F@zYN}
z7@pq_+*XxT?@c$B@g%lbBr}kNF;B}IN-xQ8`Wd#`rgzwE^367oRaKqVbsoaFl~`WJ
zd>@+(q{&iM$ErJxmDyMsOu9ce0iwzWkF?J{ITagH9q
zqw|TEea4s#yj6&H9&9doFzWC^ERN0$FHvqr#q-#y=nKo9exi;C&+iTuOWD%k(bSv{
z%(q{mOZzX^#YgW&R=d15-VT=QU2?uh1`&Oxk@KwDoy3uu*jH~Gw)dT)6Y;dLCy!3L
z7prke6(#QmJgM*W)J7kPg%R%rOfnj1Yf#X#t$3^%h9J^L-I-s>ACuE*}DvzaU+yZgVD
zCYz;m;s}P0{1&1IcD|g*0I~#*B7Wz(HxdM=x;WQc_Fl*tNmA){Bj%cYoy`+6QRfGZ
zT#Yq1BjU1@f~t%^-FxE4D-aGZeltZ$#Yu5V%H)k7i~GV~%%cC>!1@29EYd3S=zgLD
zpjHWaVqm~sZF;griOj|hrJ~efYpR&(2pb)NN
zb`5Q9MNn%q&m}T-&BvjMVm`l?J-6%W`-@FMtNiEc00y<>5H@u&AR;0HuUGe1OaAV~
zV$Taw;P>GxL;)dePEJl^6q|eooq##5$E9nkxFT=*f%darvRFKmNqONIG3GJOhw?A@IHk=
zlEuqqX67D*p?=!E!akRH+}R-*VzV}sYciat*+G!o_Y_`1j$U+I{JsMuHN!I%;~)PS
z@Zaqo6_0!^UXs9P8VIOJ9_Z-M(s1j(s0zEWBr*c{slV#n(N=!XSnc9C3Ve%;fJZ;j
zDgw}7s_E%XE{p#ehfzbEi>{#D%=b?u!&UE-1x=P_{^h>H@5Q4_Zwd
z^CA8YUo!TmV%(FzCt@~sv;}l3`;yFwu7`(s*n#p6AV7Ru{~f02Y(WO%E5X6RzI4C|
z3X;M7Ju1I@(*#oJ^Rgk%rs%X$UhG(}-0I5XN~Q;|$1NXH(w>9d;J*E#41M5SiQufYX5WVJEzGrNw1tGsO+d8n&6r;yhu7}_X71twiSvXiv7bleAN=T>d&J1EVyebAsCFw
zd@&4j`%g=W){8?3oYsbJN(uHkU&xsv-y6zR2Q%o$cO>+B<%S@{CL%ZXn`NH0m9f(z
ztxy*v?XTsYy$(0tF*Z1e|F+td0S~0}4IF?UXDbSh8ueuHeZX41gn+tq(xu8q$frYP
zyQfd1kAZNnnt=fY;KYYC0=k{&B|2bP=b+dd2M4Lk%gaIGkpG;jzbAUPP1evbh12Hs
zWsEE2uPJWpff3^Ky=*}X`mXDNM1wEe{3muPSRt8HZL!~#CrRlau_dU
zti-ywyeke)FqF@vD;Xl2Z+kPm0Joi2HjLX!{%2*wJ=cn-wC|@7XJlmHYX&N9-vAt_
z84%p;%!l%t9Pi9ke8+*~HUuIvW#=EsMPM}#Sd)Qr4ebf|yXBEQs92n|Lmzuji
z3h=SB`k_Rc9DAV=CB4w?QWUh>Qv~U%jsf3E42d5wq9$4yADuak=s8LrJnILUU0*O|
zK)($L$YBn$l}Y^gQS_7
zBYC1)7F0d-)qA@BF$}*uQkj#$V}mp*GSavc4Y;kE4>u>HfO;+ip1j{`Vhd;$SFIP-
zD)F7e?RD~&c%3*HbPTBD@GIpfS84{f@T>d2Ii5Oz1NjnXn|!7BUg&qd%9>AD@Il(>
z$XN$eZ8Sl~C?x0Edlo3q((>|SUHzlIrA|?ggPb`Lf)6A=+9FuubN-%yzxUemPs9-I
z!+<9r;tf3%0C66pZNmvC;PM8|3K}(nF}Y4VU)3tmVYQSxCh-L>u}N0~Uly%z1cQi5
zJo&XXTP3-0`nS>1m)5qkPzdKygRx56)Xr5La@43c1Di(zzr}V+1o`cl{uQQw$QFY@
zkBp9*f(esw&%35+VGVEf(`x63X3E_
zW3t1ovz0#15A7Alf?XpN{3H7_xLcY3kn#Wj=Ar$`jrhv}Y!-ZEWmo`Qng=IGc!MWY
zl-ufjAlF@0ZlPVcR^ajps9s)|lA3lxUl*E3wQ=D4A0|f
zG0vYqPi}Ms%mtXzp?~`*|2{W!;olFmryj$9!8kdqkl)W9GdMBfGzq``JV4T@F3
zz8ILu`2<83^YZg;L=x22i{r4sTwfO#$Fq^#9Zd3_I#GQ5_yQAC;aU=&;R}DyNgA*l
z002-R^;z1-(yn_JQOSN?6llypyVp3^Z|7KbqW1JwIoma1EtH
zf+)CK(L~|F(S>-SZJd}Yx?2!689E$`EQUIsO@i%GDI;;y%21JT?4gOX83uuy)x`gz
z&X3R`g!d`54Ky^#84a8!LC0k!G@g&SpnrdFZ+64!D}FNv%%q=dYUmk+Uo`^P0feJ>
zTNyMFUu!BVXaJFhi;*56*PCN}?%D_C^{dDti5(>v^QoewF
zRK|($q_nzH^uXg#@Qtgl=rKks^9#Z#&&qAzG_rWXQF!(J*o#Qpt@;j4WIPE@cMZ4Z
z%9139TQ+gl#4L4Dt!*2kM7q&muv_CeG3>8nM8N`VnBp@KDc1*}Ztl!1I0!sgB_y;<
zq^=^mkm`fF30Cvmf@$)`CrS59G@)mJ9#3A9G@#VMV_Lw+AWy<(mt)!F!tRD)eVy5g
z_V%yRQ(&o>C4=+wZYj?YZ+H_KYm^I?Ay5RdTlir
zk_+O6b7jF~Kco=APlinF`{%s*tvM*`D1zqQ-xDFf7`}G4?{9Z10>qGWJPei^#P^gV
zfp|1n?$e(dnS3F>tfZu1ORMTeN3DA_QHY%T-AYdnVR2Mp>=Gb1W=
zNkR!+Epb4%?Xn=XS->zC1O|=Va3vTuRsQ_xWIv8+|0Uq7#7Di$Y$k;jg!6$zR+A~^
z8y1+qW?Q_U3V7>*6~QCWF`$!v+CJ?-3}<})+_-~UzryzCtneSUh=^8t(79&(K$kip
zGVLcho6!@s4$AS#9#=M
zGW~-f{6;7K;27HviB_hdSiiPxJl>
zoZ&zQgWISK?!yP!l4SUup!1b{!zr^5-96dyI}k&>zm
z!zRisuY;SFS2$Gc-v)9Y@4?pCG(!Z`0DjORp8o5|`_G-BNZVveE5ld2^DPx@jl=iO
ztm(ccY^>3@1_Wt%AMF;Qa_T(;d^6ktW9Tjjzu@zFbShqbESkS9;0wqiZyyMzc4fg!
z{hOPcgNaBe%c=_(MWV8LiUq`B3JRonqnmnmt-$u?fB2q%PC}JoYgh1uW)R;ix3xrD
zGWt5MeUxx5x^d^u&@?*gBZ%EWX3O@v)8GRq&KdiYwT3|5W6KhVr!gdb>kv`=^lv}p
z&zPxVNbQM+lrVz}H32B|LJG_lP>ySyIYU!(|r>#P!F))fTbl*
zUxI@}7SEexZmmH7_^5%L(*pog-Ay_M
z6~q9*c*4D9Snu%#zm}Z;)lYv0;rD4E7ruL7n_Y1XHmbZ37Qkf(c7lXe&d3(tn>X)+
z#Hl=y`~Ub*|I=Ov-zJiU&CAki0S*hH1kmDH3_b>q8j#Rz`R-3b06951830)V%^-V#
zJc;sfwU)XCfw=j$#e@I?i1hIC-C(~5Z;IBnVE|f&o->bD?fChI3*ke#liASMWlN(hL$u~G7R^NdG8;Eoh
zKq#3dEo$k8UQL2{iGmO9Pr84dAg7i8csgs_t*Evu%vspidALd6g!d|c-DW!uMfCNx
zmLPvAeC>XB0-p@vuT^PoZ9ShpO?;Dd*W|?u7~u8>#)+17Na-~C;tAEcCAlXRr4%ki
z8JU@+Q8?epRo>>wAp|h*2h$PIlO!IB;j<$!&Cq8^w2!F>kT
z{}a=S8_ZIJi45ax8p}|XgK75-CAAAtLRYzU*@1Ory>o{gaFz$!6E0jwou{&=i)9iA
z`hW7VPQ0FBHJkEd)KEZEE!SjN0Pq{kM}gpQZv%DA#S{~I%x2442TGNBFcwvti*>*o
zJ_L4qxF~r!6<6;35^V9s+1YxlEZT0gsxDMR8aRY@T%sKC=7eZ*@`rrA#|V`I9w-)3
zDm&SWv!qJ;wGS>772uql_zUs41FzF=f7u_mBq4z|3XEUfq^orQTSef<`Qc#;257l(
zjxOFC8F}d8;pBW9vqS~sM#|r>u{^Nl(b67