Merge branch 'starlight-dev' of github.com:ss14Starlight/space-station-14 into upstream/solutions-rebirth

Author: wonderfulnewworld

Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs

@@ -60,7 +60,7 @@ public void Initialize()
 
         // NullLink start
         _net.RegisterNetMessage<MsgUpdatePlayerPlayTime>(Update);
-        _achievements.AchievementsUpdated += OnAchievementsUpdated;
+        _achievements.AchievementUnlocked += OnAchievementsUnlocked;
         _cfg.OnValueChanged(NullLinkCCVars.Project, OnProjectChanged, true);
         _cfg.OnValueChanged(NullLinkCCVars.Server, OnServerChanged, true);
         // NullLink end
@@ -121,7 +121,7 @@ private void MergePlayTime()
         Updated?.Invoke();
     }
 
-    private void OnAchievementsUpdated()
+    private void OnAchievementsUnlocked(string achievement)
         =>  Updated?.Invoke();
     // Nulllink end
 

Content.Server/Antag/AntagSelectionSystem.API.Assignment.Starlight.cs

@@ -0,0 +1,78 @@
+using Content.Server.Antag.Components;
+using Content.Shared.Antag;
+using Content.Shared.Humanoid;
+using Content.Shared.Preferences;
+using JetBrains.Annotations;
+using Robust.Shared.Player;
+using Robust.Shared.Prototypes;
+
+using static Content.Server.Antag.Components.AntagSelectionTime;
+
+namespace Content.Server.Antag;
+
+public sealed partial class AntagSelectionSystem
+{
+    /// <summary>
+    /// Checks if a player has already been pre-selected for a different antag within the same game rule.
+    /// </summary>
+    private bool HasConflictingPreSelection(
+        Entity<AntagSelectionComponent> gameRule,
+        ProtoId<AntagSpecifierPrototype> definition,
+        ICommonSession player)
+    {
+        foreach (var (proto, sessions) in gameRule.Comp.PreSelectedSessions)
+        {
+            if (proto != definition && sessions.Contains(player))
+                return true;
+        }
+
+        return false;
+    }
+
+    /// <summary>
+    /// Checks if a given player is valid for a given antag definition, checking the player's selected profile if it exists.
+    /// </summary>
+    /// <param name="player">The player session to check.</param>
+    /// <param name="antagEntity">The entity representing the antag.</param>
+    /// <param name="selectedProfile">The player's selected character profile, if any.</param>
+    /// <param name="definition">The antag definition to check against.</param>
+    /// <returns>True if the player is valid for the antag, false otherwise.</returns>
+    private bool IsSelectedProfileValidForAntag(
+        ICommonSession player,
+        EntityUid antagEntity,
+        HumanoidCharacterProfile? selectedProfile,
+        AntagSpecifierPrototype definition)
+    {
+        if (selectedProfile != null)
+            return IsProfileValidForAntag(player, selectedProfile, definition);
+
+        // Bodies without HumanoidAppearanceComponent have no character profile to
+        // validate and are allowed through here. Humanoid bodies must have a recoverable
+        // profile so profile-specific antag requirements, including species restrictions
+        // and preferences, cannot be bypassed.
+        if (!TryComp<HumanoidAppearanceComponent>(antagEntity, out var humanoid))
+            return true;
+
+        var profile = _humanoidAppearance.GetBaseProfile((antagEntity, humanoid));
+        return profile != null && IsProfileValidForAntag(player, profile, definition);
+    }
+
+    /// <summary>
+    /// Returns whether a player may claim an antagonist ghost role.
+    /// This intentionally does not require the antag preference to be enabled.
+    /// </summary>
+    [PublicAPI]
+    public bool CanTakeAntagGhostRole(ICommonSession session, ProtoId<AntagSpecifierPrototype> definition)
+    {
+        return Proto.Resolve(definition, out var antag) && CanTakeAntagGhostRole(session, antag);
+    }
+
+    /// <summary>
+    /// Returns whether a player may claim an antagonist ghost role.
+    /// </summary>
+    [PublicAPI]
+    public bool CanTakeAntagGhostRole(ICommonSession session, AntagSpecifierPrototype definition)
+    {
+        return !IsAntagBanned(session, definition) && _playTime.IsAllowedNonSpawning(session, definition.PrefRoles);
+    }
+}

Content.Server/Antag/AntagSelectionSystem.API.Assignment.cs

@@ -9,7 +9,8 @@
 using Content.Shared.Hands.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Players;
-using Content.Shared.Preferences;
+using Content.Shared.Silicons.Borgs.Components;
+using Content.Shared.Xenoborgs.Components;
 using JetBrains.Annotations;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
@@ -72,53 +73,6 @@ public bool CanBeAntag(ICommonSession player,
         return true;
     }
 
-    #region Starlight
-    /// <summary>
-    /// Checks if a player has already been pre-selected for a different antag within the same game rule.
-    /// </summary>
-    private bool HasConflictingPreSelection(
-        Entity<AntagSelectionComponent> gameRule,
-        ProtoId<AntagSpecifierPrototype> definition,
-        ICommonSession player)
-    {
-        foreach (var (proto, sessions) in gameRule.Comp.PreSelectedSessions)
-        {
-            if (proto != definition && sessions.Contains(player))
-                return true;
-        }
-
-        return false;
-    }
-
-    /// <summary>
-    /// Checks if a given player is valid for a given antag definition, checking the player's selected profile if it exists.
-    /// </summary>
-    /// <param name="player">The player session to check.</param>
-    /// <param name="antagEntity">The entity representing the antag.</param>
-    /// <param name="selectedProfile">The player's selected character profile, if any.</param>
-    /// <param name="definition">The antag definition to check against.</param>
-    /// <returns>True if the player is valid for the antag, false otherwise.</returns>
-    private bool IsSelectedProfileValidForAntag(
-        ICommonSession player,
-        EntityUid antagEntity,
-        HumanoidCharacterProfile? selectedProfile,
-        AntagSpecifierPrototype definition)
-    {
-        if (selectedProfile != null)
-            return IsProfileValidForAntag(player, selectedProfile, definition);
-
-        // Bodies without HumanoidAppearanceComponent have no character profile to
-        // validate and are allowed through here. Humanoid bodies must have a recoverable
-        // profile so profile-specific antag requirements, including species restrictions
-        // and preferences, cannot be bypassed.
-        if (!TryComp<HumanoidAppearanceComponent>(antagEntity, out var humanoid))
-            return true;
-
-        var profile = _humanoidAppearance.GetBaseProfile((antagEntity, humanoid));
-        return profile != null && IsProfileValidForAntag(player, profile, definition);
-    }
-    #endregion
-
     /// <inhereitdoc cref="IsSessionValid(ICommonSession,Entity{AntagSelectionComponent},ProtoId{AntagSpecifierPrototype})"/>
     public bool IsSessionValid(ICommonSession player,
         Entity<AntagSelectionComponent> gameRule,
@@ -239,6 +193,9 @@ public bool IsEntityValid(EntityUid? uid, AntagSpecifierPrototype def) // Starli
         if (HasComp<GhostComponent>(uid))
             return false;
 
+        if (HasComp<BorgChassisComponent>(uid) && !HasComp<XenoborgComponent>(uid)) // Starlight, we should really make this look better in the future if we add more borg antags
+            return false; // Starlight
+
         if (!HasComp<HumanoidAppearanceComponent>(uid) && (!def.AllowNonHumans || !HasComp<HandsComponent>(uid))) // Starlight, Cheese, you have sent me down the path of the hell trying to get this working reliably
             return false;
 
@@ -268,27 +225,6 @@ public bool IsAntagBanned(ICommonSession session, AntagSpecifierPrototype defini
         return false;
     }
 
-    #region Starlight
-    /// <summary>
-    /// Returns whether a player may claim an antagonist ghost role.
-    /// This intentionally does not require the antag preference to be enabled.
-    /// </summary>
-    [PublicAPI]
-    public bool CanTakeAntagGhostRole(ICommonSession session, ProtoId<AntagSpecifierPrototype> definition)
-    {
-        return Proto.Resolve(definition, out var antag) && CanTakeAntagGhostRole(session, antag);
-    }
-
-    /// <summary>
-    /// Returns whether a player may claim an antagonist ghost role.
-    /// </summary>
-    [PublicAPI]
-    public bool CanTakeAntagGhostRole(ICommonSession session, AntagSpecifierPrototype definition)
-    {
-        return !IsAntagBanned(session, definition) && _playTime.IsAllowedNonSpawning(session, definition.PrefRoles);
-    }
-    #endregion
-
     /// <inheritdoc cref="TryMakeAntag(Entity{AntagSelectionComponent},AntagSpecifierPrototype,ICommonSession,bool)"/>
     [PublicAPI]
     public bool TryMakeAntag(Entity<AntagSelectionComponent> gameRule,
@@ -338,6 +274,18 @@ public bool TryAssignNextAvailableAntag(Entity<AntagSelectionComponent> gameRule
         ICommonSession session,
         int players)
     {
+        #region Starlight
+        return TryAssignNextAvailableAntag(gameRule, session, players, out _);
+    }
+
+    /// <summary>
+    /// Tries to find an open antag slot for a given player and returns the definition that was assigned.
+    /// </summary>
+    private bool TryAssignNextAvailableAntag(Entity<AntagSelectionComponent> gameRule, ICommonSession session, int players, [NotNullWhen(true)] out AntagSpecifierPrototype? assignedAntag)
+    {
+        assignedAntag = null;
+        #endregion
+
         foreach (var selector in gameRule.Comp.Antags)
         {
             if (!Proto.Resolve(selector.Proto, out var antag))
@@ -348,8 +296,13 @@ public bool TryAssignNextAvailableAntag(Entity<AntagSelectionComponent> gameRule
                 continue;
 
             // Try and assign this antag, if we fail, then try the next definition!
-            if (TryMakeAntag(gameRule, antag, session))
-                return true;
+            #region Starlight
+            if (!TryMakeAntag(gameRule, antag, session))
+                continue;
+
+            assignedAntag = antag;
+            return true;
+            #endregion
         }
 
         return false;
@@ -385,8 +338,13 @@ public bool TryMakeLateJoinAntag(ICommonSession session)
 
         foreach (var (uid, antag) in rules)
         {
-            if (TryAssignNextAvailableAntag((uid, antag), session, players))
-                return true;
+            #region Starlight
+            if (!TryAssignNextAvailableAntag((uid, antag), session, players, out var assignedAntag))
+                continue;
+
+            RecordLateJoinAntagAssignment((uid, antag), assignedAntag); // logging
+            return true;
+            #endregion
         }
 
         return false;