NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Administration
History
Arthur 075299b54d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/science.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/science.rsi/opening.png
2022-07-22 22:45:30 +03:00
..
Commands Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-07-15 15:39:41 +03:00
Components Adds even more smites and a bunch of tools. (#9825) 2022-07-21 17:30:00 -05:00
Logs Disable admin logs next button when there are no more logs (#9277) 2022-06-29 10:38:24 +02:00
Managers Client command perms cleanup. (#9599) 2022-07-10 15:43:44 +02:00
Notes Admin notes (#7259) 2022-04-16 20:57:50 +02:00
Systems Adds even more smites and a bunch of tools. (#9825) 2022-07-21 17:30:00 -05:00
UI Fix station announcements (#9380) 2022-07-04 16:00:51 +10:00
AdminCommandAttribute.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
AdminPermsChangedEventArgs.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
AdminRank.cs Remove redundant #nullable enable (#4275) 2021-07-16 17:37:09 -07:00
GamePrototypeLoadManager.cs Remove usage of CreateNetMessage. (#7563) 2022-04-15 11:55:49 -07:00
NetworkResourceManager.cs Remove usage of CreateNetMessage. (#7563) 2022-04-15 11:55:49 -07:00
PlayerLocator.cs Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
QuickDialogSystem.cs Adds even more smites and a bunch of tools. (#9825) 2022-07-21 17:30:00 -05:00
QuickDialogSystem.OpenDialog.cs Adds even more smites and a bunch of tools. (#9825) 2022-07-21 17:30:00 -05:00