NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-11 11:21:11 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5
CatStation/Content.Server/Administration
History
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
..
BanList Add role bans tab to the bans admin window (#20388) 2023-09-22 14:08:28 -07:00
Commands Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00
Components Content update for UI prediction (#27214) 2024-04-26 18:16:24 +10:00
Logs Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936) 2024-05-12 20:34:52 -04:00
Managers Fix Incorrect stealth messages appearing on readmin. (#26511) 2024-03-28 20:19:53 +01:00
Notes Improve admin message seen/dismiss state. (#26223) 2024-03-21 16:15:46 +01:00
Systems Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-15 18:53:52 +03:00
Toolshed Revert 'Revert 'Solution Entities'' (#23168) 2023-12-29 08:47:43 -04:00
UI Resolve 'EntitySystem.Get<T>()' is obsolete in content (#27936) 2024-05-12 20:34:52 -04:00
AdminCommandAttribute.cs Toolshed (#17895) 2023-08-02 16:09:08 -05:00
AdminPermsChangedEventArgs.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
AdminRank.cs Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
BanPanelEui.cs Fix bad sawmill IPostInjectInit (#23626) 2024-01-07 02:33:53 +11:00
ContentNetworkResourceManager.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
PlayerLocator.cs Random spontaneous cleanup PR (#25131) 2024-02-13 16:48:39 -05:00
QuickDialogSystem.cs Obsolete refactor - ConnectedClient to Channel (#24409) 2024-01-23 09:14:13 +11:00
QuickDialogSystem.OpenDialog.cs Obsolete refactor - ConnectedClient to Channel (#24409) 2024-01-23 09:14:13 +11:00
ServerApi.cs Mega Antag Refactor (#25786) 2024-04-25 11:31:45 +10:00
ServerApi.Utility.cs Game server admin API (#26880) 2024-04-14 20:13:29 +10:00