Morb0 37dc87ad6f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/MassMedia/Ui/NewsWriteBoundUserInterface.cs # Content.Server/Connection/ConnectionManager.cs # Content.Server/MassMedia/Systems/NewsSystem.cs # Resources/Prototypes/Catalog/Cargo/cargo_vending.yml # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Hardsuits/deathsquad.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/qm.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/qm.rsi/icon.png # Resources/Textures/Objects/Misc/stock_parts.rsi/capacitor.png # Resources/Textures/Objects/Misc/stock_parts.rsi/matter_bin.png # Resources/Textures/Objects/Misc/stock_parts.rsi/meta.json # Resources/Textures/Objects/Misc/stock_parts.rsi/micro_mani.png # Resources/Textures/Structures/Doors/Airlocks/Standard/cargo.rsi/open.png # Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png # SpaceStation14.sln # Tools/actions_changelogs_since_last_run.py # Tools/package_client_build.py # Tools/package_server_build.py		2024-01-15 01:56:14 +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	Add cvar to show new players in ahelp (#23265)	2024-01-04 15:45:23 +11: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	Fix solution editor UI (#24004)	2024-01-13 15:52:42 +11: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	2024-01-15 01:56:14 +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