NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-13 04:11:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Administration
History
Morb0 259233ad78 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml
#	Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
#	Resources/Prototypes/Catalog/Fills/Boxes/general.yml
#	Resources/Prototypes/Entities/Clothing/Back/satchel.yml
#	Resources/Prototypes/Entities/Objects/Specific/Forensics/forensics.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/Textures/Objects/Storage/boxes.rsi/meta.json
2023-11-04 12:16:53 +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 'upstream/master' into upstream-sync 2023-11-04 12:16:53 +03:00
Components Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Logs Move ActorComponent to shared (#21293) 2023-10-29 04:21:02 +11:00
Managers Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Notes Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Systems Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
Toolshed Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
UI Moves SolutionContainerManagerComponent to Shared. (#20944) 2023-10-15 03:45:28 +11: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 Add admin Erase verb, add checkbox to erase from the ban panel (#20985) 2023-10-14 02:02:56 -07:00
ContentNetworkResourceManager.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
PlayerLocator.cs Cache HTTP client in player locator (#12555) 2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
QuickDialogSystem.OpenDialog.cs Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00