Factions V1

.github/mapchecker/config.py

@@ -4,13 +4,8 @@
     "DoNotMap",
     "DEBUG",
     "Admeme",
-    "CaptainSabre",
-    "ClothingBeltSheath",
-    "MagazinePistolHighCapacity",
-    "MagazinePistolHighCapacityRubber",
     "EncryptionKeyCommand",
     "SurveillanceCameraWireless",
-    "CrewMonitoringServer",
     "APCHighCapacity",
     "APCSuperCapacity",
     "APCHyperCapacity",
@@ -36,30 +31,20 @@
     ],
     "Custom": [
     ],
-    "Security": [  # These matchers are illegal unless the ship is part of the security shipyard.
-        "Security",  # Anything with the word security in it should also only be appearing on security ships.
-        "Plastitanium",  # Plastitanium walls should only be appearing on security ships.
-        "Kammerer", # Opportunity
-        "HighSecDoor",
-        "ShuttleGun",
+    "Security": [
     ],
     "Syndicate": [
-        "Plastitanium",  # And also on blackmarket ships cause syndicate.
-        "ShuttleGun",
     ],
     "BlackMarket": [
-        "Plastitanium",  # And also on blackmarket ships cause syndicate.
-        "ShuttleGun",
     ],
     "Sr": [
     ],
     "Medical": [
     ],
+    "Ussp": [
+    ],
     # It is assumed that mapped instances of plastitanium, security gear, etc. are deemed acceptable
     "PointOfInterest": [
-        "Plastitanium",
-        "Security",
-        "HighSecDoor",
         "WallPlastitaniumIndestructible",
         "WallPlastitaniumDiagonalIndestructible",
         "PlastititaniumWindowIndestructible",

Content.Client/Lobby/ClientPreferencesManager.cs

@@ -1,9 +1,11 @@
 using System.Linq;
+using Content.Shared._Mono.Company;
 using Content.Shared.Preferences;
 using Robust.Client;
 using Robust.Client.Player;
 using Robust.Shared.Network;
 using Robust.Shared.Utility;
+using Robust.Shared.Prototypes;
 
 namespace Content.Client.Lobby
 {
@@ -60,6 +62,19 @@ public void SelectCharacter(int slot)
         public void UpdateCharacter(ICharacterProfile profile, int slot)
         {
             var collection = IoCManager.Instance!;
+
+            // Verify company exists if this is a humanoid profile
+            if (profile is HumanoidCharacterProfile humanoidProfile)
+            {
+                var protoManager = IoCManager.Resolve<IPrototypeManager>();
+                if (!string.IsNullOrEmpty(humanoidProfile.Company) &&
+                    humanoidProfile.Company != "None" &&
+                    !protoManager.HasIndex<CompanyPrototype>(humanoidProfile.Company))
+                {
+                    profile = humanoidProfile.WithCompany("None");
+                }
+            }
+
             profile.EnsureValid(_playerManager.LocalSession!, collection);
             var characters = new Dictionary<int, ICharacterProfile>(Preferences.Characters) {[slot] = profile};
             Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor);
@@ -111,6 +126,47 @@ private void HandlePreferencesAndSettings(MsgPreferencesAndSettings message)
             Preferences = message.Preferences;
             Settings = message.Settings;
 
+            // Check if any character profiles have invalid companies and fix them
+            if (Preferences != null)
+            {
+                var protoManager = IoCManager.Resolve<IPrototypeManager>();
+                var needsUpdate = false;
+                var characters = new Dictionary<int, ICharacterProfile>();
+
+                foreach (var (slot, profile) in Preferences.Characters)
+                {
+                    var updatedProfile = profile;
+
+                    if (profile is HumanoidCharacterProfile humanoidProfile &&
+                        !string.IsNullOrEmpty(humanoidProfile.Company) &&
+                        humanoidProfile.Company != "None" &&
+                        !protoManager.HasIndex<CompanyPrototype>(humanoidProfile.Company))
+                    {
+                        updatedProfile = humanoidProfile.WithCompany("None");
+                        needsUpdate = true;
+                    }
+
+                    characters[slot] = updatedProfile;
+                }
+
+                if (needsUpdate)
+                {
+                    Preferences = new PlayerPreferences(characters, Preferences.SelectedCharacterIndex, Preferences.AdminOOCColor);
+
+                    // Update the selected character on the server if needed
+                    var selectedIndex = Preferences.SelectedCharacterIndex;
+                    if (characters.TryGetValue(selectedIndex, out var selectedProfile))
+                    {
+                        var msg = new MsgUpdateCharacter
+                        {
+                            Profile = selectedProfile,
+                            Slot = selectedIndex
+                        };
+                        _netManager.ClientSendMessage(msg);
+                    }
+                }
+            }
+
             OnServerDataLoaded?.Invoke();
         }
     }

Content.Client/Lobby/LobbyUIController.cs

@@ -5,6 +5,7 @@
 using Content.Client.Lobby.UI;
 using Content.Client.Players.PlayTimeTracking;
 using Content.Client.Station;
+using Content.Shared._Mono.Company;
 using Content.Shared.CCVar;
 using Content.Shared.Clothing;
 using Content.Shared.GameTicking;
@@ -185,13 +186,40 @@ private void RefreshLobbyPreview()
             PreviewPanel.SetSprite(EntityUid.Invalid);
             PreviewPanel.SetSummaryText(string.Empty);
             PreviewPanel.SetBankBalanceText(string.Empty); // Frontier
+            PreviewPanel.SetCompanyText(string.Empty); // Company Display
             return;
         }
 
