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

..

Consumable

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

2025-08-06 11:17:41 -05:00

Decoration

Ashtray Resprite and Fix (#31643)

2025-04-22 15:34:39 -04:00

Devices

Advanced Clowning Module (#35797)

2025-08-02 22:19:17 -04:00

Economy/cash.rsi

Show other speso colours, add larger denominations (Frontier#1496) (#37030)

2025-04-29 14:44:47 -07:00

Fun

Fun with cardboard! (#37363)

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

Magic

Wizard: Repulse Spell (#35377)

2025-02-22 10:56:54 -05:00

Materials

Wearable banana peels (#38868)

2025-07-17 12:29:36 -04:00

Misc

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

2025-08-06 11:17:41 -05:00

Power

inhands for Syndicate Things (and thief beacon) (#37682)

2025-05-21 11:39:29 -04:00

Specific

Xenoborgs part 4 (#36935)

2025-08-04 15:18:55 +02:00

Storage

Add utensil box, add muffin tins to Kitchen Dinnerware Crate (#36948)

2025-05-12 10:52:04 -07:00

Tanks

Adds dog-shaped sprite variants for the most common hardsuits (#36875)

2025-06-19 12:49:09 -07:00

Tiles

Marble tiles (#38007)

2025-07-17 19:44:28 -04:00

Tools

Make more objects spray paintable (Reviving #31328) (#37341)

2025-07-10 20:36:57 -04:00

Vehicles

ATV resprite (#25885)

2024-03-07 08:36:00 +03:00

Weapons

Fun with cardboard! (#37363)

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