From d5bc2c261c5e238cfc926dd6c66b7287b8a62796 Mon Sep 17 00:00:00 2001 From: SkaldetSkaeg Date: Sun, 31 Dec 2023 08:07:29 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=83=20=D0=B8=D0=B3=D1=80=D1=83?= =?UTF-8?q?=D1=88=D0=B5=D1=87=D0=BD=D1=8B=D1=85+=D0=92=D0=BB=D0=B0=D0=B4?= =?UTF-8?q?=D0=BE=D0=B2=D1=81=D0=BA=D0=B8=D1=85=20=D1=8D=D0=BD=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=BE=D0=BC=D0=B5=D1=87=D0=B5=D0=B9=20(#626)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Починил работу игрушечных+Владовских энергомечей, (выявлен баг, если использовать обычный меч, после не работающего, то игра может вылететь) * От греха подальше добавил комменты --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 11 +++++++++++ .../SS220/Entities/Weapons/Melee/e-hammer.yml | 9 +++++++++ .../SS220/Entities/Weapons/Melee/e-sickle.yml | 9 +++++++++ .../Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml | 9 +++++++++ 4 files changed, 38 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index e6cb0eae6f3d..f30cc5227423 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -890,6 +890,17 @@ damage: types: Blunt: 0 +#ss220 Eswords_fix start + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + volume: 3 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + volume: 3 +#ss220 Eswords_fix end - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-hammer.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-hammer.yml index bea162ee7605..50492d9d4b03 100644 --- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-hammer.yml +++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-hammer.yml @@ -54,3 +54,12 @@ malus: 0 - type: Reflect enabled: false + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + volume: 3 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + volume: 3 diff --git a/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-sickle.yml b/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-sickle.yml index 372b1bc0591c..c30e6cafb1e0 100644 --- a/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-sickle.yml +++ b/Resources/Prototypes/SS220/Entities/Weapons/Melee/e-sickle.yml @@ -54,3 +54,12 @@ malus: 0 - type: Reflect enabled: false + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + volume: 3 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + volume: 3 diff --git a/Resources/Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml b/Resources/Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml index 0e044dbbc316..9cb84716585f 100644 --- a/Resources/Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml +++ b/Resources/Prototypes/SS220/Shitspawn/Ebent/CustomItems.yml @@ -130,6 +130,15 @@ color: white netsync: false - type: Appearance + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + volume: 3 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + volume: 3 - type: ToggleableLightVisuals spriteLayer: blade inhandVisuals: