Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml # Content.Server/Power/Generator/GeneratorSystem.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml # Resources/Prototypes/Entities/Objects/Misc/paper.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/Textures/Effects/speech.rsi/meta.json # Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png # Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png		2024-02-03 03:38:29 +03:00
..
BanList	Add role bans tab to the bans admin window (#20388)	2023-09-22 14:08:28 -07:00
Commands	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
Components	Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)	2024-01-29 10:32:42 +11:00
Logs	Move ActorComponent to shared (#21293)	2023-10-29 04:21:02 +11:00
Managers	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11:00
Notes	message notes no longer show seen notes in chat (#23271)	2023-12-31 01:01:05 -06:00
Systems	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-02-03 03:38:29 +03:00
Toolshed	Revert 'Revert 'Solution Entities'' (#23168)	2023-12-29 08:47:43 -04:00
UI	Fix solution editor UI (#24004)	2024-01-13 15:52:42 +11: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	Obsolete refactor - ConnectedClient to Channel (#24409)	2024-01-23 09:14:13 +11: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