juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into up/drinks-yml

Browse Source 
# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
This commit is contained in:
iaada
2025-08-06 12:45:41 -05:00
parent 26509b879b ffccef2358
commit 48dcf8a474
137 changed files with 3333 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Resources/Prototypes/Damage/modifier_sets.yml
View File

@@ -155,6 +155,13 @@
flatReductions:
Blunt: 5
- type: damageModifierSet
id: Card
coefficients:
Slash: 2.0
Piercing: 0.1 # Holes easily poked through, but do little to structural integrity
Heat: 3.0
- type: damageModifierSet
id: Web # Very flammable, can be easily hacked and slashed, but shooting or hitting it is another story.
coefficients: