Morb0 bffaecf157 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Mobs/Player/humanoid.yml # Resources/Prototypes/Loadouts/role_loadouts.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/brownfedora.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/greyfedora.rsi/meta.json # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/icon.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Hats/hoshat.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Vests/detvest.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json # Resources/Textures/Objects/Storage/boxes.rsi/meta.json # Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit-full.png # Resources/Textures/Structures/Piping/Atmospherics/Portable/portable_scrubber.rsi/unlit.png		2024-06-21 16:32:00 +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-06-14 19:48:52 +03:00
Components	Content update for UI prediction (#27214)	2024-04-26 18:16:24 +10:00
Logs	Add logs that provide session to player admin logs (#28628)	2024-06-06 00:19:54 +10:00
Managers	Fixes client having authority over rules popup cvars (#28655)	2024-06-07 21:53:20 +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/upstream/master' into upstream-sync	2024-06-21 16:32:00 +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	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	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