Merge pull request space-wizards#1381 from space-syndicate/upstream-sync

Upstream sync
Morb0 · Aug 31, 2023 · 163e474 · 163e474
2 parents 8585afd + 5b402fc
commit 163e474
Show file tree

Hide file tree

Showing 243 changed files with 5,097 additions and 2,172 deletions.
diff --git a/Content.Client/Disposal/DisposalUnitComponent.cs b/Content.Client/Disposal/DisposalUnitComponent.cs
@@ -3,7 +3,6 @@
 namespace Content.Client.Disposal;
 
 [RegisterComponent]
-[ComponentReference(typeof(SharedDisposalUnitComponent))]
 public sealed partial class DisposalUnitComponent : SharedDisposalUnitComponent
 {
 

diff --git a/Content.Client/Disposal/Systems/DisposalUnitSystem.cs b/Content.Client/Disposal/Systems/DisposalUnitSystem.cs
@@ -48,6 +48,11 @@ private void OnHandleState(EntityUid uid, DisposalUnitComponent component, ref C
         component.RecentlyEjected.AddRange(state.RecentlyEjected);
     }
 
+    public override bool HasDisposals(EntityUid? uid)
+    {
+        return HasComp<DisposalUnitComponent>(uid);
+    }
+
     public override void DoInsertDisposalUnit(EntityUid uid, EntityUid toInsert, EntityUid user, SharedDisposalUnitComponent? disposal = null)
     {
         return;

diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
@@ -25,21 +25,18 @@
 using Content.Client.Stylesheets;
 using Content.Client.Viewport;
 using Content.Client.Voting;
-using Content.Shared.Administration;
 using Content.Shared.Ame;
 using Content.Shared.Gravity;
 using Content.Shared.Localizations;
 using Robust.Client;
 using Robust.Client.Graphics;
 using Robust.Client.Input;
 using Robust.Client.Replays.Loading;
-using Robust.Client.Replays.Playback;
 using Robust.Client.State;
 using Robust.Client.UserInterface;
 using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
-using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Replays;
 
@@ -106,11 +103,8 @@ public override void Init()
             _prototypeManager.RegisterIgnore("utilityQuery");
             _prototypeManager.RegisterIgnore("utilityCurvePreset");
             _prototypeManager.RegisterIgnore("accent");
-            _prototypeManager.RegisterIgnore("material");
-            _prototypeManager.RegisterIgnore("reaction"); //Chemical reactions only needed by server. Reactions checks are server-side.
             _prototypeManager.RegisterIgnore("gasReaction");
             _prototypeManager.RegisterIgnore("seed"); // Seeds prototypes are server-only.
-            _prototypeManager.RegisterIgnore("barSign");
             _prototypeManager.RegisterIgnore("objective");
             _prototypeManager.RegisterIgnore("holiday");
             _prototypeManager.RegisterIgnore("aiFaction");
@@ -121,10 +115,7 @@ public override void Init()
             _prototypeManager.RegisterIgnore("npcFaction");
             _prototypeManager.RegisterIgnore("lobbyBackground");
             _prototypeManager.RegisterIgnore("advertisementsPack");
-            _prototypeManager.RegisterIgnore("metabolizerType");
-            _prototypeManager.RegisterIgnore("metabolismGroup");
             _prototypeManager.RegisterIgnore("salvageMap");
-            _prototypeManager.RegisterIgnore("salvageFaction");
             _prototypeManager.RegisterIgnore("gamePreset");
             _prototypeManager.RegisterIgnore("noiseChannel");
             _prototypeManager.RegisterIgnore("spaceBiome");
@@ -139,7 +130,6 @@ public override void Init()
             _prototypeManager.RegisterIgnore("nukeopsRole");
             _prototypeManager.RegisterIgnore("stationGoal"); // Corvax-StationGoal
             _prototypeManager.RegisterIgnore("loadout"); // Corvax-Loadout
-            _prototypeManager.RegisterIgnore("flavor");
 
             _componentFactory.GenerateNetIds();
             _adminManager.Initialize();

diff --git a/Content.Client/Foldable/FoldableSystem.cs b/Content.Client/Foldable/FoldableSystem.cs
diff --git a/Content.Client/Mind/MindSystem.cs b/Content.Client/Mind/MindSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Mind;
+
+namespace Content.Client.Mind;
+
+public sealed class MindSystem : SharedMindSystem
+{
+}
diff --git a/Content.Client/Players/PlayerSystem.cs b/Content.Client/Players/PlayerSystem.cs
@@ -0,0 +1,12 @@
+using Content.Shared.Players;
+using Robust.Shared.Players;
+
+namespace Content.Client.Players;
+
+public sealed class PlayerSystem : SharedPlayerSystem
+{
+    public override PlayerData? ContentData(ICommonSession? session)
+    {
+        return null;
+    }
+}
diff --git a/Content.Client/Points/PointSystem.cs b/Content.Client/Points/PointSystem.cs
@@ -0,0 +1,58 @@
+using Content.Client.CharacterInfo;
+using Content.Client.Message;
+using Content.Shared.Points;
+using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
+using Robust.Shared.GameStates;
+
+namespace Content.Client.Points;
+
+/// <inheritdoc/>
+public sealed class PointSystem : SharedPointSystem
+{
+    [Dependency] private readonly CharacterInfoSystem _characterInfo = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PointManagerComponent, ComponentHandleState>(OnHandleState);
+        SubscribeLocalEvent<CharacterInfoSystem.GetCharacterInfoControlsEvent>(OnGetCharacterInfoControls);
+    }
+
+    private void OnHandleState(EntityUid uid, PointManagerComponent component, ref ComponentHandleState args)
+    {
+        if (args.Current is not PointManagerComponentState state)
+            return;
+
+        component.Points = new(state.Points);
+        component.Scoreboard = state.Scoreboard;
+        _characterInfo.RequestCharacterInfo();
+    }
+
+    private void OnGetCharacterInfoControls(ref CharacterInfoSystem.GetCharacterInfoControlsEvent ev)
+    {
+        foreach (var point in EntityQuery<PointManagerComponent>())
+        {
+            var box = new BoxContainer
+            {
+                Margin = new Thickness(5),
+                Orientation = BoxContainer.LayoutOrientation.Vertical
+            };
+
+            var title = new RichTextLabel
+            {
+                HorizontalAlignment = Control.HAlignment.Center
+            };
+            title.SetMarkup(Loc.GetString("point-scoreboard-header"));
+
+            var text = new RichTextLabel();
+            text.SetMessage(point.Scoreboard);
+
+            box.AddChild(title);
+            box.AddChild(text);
+            ev.Controls.Add(box);
+        }
+    }
+}
diff --git a/Content.Client/Roles/Jobs/JobSystem.cs b/Content.Client/Roles/Jobs/JobSystem.cs
@@ -0,0 +1,7 @@
+using Content.Shared.Roles.Jobs;
+
+namespace Content.Client.Roles.Jobs;
+
+public sealed class JobSystem : SharedJobSystem
+{
+}
diff --git a/Content.Client/Roles/RoleSystem.cs b/Content.Client/Roles/RoleSystem.cs
@@ -0,0 +1,5 @@
+namespace Content.Client.Roles;
+
+public sealed class RoleSystem : EntitySystem
+{
+}
diff --git a/Content.Client/Storage/Components/EntityStorageComponent.cs b/Content.Client/Storage/Components/EntityStorageComponent.cs
@@ -3,7 +3,7 @@
 
 namespace Content.Client.Storage.Components;
 
-[RegisterComponent, ComponentReference(typeof(SharedEntityStorageComponent))]
+[RegisterComponent]
 public sealed partial class EntityStorageComponent : SharedEntityStorageComponent
 {
 

diff --git a/Content.Client/Storage/Systems/EntityStorageSystem.cs b/Content.Client/Storage/Systems/EntityStorageSystem.cs
@@ -1,8 +1,40 @@
-using Content.Shared.Storage.EntitySystems;
+using System.Diagnostics.CodeAnalysis;
+using Content.Client.Storage.Components;
+using Content.Shared.Destructible;
+using Content.Shared.Interaction;
+using Content.Shared.Lock;
+using Content.Shared.Movement.Events;
+using Content.Shared.Storage.Components;
+using Content.Shared.Storage.EntitySystems;
+using Content.Shared.Verbs;
+using Robust.Shared.GameStates;
 
 namespace Content.Client.Storage.Systems;
 
 public sealed class EntityStorageSystem : SharedEntityStorageSystem
 {
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<EntityStorageComponent, ComponentInit>(OnComponentInit);
+        SubscribeLocalEvent<EntityStorageComponent, ComponentStartup>(OnComponentStartup);
+        SubscribeLocalEvent<EntityStorageComponent, ActivateInWorldEvent>(OnInteract, after: new[] { typeof(LockSystem) });
+        SubscribeLocalEvent<EntityStorageComponent, LockToggleAttemptEvent>(OnLockToggleAttempt);
+        SubscribeLocalEvent<EntityStorageComponent, DestructionEventArgs>(OnDestruction);
+        SubscribeLocalEvent<EntityStorageComponent, GetVerbsEvent<InteractionVerb>>(AddToggleOpenVerb);
+        SubscribeLocalEvent<EntityStorageComponent, ContainerRelayMovementEntityEvent>(OnRelayMovement);
 
+        SubscribeLocalEvent<EntityStorageComponent, ComponentGetState>(OnGetState);
+        SubscribeLocalEvent<EntityStorageComponent, ComponentHandleState>(OnHandleState);
+    }
+
+    public override bool ResolveStorage(EntityUid uid, [NotNullWhen(true)] ref SharedEntityStorageComponent? component)
+    {
+        if (component != null)
+            return true;
+
+        TryComp<EntityStorageComponent>(uid, out var storage);
+        component = storage;
+        return component != null;
+    }
 }
diff --git a/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs b/Content.Client/UserInterface/Systems/Character/CharacterUIController.cs
@@ -109,6 +109,7 @@ private void CharacterUpdated(CharacterData data)
         _window.NameLabel.Text = entityName;
         _window.SubText.Text = job;
         _window.Objectives.RemoveAllChildren();
+        _window.ObjectivesLabel.Visible = objectives.Any();
 
         foreach (var (groupId, conditions) in objectives)
         {

diff --git a/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml b/Content.Client/UserInterface/Systems/Character/Windows/CharacterWindow.xaml
@@ -14,7 +14,7 @@
                     <Label Name="SubText" VerticalAlignment="Top" StyleClasses="LabelSubText" Access="Public"/>
                 </BoxContainer>
             </BoxContainer>
-            <Label Text="{Loc 'character-info-objectives-label'}" HorizontalAlignment="Center"/>
+            <Label Name="ObjectivesLabel" Access="Public" Text="{Loc 'character-info-objectives-label'}" HorizontalAlignment="Center"/>
             <BoxContainer Orientation="Vertical" Name="Objectives" Access="Public"/>
             <cc:Placeholder Name="RolePlaceholder" Access="Public" PlaceholderText="{Loc 'character-info-roles-antagonist-text'}"/>
         </BoxContainer>

diff --git a/Content.IntegrationTests/Pair/TestPair.Recycle.cs b/Content.IntegrationTests/Pair/TestPair.Recycle.cs
@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using Content.Server.GameTicking;
-using Content.Server.Mind;
-using Content.Server.Mind.Components;
 using Content.Shared.CCVar;
 using Content.Shared.GameTicking;
+using Content.Shared.Mind;
+using Content.Shared.Mind.Components;
 using Robust.Client;
 using Robust.Server.Player;
 using Robust.Shared.Exceptions;

diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs
@@ -12,22 +12,13 @@
 using Content.IntegrationTests.Tests.Destructible;
 using Content.IntegrationTests.Tests.DeviceNetwork;
 using Content.IntegrationTests.Tests.Interaction.Click;
-using Content.Server.GameTicking;
-using Content.Server.Mind.Components;
-using Content.Shared.CCVar;
-using Content.Shared.GameTicking;
 using Robust.Client;
-using Robust.Client.State;
 using Robust.Server;
-using Robust.Server.Player;
-using Robust.Shared;
 using Robust.Shared.Configuration;
 using Robust.Shared.ContentPack;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Log;
-using Robust.Shared.Map;
-using Robust.Shared.Network;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.UnitTesting;

diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
@@ -5,7 +5,6 @@
 using Content.Client.Examine;
 using Content.IntegrationTests.Pair;
 using Content.Server.Body.Systems;
-using Content.Server.Mind;
 using Content.Server.Players;
 using Content.Server.Stack;
 using Content.Server.Tools;
@@ -14,6 +13,7 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Hands.EntitySystems;
 using Content.Shared.Interaction;
+using Content.Shared.Mind;
 using Robust.Client.Input;
 using Robust.Client.UserInterface;
 using Robust.Server.GameObjects;
@@ -192,7 +192,7 @@ await Server.WaitPost(() =>
         {
             // Fuck you mind system I want an hour of my life back
             // Mind system is a time vampire
-            SEntMan.System<MindSystem>().WipeMind(ServerSession.ContentData()?.Mind);
+            SEntMan.System<SharedMindSystem>().WipeMind(ServerSession.ContentData()?.Mind);
 
             old = cPlayerMan.LocalPlayer.ControlledEntity;
             Player = SEntMan.SpawnEntity(PlayerPrototype, PlayerCoords);

diff --git a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
@@ -2,9 +2,9 @@
 using System.Linq;
 using Content.Server.Ghost.Roles;
 using Content.Server.Ghost.Roles.Components;
-using Content.Server.Mind;
 using Content.Server.Players;
 using Content.Shared.Ghost;
+using Content.Shared.Mind;
 using Robust.Shared.Console;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
@@ -42,7 +42,7 @@ public async Task TakeRoleAndReturn()
         var entMan = server.ResolveDependency<IEntityManager>();
         var sPlayerMan = server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
         var conHost = client.ResolveDependency<IConsoleHost>();
-        var mindSystem = entMan.System<MindSystem>();
+        var mindSystem = entMan.System<SharedMindSystem>();
         var session = sPlayerMan.ServerSessions.Single();
         var originalMindId = session.ContentData()!.Mind!.Value;
 

diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
@@ -1,7 +1,7 @@
 using System.Linq;
-using Content.Server.Mind;
 using Content.Server.Players;
 using Content.Shared.Ghost;
+using Content.Shared.Mind;
 using Robust.Server.Console;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
@@ -27,7 +27,7 @@ public async Task TestDeleteVisiting()
         var entMan = server.ResolveDependency<IServerEntityManager>();
         var playerMan = server.ResolveDependency<IPlayerManager>();
 
-        var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
+        var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
 
         EntityUid playerEnt = default;
         EntityUid visitEnt = default;
@@ -83,7 +83,7 @@ public async Task TestGhostOnDeleteMap()
         var playerMan = server.ResolveDependency<IPlayerManager>();
         var player = playerMan.ServerSessions.Single();
 
-        var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
+        var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
 
         EntityUid playerEnt = default;
         EntityUid mindId = default!;
@@ -159,7 +159,7 @@ public async Task TestOriginalDeletedWhileGhostingKeepsGhost()
 
         var entMan = server.ResolveDependency<IServerEntityManager>();
         var playerMan = server.ResolveDependency<IPlayerManager>();
-        var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
+        var mindSystem = entMan.EntitySysManager.GetEntitySystem<SharedMindSystem>();
         var mind = GetMind(pair);
 
         var player = playerMan.ServerSessions.Single();

diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.IntegrationTests.Pair;
-using Content.Server.Mind;
 using Content.Server.Players;
 using Content.Shared.Ghost;
+using Content.Shared.Mind;
 using Robust.Server.GameObjects;
 using Robust.Server.Player;
 using Robust.Shared.Enums;
@@ -34,7 +34,7 @@ public sealed partial class MindTests
 
         var entMan = pair.Server.ResolveDependency<IServerEntityManager>();
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        var mindSys = entMan.System<MindSystem>();
+        var mindSys = entMan.System<SharedMindSystem>();
 
         var player = playerMan.ServerSessions.Single();
 
@@ -66,7 +66,7 @@ private static async Task<EntityUid> BecomeGhost(TestPair pair, bool visit = fal
     {
         var entMan = pair.Server.ResolveDependency<IServerEntityManager>();
         var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
-        var mindSys = entMan.System<MindSystem>();
+        var mindSys = entMan.System<SharedMindSystem>();
         EntityUid ghostUid = default;
         EntityUid mindId = default!;
         MindComponent mind = default!;