Ed 4173d96d83 Merge remote-tracking branch 'upstream/staging' into ed-22-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.IntegrationTests/Tests/ResearchTest.cs
#	Resources/Prototypes/Entities/Objects/Decoration/flora.yml
#	Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml
#	Resources/Prototypes/Maps/Pools/default.yml

2024-12-22 15:48:30 +03:00

..

Actions

Allow users to drag-reorder action bar (#32552)

2024-10-03 16:01:01 +02:00

Admin

Fix baby jail (#29896)

2024-07-11 15:14:01 +10: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

Adds an introductory message to the user-facing ahelp chat window (#33348)

2024-12-09 09:54:23 +01:00

Character

Currency collect goal (#352)

2024-07-24 13:28:27 +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

Random spontaneous cleanup PR (#25131)

2024-02-13 16:48:39 -05: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

Various item status fixes/tweaks (#27267)

2024-04-25 00:01:31 +10: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

Revert "Simplify separated screen top menu (#33047)"

2024-12-08 21:36:48 +01: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

Modular weapon crafting WIP (#611)

2024-11-29 01:31:42 +03:00

Viewport

Replace xform.WorldPosition with xformSystem method for Setting/Getting (#30029)

2024-08-06 21:02:01 +10: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