From c99501f5ea2daa9c87cb34dbf0205306f4f606de Mon Sep 17 00:00:00 2001 From: SimpleStation14 <130339894+SimpleStation14@users.noreply.github.com> Date: Mon, 13 May 2024 06:54:39 -0700 Subject: [PATCH] Mirror: Small species melee weapon change (#228) ## Mirror of PR #26183: [Small species melee weapon change](https://github.com/space-wizards/space-station-14/pull/26183) from space-wizards [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `0a8def1ea2dc4b7aee297098b3b50a7367f3c4d1` PR opened by Dutch-VanDerLinde at 2024-03-16 17:39:26 UTC --- PR changed 4 files with 7 additions and 6 deletions. The PR had the following labels: - No C# - Status: Needs Review ---

Original Body

> > > > ## About the PR > - kobolds have the claw arc instead of the punch arc and do 5 slash 4 piercing instead of 9 piercing > - arachnids make the carp bite sound similar to tarantulas and space spiders > - lizards now make the slashing sound on hit instead of pierce, since they claw not pierce > > ## Why / Balance > kobolds did the old lizard pierce animation when they clawed, made more sense > > if space bears claw and make the slashing sound then lizards should too > > ## Media > > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase >
Co-authored-by: SimpleStation14 --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 7 ++++--- Resources/Prototypes/Entities/Mobs/Species/arachnid.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/reptilian.yml | 2 +- Resources/Prototypes/Entities/Mobs/Species/vox.yml | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 48f369f05ed..378b3f8a9d8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1370,12 +1370,13 @@ baseSprintSpeed: 5 - type: MeleeWeapon soundHit: - path: /Audio/Weapons/pierce.ogg + collection: AlienClaw angle: 30 - animation: WeaponArcPunch + animation: WeaponArcClaw damage: types: - Piercing: 9 + Slash: 5 + Piercing: 4 - type: Temperature heatDamageThreshold: 360 coldDamageThreshold: 285 diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml index d6a60872666..c135ac2b829 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml @@ -51,7 +51,7 @@ - type: MeleeWeapon animation: WeaponArcBite soundHit: - collection: AlienClaw + path: /Audio/Effects/bite.ogg damage: types: Piercing: 5 diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index c893fab4491..09e86b19968 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -41,7 +41,7 @@ damageModifierSet: Scale - type: MeleeWeapon soundHit: - path: /Audio/Weapons/pierce.ogg + collection: AlienClaw angle: 30 animation: WeaponArcClaw damage: diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 184711ec1e5..5e40254e3a8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -41,7 +41,7 @@ bloodReagent: AmmoniaBlood - type: MeleeWeapon soundHit: - path: /Audio/Weapons/pierce.ogg + collection: AlienClaw angle: 30 animation: WeaponArcClaw damage: