NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Server/Administration
History
Exact
Arthur e1e7dc2a9d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Maps/infiltrator.yml
#	Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
#	Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml
2022-06-28 22:33:18 +03:00
..
Commands Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-06-28 22:33:18 +03:00
Components Revert "Revert "Fix some friend access violations by allowing others access. (#8594) (#8703)" (working this time) (#8704) 2022-06-07 15:26:28 +02:00
Logs Missing nullables (#8634) 2022-06-04 17:17:48 +10:00
Managers Cleanup the namespaces (#8132) 2022-05-13 17:59:03 +10:00
Notes Admin notes (#7259) 2022-04-16 20:57:50 +02:00
Systems Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 2022-05-27 00:41:18 -07:00
UI Add department-specific radio channels (#9061) 2022-06-23 20:11:03 +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