From 3f5042a3e6cfa88561efd58c3acf369a10dc50fb Mon Sep 17 00:00:00 2001 From: VigersRay Date: Thu, 11 Jul 2024 15:24:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D0=B0=D0=BF?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_Sunrise/Stunnable/Systems/TelescopicbatonSystem.cs | 6 +++--- .../_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/_Sunrise/Stunnable/Systems/TelescopicbatonSystem.cs b/Content.Server/_Sunrise/Stunnable/Systems/TelescopicbatonSystem.cs index e18e12e40b..3854e1c917 100644 --- a/Content.Server/_Sunrise/Stunnable/Systems/TelescopicbatonSystem.cs +++ b/Content.Server/_Sunrise/Stunnable/Systems/TelescopicbatonSystem.cs @@ -14,7 +14,7 @@ namespace Content.Server._Sunrise.Stunnable.Systems { [Dependency] private readonly SharedItemSystem _item = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedItemToggleSystem _itemToggle = default!; + [Dependency] private readonly ItemToggleSystem _itemToggle = default!; public override void Initialize() { @@ -44,6 +44,6 @@ namespace Content.Server._Sunrise.Stunnable.Systems private void ToggleDone(Entity entity, ref ItemToggledEvent args) { _item.SetHeldPrefix(entity.Owner, args.Activated ? "on" : "off"); - } + } } -} \ No newline at end of file +} diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml index b18b40b983..6e85d84383 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Melee/telebaton.yml @@ -17,8 +17,8 @@ activatedSize: Normal activatedShape: - 0,0,0,2 - - type: ItemToggleDisarmMalus - activatedDisarmMalus: 0.6 + - type: DisarmMalus + malus: 0.225 - type: Sprite sprite: _Sunrise/Objects/Weapons/Melee/telebaton.rsi layers: @@ -56,4 +56,4 @@ right: - state: on-inhand-right - type: StaticPrice - price: 100 \ No newline at end of file + price: 100