Skip to content

Commit

Permalink
Mirror: Monkey and gorilla melee weapon fix (#281)
Browse files Browse the repository at this point in the history
## Mirror of PR #26288: [Monkey and gorilla melee weapon
fix](space-wizards/space-station-14#26288) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `3836da964cab669e2c2ddbd071a666e93eeb4ec4`

PR opened by <img
src="https://avatars.githubusercontent.com/u/45323883?v=4"
width="16"/><a href="https://github.com/Dutch-VanDerLinde">
Dutch-VanDerLinde</a> at 2024-03-20 13:38:25 UTC

---

PR changed 1 files with 11 additions and 0 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> when they hit things it made the no hit sound, this fixes it
> 
> ## Why / Balance
> more realistic
> 
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
  • Loading branch information
SimpleStation14 authored May 12, 2024
1 parent e967bd2 commit b8ad6e4
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,8 @@
bloodMaxVolume: 300
# if you fuck with the gorilla he will harambe you
- type: MeleeWeapon
soundHit:
collection: Punch
damage:
types:
Blunt: 20
Expand Down Expand Up @@ -1221,6 +1223,15 @@
path: /Audio/Animals/ferret_happy.ogg
interactFailureSound:
path: /Audio/Items/wirecutter.ogg
- type: MeleeWeapon
soundHit:
path: /Audio/Effects/bite.ogg
angle: 30
animation: WeaponArcBite
damage:
types:
Blunt: 3
Piercing: 3
- type: Butcherable
butcheringType: Spike
spawned:
Expand Down

0 comments on commit b8ad6e4

Please sign in to comment.