Morb0 d97a09543d Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Client/IoC/ClientContentIoC.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs # Content.Shared/Preferences/Loadouts/RoleLoadout.cs # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json		2024-05-15 18:53:52 +03:00
..
Actions	Add ActionPerformedEvent, ActionsSystem.SetIfBiggerCooldown, action id to action events and BackgroundOn field (#27682)	2024-05-10 20:04:01 -04:00
Admin	Fix objects tab not showing nents (#23837)	2024-01-10 01:30:20 -07:00
Alerts	Fix AlertControl throwing an error if the sprite view entity is deleted multiple times (#27690)	2024-05-05 21:38:55 -04:00
Atmos/GasTank	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
Bwoink	Add option for admins to disable bwoink (#25008)	2024-02-20 23:52:03 -07:00
Character	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Chat	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-15 18:53:52 +03: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	Add ghost role raffles (#26629)	2024-05-06 18:48:16 -07:00
Guidebook	Add UI click sounds (#22410)	2023-12-29 15:43:36 +11:00
Hands	Expand UseDelay to support multiple delays per entity; fix bible healing and bag pickup (#27234)	2024-04-25 22:25:52 -04:00
Hotbar	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
Info	Hud refactor (#7202)	2022-10-12 10:16:23 +02:00
Inventory	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10:00
MenuBar	Emotes Menu (#26702)	2024-04-28 21:38:23 -07:00
Objectives/Controls	Wrap objective briefing text (#24244)	2024-01-19 09:25:40 +11:00
Sandbox	prevent opening debug menus without perms (#25091)	2024-02-10 19:00:52 +11:00
Storage	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Viewport	Adds the option to fit the viewport to vertical screenspace (#27061)	2024-04-20 16:46:02 +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