+        // Verify company exists, if not set it to "None"
+        if (!string.IsNullOrEmpty(humanoid.Company) &&
+            humanoid.Company != "None" &&
+            !_prototypeManager.HasIndex<CompanyPrototype>(humanoid.Company))
+        {
+            // Create a new profile with the company set to "None"
+            humanoid = humanoid.WithCompany("None");
+
+            // Update the character in preferences
+            if (_preferencesManager.Preferences != null)
+            {
+                _preferencesManager.UpdateCharacter(humanoid, _preferencesManager.Preferences.SelectedCharacterIndex);
+            }
+        }
+
         var dummy = LoadProfileEntity(humanoid, null, true);
         PreviewPanel.SetSprite(dummy);
         PreviewPanel.SetSummaryText(humanoid.Summary);
         PreviewPanel.SetBankBalanceText(humanoid.BankBalanceText); // Frontier
+
+        // Company Display
+        var companyId = humanoid.Company;
+        if (_prototypeManager.TryIndex<CompanyPrototype>(companyId, out var company))
+        {
+            PreviewPanel.SetCompanyText($"Company: [color={company.Color.ToHex()}]{company.Name}[/color]");
+        }
+        else
+        {
+            PreviewPanel.SetCompanyText($"Company: [color=yellow]{companyId}[/color]");
+        }
     }
 
     private void RefreshProfileEditor()

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml

@@ -144,6 +144,18 @@
                         <BoxContainer Name="TraitsList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
+                <BoxContainer Orientation="Vertical" Margin="10">
+                    <!-- Company -->
+                    <ScrollContainer VerticalExpand="True">
+                        <BoxContainer Orientation="Vertical">
+                            <BoxContainer Margin="10" Orientation="Horizontal" HorizontalExpand="True">
+                                <Label Text="{Loc 'humanoid-profile-editor-company-label'}" />
+                                <Control HorizontalExpand="True"/>
+                                <OptionButton Name="CompanyButton" HorizontalAlignment="Right" />
+                            </BoxContainer>
+                        </BoxContainer>
+                    </ScrollContainer>
+                </BoxContainer>
                 <BoxContainer Name="MarkingsTab" Orientation="Vertical" Margin="10">
                     <!-- Markings -->
                     <ScrollContainer VerticalExpand="True">