Morbo c58729755f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/equipped-BACKPACK.png # Resources/Textures/Clothing/Back/Satchels/hydroponics.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon-on.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/icon.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/meta.json # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-equipped-HELMET.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-left.png # Resources/Textures/Clothing/Head/Helmets/light_riot.rsi/on-inhand-right.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/icon.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png # Resources/Textures/Clothing/OuterClothing/Armor/riot.rsi/meta.json		2023-03-24 05:48:43 +03:00
..
BanList	Add ban list window (#12574)	2022-11-14 20:06:55 +01:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-03-21 02:50:29 +03:00
Components	Cuffable/Handcuff ECS (#14382)	2023-03-13 19:34:26 -04:00
Logs	Add non-players button to log viewer (#14097)	2023-02-28 08:09:35 -08:00
Managers	Equipment verbs & admin inventory access. (#14315)	2023-03-06 04:12:08 +11:00
Notes	Fix rsi sprite access for verbs (#14284)	2023-02-26 18:48:57 +11:00
Systems	Godmode refactor (#14651)	2023-03-23 14:57:15 -04: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	Fix #13250 (#13368)	2023-01-08 05:16:30 +11:00
NetworkResourceManager.cs	Fix #13250 (#13368)	2023-01-08 05:16:30 +11:00
PlayerLocator.cs	Cache HTTP client in player locator (#12555)	2022-11-11 19:56:47 -06:00
QuickDialogSystem.cs	Fixes quick dialog exception (#13189)	2023-01-05 06:27:25 +11:00
QuickDialogSystem.OpenDialog.cs	Adds even more smites and a bunch of tools. (#9825)	2022-07-21 17:30:00 -05:00