Ed 7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream ...

# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl

2025-07-08 00:40:30 +03:00

..

Consumable

Flask Visual Overhaul & YML Organizing (#38032)

2025-06-21 10:52:36 -04:00

Decoration

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Devices

Assorted device and core inhands (#38162)

2025-06-09 00:40:14 -07:00

Economy/cash.rsi

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

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

Fun

Toy/Plushie Inhands and Wearables (#38514)

2025-06-26 18:07:29 -07:00

Magic

Wizard: Repulse Spell (#35377)

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

Materials

Basic Resources Crate (#36419)

2025-04-16 15:20:36 -04:00

Misc

Toy/Plushie Inhands and Wearables (#38514)

2025-06-26 18:07:29 -07:00

Power

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

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

Specific

Assorted device and core inhands (#38162)

2025-06-09 00:40:14 -07: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

Exo Station - Upstream Playtest Version (#33144)

2025-06-15 12:10:22 -07:00

Tools

Assorted device and core inhands (#38162)

2025-06-09 00:40:14 -07:00

Vehicles

ATV resprite (#25885)

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

Weapons

Retro laser sprite fix (#38676)

2025-06-30 19:49:44 -04:00