Skip to content

Commit

Permalink
Mirror: Fix blunt melee weapon hitsound (#282)
Browse files Browse the repository at this point in the history
## Mirror of PR #26286: [Fix blunt melee weapon
hitsound](space-wizards/space-station-14#26286)
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)

###### `205edfe6d74c14b288fae27db7530e3bed4f5511`

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:23:56 UTC

---

PR changed 14 files with 36 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
> most blunt weapons sounded like you're not doing any damage
> 
> ## Why / Balance
> quietly gibbing people is bad
> 
> also helps #25929 partially
> 
> ## 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
> 
> ## Breaking changes
> no


</details>

Co-authored-by: SimpleStation14 <Unknown>
  • Loading branch information
SimpleStation14 authored May 12, 2024
1 parent 89d5d17 commit b872c15
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Mobs/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@
- type: CombatMode
- type: MeleeWeapon
hidden: true
soundHit:
collection: MetalThud
damage:
groups:
Brute: 5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@
types:
Blunt: 8
Piercing: 2 # I guess you can stab it into them?
soundHit:
collection: MetalThud
- type: Item
sprite: Objects/Tools/Hydroponics/spade.rsi
- type: Shovel
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@
types:
Blunt: 25 #thwack
Structural: 20
soundHit:
collection: MetalThud
- type: Puller
needsHands: false
- type: InputMover
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@
damage:
types:
Blunt: 10
bluntStaminaDamageFactor: 2.0 # DeltaV - seclite is now a viable nonlethal takedown tool against unarmoured targets.
soundHit:
collection: MetalThud
- type: Item
sprite: Objects/Tools/seclite.rsi
- type: PointLight
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
damage:
types:
Blunt: 10
soundHit:
collection: MetalThud

- type: entity
name: syndicate jaws of life
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@
damage:
types:
Blunt: 4.5
soundHit:
collection: MetalThud
- type: Tool
qualities:
- Anchoring
Expand Down Expand Up @@ -151,6 +153,8 @@
damage:
types:
Blunt: 8
soundHit:
collection: MetalThud
- type: Tool
qualities:
- Prying
Expand Down Expand Up @@ -504,6 +508,8 @@
damage:
types:
Blunt: 14
soundHit:
collection: MetalThud
- type: Item
size: Normal
sprite: Objects/Tools/shovel.rsi
Expand Down Expand Up @@ -544,6 +550,8 @@
damage:
types:
Blunt: 7
soundHit:
collection: MetalThud
- type: Tool
qualities:
- Rolling
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/welders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
params:
variation: 0.250
volume: -12
deactivatedSoundOnHitNoDamage:
collection: MetalThud
activatedDamage:
types:
Heat: 8
Expand All @@ -70,6 +72,8 @@
damage:
types:
Blunt: 5 #i mean... i GUESS you could use it like that
soundHit:
collection: MetalThud
- type: RefillableSolution
solution: Welder
- type: SolutionContainerManager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
types:
Blunt: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@
Blunt: 10
Slash: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
Blunt: 5
Slash: 10
Structural: 10
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
types:
Blunt: 10
Slash: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
types:
Blunt: 10
Structural: 10
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@
damage:
types:
Blunt: 20
soundHit:
collection: MetalThud
bluntStaminaDamageFactor: 1.5
- type: Item
size: Normal
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@
damage:
types:
Blunt: 8
soundHit:
collection: MetalThud
- type: Construction
graph: Seat
node: chairFolding
Expand Down

0 comments on commit b872c15

Please sign in to comment.