Morb0 8ba54ec466 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Audio/ContentAudioSystem.cs # Content.Client/Options/UI/Tabs/AudioTab.xaml # Content.Client/Options/UI/Tabs/AudioTab.xaml.cs # Content.Server/GameTicking/Rules/Components/ThiefRuleComponent.cs # Resources/Prototypes/Datasets/ion_storm.yml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/virology.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/atmospherics.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/basic.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/command.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/engineering.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/freezer.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/maint.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/medical.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/security.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/virology.rsi/assembly.png		2023-12-29 16:58:52 +03:00
..
AdminRemarks	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
BanPanel	Add admin Erase verb, add checkbox to erase from the ban panel (#20985)	2023-10-14 02:02:56 -07:00
Bwoink	Fix not being able to sort by playtime in the F7 players tab (#21004)	2023-10-14 14:56:06 -07:00
CustomControls	Fix right click not showing the context menu in AHelps, players tab and objects tab (#22798)	2023-12-20 23:32:52 -07:00
Logs	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
ManageSolutions	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
Notes	Remove cringe hardcodes for background (#20374)	2023-09-22 14:50:34 -05:00
SetOutfit	Fix misc commands (#20004)	2023-09-11 15:21:52 +10:00
SpawnExplosion	Revert "Update submodule to 175.0.0 (#21318)" (#21319)	2023-10-29 15:29:30 +11:00
Tabs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-23 02:53:18 +03:00
AdminAnnounceWindow.xaml	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminAnnounceWindow.xaml.cs	Multiline edit everywhere (#15216)	2023-04-14 12:57:47 -07:00
AdminMenuWindow.xaml	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00
AdminMenuWindow.xaml.cs	Add panic bunker UI and automatic panic bunker (#20954)	2023-10-13 11:56:12 -07:00
AdminMenuWindowEui.cs	Ensure EUIs close themselves (#15860)	2023-04-29 13:16:24 +10:00
AdminUIHelpers.cs	Add confirmation to kick and respawn in the admin player actions panel (#20542)	2023-09-28 15:46:06 -07:00
PermissionsEui.cs	Update content vectors to numerics (#17759)	2023-07-08 14:08:32 +10:00