From f3d0b4acef35fe12d4bed8146fe1c92be5f767be Mon Sep 17 00:00:00 2001 From: Remuchi Date: Sun, 14 Apr 2024 12:30:56 +0700 Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D1=82=D1=8C=20?= =?UTF-8?q?=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=B7=D0=B2=D1=83=D0=BA=D0=B8=20=D1=83=D0=B4=D0=B0=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Entities/Objects/Specific/Janitorial/janitor.yml | 2 +- .../Prototypes/Entities/Objects/Specific/Mech/mechs.yml | 2 +- .../Prototypes/Entities/Objects/Tools/flashlights.yml | 2 +- .../Prototypes/Entities/Objects/Tools/jaws_of_life.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 8 ++++---- .../Entities/Objects/Weapons/Melee/baseball_bat.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Melee/cult.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/security.yml | 2 +- Resources/Prototypes/Entities/Objects/base_item.yml | 2 +- .../Prototypes/Entities/Structures/Furniture/chairs.yml | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index c49ef70983..a10bc5b576 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -12,7 +12,7 @@ types: Blunt: 10 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Spillable solution: absorbed - type: Wieldable diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index 6e5362d9bb..56d70029b3 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -49,7 +49,7 @@ Blunt: 25 #thwack Structural: 20 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Puller needsHands: false - type: InputMover diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 5b85874099..2e01f4443a 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -113,7 +113,7 @@ types: Blunt: 10 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Item sprite: Objects/Tools/seclite.rsi - type: PointLight diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 00058e00e2..508254d5bb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -49,7 +49,7 @@ Blunt: 15 Structural: 40 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: entity name: syndicate jaws of life diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index eecc0a7220..05d1359dcc 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -139,7 +139,7 @@ types: Blunt: 4.5 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Tool qualities: - Anchoring @@ -186,7 +186,7 @@ types: Blunt: 8 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Tool qualities: - Prying @@ -588,7 +588,7 @@ types: Blunt: 14 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Item size: Normal sprite: Objects/Tools/shovel.rsi @@ -623,7 +623,7 @@ types: Blunt: 7 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Tool qualities: - Rolling diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 834d35a529..252dd37281 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -14,7 +14,7 @@ Blunt: 10 Structural: 5 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index 78d9796b68..77ba283654 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -99,7 +99,7 @@ Slash: 20 Structural: 5 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 61bd2c9334..047c6b12bf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -22,7 +22,7 @@ Slash: 13 Structural: 10 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 8d23a98d70..13cbad148b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -50,7 +50,7 @@ Blunt: 10 Slash: 5 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Wieldable - type: IncreaseDamageOnWield damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index b0b861f251..cdc6ef0a2f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -100,7 +100,7 @@ types: Blunt: 20 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" bluntStaminaDamageFactor: 1.5 - type: Item size: Normal diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index beb8be0289..087e80dafc 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -29,7 +29,7 @@ types: Blunt: 5 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: CollisionWake - type: Physics bodyType: Dynamic diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 46c2997a05..a7dbab65f5 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -359,7 +359,7 @@ types: Blunt: 8 soundHit: - collection: MetalThud + path: "/Audio/Weapons/smash.ogg" - type: Construction graph: Seat node: chairFolding