Morb0 ce4a90a054 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/base.png # Resources/Textures/Structures/Power/apc.rsi/broken.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel0-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel1-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-auto_on.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_off.png # Resources/Textures/Structures/Power/apc.rsi/channel2-manual_on.png # Resources/Textures/Structures/Power/apc.rsi/display-charging.png # Resources/Textures/Structures/Power/apc.rsi/display-full.png # Resources/Textures/Structures/Power/apc.rsi/display-lack.png # Resources/Textures/Structures/Power/apc.rsi/display-remote.png # Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png # Resources/Textures/Structures/Power/apc.rsi/frame.png # Resources/Textures/Structures/Power/apc.rsi/lock0-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock0-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-locked.png # Resources/Textures/Structures/Power/apc.rsi/lock1-unlocked.png # Resources/Textures/Structures/Power/apc.rsi/meta.json # Resources/Textures/Structures/Power/apc.rsi/panel.png # Resources/Textures/Structures/Power/apc.rsi/static.png		2024-06-17 23:51:01 +03:00
..
Actions	Fix action icons when dragging an active action to another slot (#28692)	2024-06-07 22:34:48 -07:00
Admin	SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)	2024-06-09 14:58:10 -04:00
Alerts	Remove AlertType and AlertCategory (#27933)	2024-05-23 22:43:04 -04:00
Atmos/GasTank	Header of Gas tank UI screen now fetched from Entity name and local (#28545)	2024-06-02 23:33:30 -04: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-06-17 23:51:01 +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	Open the guidebook when people with less than an hour playing join the round (#28774)	2024-06-09 12:26:48 -04: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	Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)	2024-06-15 00:41:25 -04:00
Inventory	Remove bogus C# finalizers (#28315)	2024-05-27 17:52:23 -04: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	Fix storage UI interactions (#28291)	2024-05-26 12:11:37 +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