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

..

Clothing

Fun with cardboard! (#37363)

2025-08-06 12:58:07 -04:00

Debugging

pre-plan for more sounds

2025-07-31 17:38:39 -05:00

Effects

Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)

2025-08-06 12:53:38 -04:00

Interface

Admin Tool: Observe entities in an extra viewport (#36969)

2025-07-25 18:53:01 +02:00

Markers

Berry Delight (#38881)

2025-08-02 14:35:09 -04:00

Mobs

Debody Food and Drink Systems, Combine Food and Drink into One System. (#39031)

2025-08-06 12:53:38 -04:00

Objects

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

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

Stations

Salvage Job Board (#37549)

2025-05-18 14:02:52 +10:00

StatusEffects

feat: add a component for rejuvenateable status effects (#39025)

2025-07-24 17:13:29 +02:00

Structures

Fun with cardboard! (#37363)

2025-08-06 12:58:07 -04:00

Tiles

Revert biome rework (#38724)

2025-07-03 20:48:04 +02:00

Virtual

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

World

Replace noSpawn: true with categories: [ HideSpawnMenu ] (#30100)

2024-07-25 05:24:00 -07:00

categories.yml

New status effect system (#37238)

2025-06-25 07:41:35 -04:00

foldable.yml

Deploy foldable (#30000)

2024-08-02 17:05:12 +10:00