Ed 7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml

2025-02-16 11:58:47 +03:00

..

Actions

Wizard Staff of Animation (#34649)

2025-02-12 23:46:02 -05:00

Admin

Upstream sync (#786)

2025-01-21 23:57:12 +03:00

Alerts

Bank progression mechanic (#633)

2024-12-07 00:39:05 +03:00

Atmos/GasTank

Reapply "Remove some BUI boilerplate" (#30214) (#30219)

2024-07-21 14:48:13 +10:00

Bwoink

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Character

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Chat

Fix RA0003 warning for ChatBox (#33531)

2024-11-25 22:53:12 +11:00

CloseWindow

Add EscapeContext keybind (#15301)

2023-04-13 18:10:44 -07:00

Crafting

Fix construction button not working (#12033)

2022-10-22 10:51:03 +11:00

DamageOverlays

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

DecalPlacer

Use ECS prototype-reload events (#22613)

2023-12-23 01:13:45 +11:00

Emotes

Emotes Menu (#26702)

2024-04-28 21:38:23 -07:00

EscapeMenu

Add UI click sounds (#22410)

2023-12-29 15:43:36 +11:00

Gameplay

Removes IOnStateChanged calls from GameplayStateLoadController (#14617)

2023-03-12 21:02:14 -04:00

Ghost

Ghost role drop-down alignment (#33397)

2024-11-26 09:28:31 +01:00

Guidebook

Make guidebook remember where you left off (#31375)

2024-08-27 01:06:54 +02:00

Hands

Fix for inspecting entities in hand (#33642)

2024-11-30 17:14:39 +01:00

Hotbar

Revert engine reverties (#34968)

2025-02-08 17:17:55 +11:00

Info

Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)

2024-06-15 00:41:25 -04:00

Inventory

Fix inventory GUI for non-inventory entities (#31306)

2024-08-22 13:05:17 -04:00

MenuBar

Knowledge UI (#779)

2025-01-18 14:43:11 +03:00

Objectives/Controls

Wrap objective briefing text (#24244)

2024-01-19 09:25:40 +11:00

Sandbox

Organize the Sandbox Panel window (#33684)

2024-12-07 19:13:56 +01:00

Storage

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Viewport

Tweak viewport nullspace check (#35037)

2025-02-10 12:58:05 +01:00

Vote

Fix lobby votes (#15041)

2023-04-02 01:00:48 +11:00

ProgressColorSystem.cs

Add a toggle for colorblind friendly progress bar colors (#25318)

2024-03-09 12:43:19 +01:00