Morb0 721f7bfecf Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Datasets/Names/ai.yml # Resources/Prototypes/Datasets/adjectives.yml # Resources/Prototypes/Datasets/verbs.yml # Resources/Prototypes/Entities/Clothing/Shoes/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Maps/bagel.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json # Resources/Textures/Structures/Wallmounts/barsign.rsi/officerbeersky.png # Resources/Textures/Structures/Wallmounts/signs.rsi/anomaly.png # SpaceStation14.sln		2024-08-28 16:40:36 +03:00
..
BanList	Adds a Pii Flag, Censors Hwid and Ip (#27776)	2024-06-01 00:23:54 -07:00
Commands	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-08-12 13:18:43 +03:00
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Logs	Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687)	2024-08-05 16:13:27 -07:00
Managers	Kick on ban for entire server group (#28649)	2024-08-20 23:31:33 +02:00
Notes	Improve admin message seen/dismiss state. (#26223)	2024-03-21 16:15:46 +01:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync	2024-08-28 16:40:36 +03:00
Toolshed	Cleans up tag system (#28272)	2024-06-02 11:11:19 +10: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
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
PlayerPanelEui.cs	Implement a playerpanel (#30238)	2024-08-09 15:33:25 +10: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	Panic Bunker uses minutes not hours (#28805)	2024-06-09 22:45:47 +02:00
ServerApi.Utility.cs	Game server admin API (#26880)	2024-04-14 20:13:29 +10:00