iaada 48dcf8a474 Merge remote-tracking branch 'upstream/master' into up/drinks-yml ...

# Conflicts:
#	Resources/Locale/en-US/nutrition/components/drink-component.ftl
#	Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml

2025-08-06 12:45:41 -05:00

..

containers.yml

Add Holy damage (#32755)

2024-12-16 16:33:32 +01:00

examine_messages.yml

Refactor ExaminableDamage (#38978)

2025-07-13 21:35:47 -07:00

groups.yml

Add Holy damage (#32755)

2024-12-16 16:33:32 +01:00

modifier_sets.yml

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

2025-08-06 12:45:41 -05:00

types.yml

Add Holy damage (#32755)

2024-12-16 16:33:32 +01:00