Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix blunt melee weapon hitsound #26286

Merged
merged 2 commits into from
Mar 20, 2024
Merged

Fix blunt melee weapon hitsound #26286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fefe70
ok
Dutch-VanDerLinde Mar 20, 2024
fc4cf8b
Update welders.yml
Dutch-VanDerLinde Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Mobs/base.yml
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@
damage:
types:
Blunt: 10
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
View file
Open in desktop
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
View file
Open in desktop
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 @@ -492,6 +496,8 @@
damage:
types:
Blunt: 14
soundHit:
collection: MetalThud
- type: Item
size: Normal
sprite: Objects/Tools/shovel.rsi
Expand Down Expand Up @@ -525,6 +531,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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,8 @@
damage:
types:
Blunt: 8
soundHit:
collection: MetalThud
- type: Construction
graph: Seat
node: chairFolding
Expand Down
Loading