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

..

Audio

Fun with cardboard! (#37363)

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

Changelog

Automatic changelog update

2025-08-06 17:24:13 +00:00

ConfigPresets

Optimizations from server profile (#38290)

2025-07-26 11:44:34 +02:00

Credits

Update Credits (#39343)

2025-08-03 02:46:08 +02:00

Fonts

Sentry turrets - Part 5: Reuseable UI components (#35149)

2025-05-03 12:19:08 -05:00

IgnoredPrototypes

…

Locale

add scale:multiplyvector toolshed command (#39424)

2025-08-06 19:23:05 +02:00

Maps

Fix ATS Anchor (#39389)

2025-08-04 20:14:57 -07:00

Prototypes

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

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

ServerInfo

Trigger Refactor (#39034)

2025-08-03 21:20:37 +02:00

Textures

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

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

clientCommandPerms.yml

Add /showaccessreaders to +MAPPING and +DEBUG (#37759)

2025-06-25 23:23:05 +02:00

engineCommandPerms.yml

Move scale command to content and turn it into a toolshed command (#39349)

2025-08-06 14:33:21 +02:00

keybinds.yml

Crawling Part 1: The Knockdownening (#36881)

2025-07-20 01:54:42 +02:00

manifest.yml

Revert "Add taped logo back for 10th anniversary" (#34831)

2025-02-02 23:33:02 +01:00

map_attributions.txt

Amber Station - Small Improvements (#36335)

2025-04-14 11:58:21 -07:00

mapping_actions.yml

action refactor proper ecs edition (#27422)

2025-05-28 15:52:11 -04:00

migration.yml

Renames slugcat jelly-donuts to scurret jelly-donuts (#39308)

2025-08-01 13:58:32 +02:00

toolshedEngineCommandPerms.yml

Update permissions for engine toolshed PR

2024-12-24 03:37:31 +13:00