PostReviewChanges

Content.Server/SS220/MindSlave/MindSlaveSystem.cs

@@ -108,7 +108,7 @@ private void OnAccent(Entity<MindSlaveComponent> entity, ref BeforeAccentGetEven
         var stopWord = entity.Comp.StopWord.ToLower();
         var message = args.Message;
         var index = message.ToLower().IndexOf(stopWord);
-        while (index != -1)
+        while (index != -1 && !string.IsNullOrEmpty(message))
         {
             message = message.Remove(index, stopWord.Length).Insert(index, Loc.GetString("mindslave-stop-word-replacement"));
             index = message.ToLower().IndexOf(stopWord);
@@ -331,9 +331,6 @@ public bool TryRemoveSlave(EntityUid slave)
             if (mindslaveImplant != null)
                 _implant.ForceRemove(slave, mindslaveImplant.Value);
         }
-
-
-
         return true;
     }
 

Content.Server/SS220/Text/MarkovTextGenerator.cs

@@ -37,7 +37,7 @@ public void Initialize(IReadOnlyList<string> locPath, int keySize)
 
             for (int i = 0; i < words.Length - keySize; i++)
             {
-                var key = words.Skip(i).Take(keySize).Aggregate(Join);
+                var key = string.Join(' ', words, i, keySize);
                 var value = words[i + keySize];
                 AddToTransitionMatrix(key, value);
             }

Resources/Prototypes/SS220/Catalog/uplink_catalog.yml

@@ -34,13 +34,13 @@
   cost:
     Telecrystal: 10
   categories:
-    - UplinkImplants
+  - UplinkImplants
   conditions:
-    - !type:StoreWhitelistCondition
+  - !type:StoreWhitelistCondition
       blacklist:
         tags:
-          - NukeOpsUplink
-          - LoneOpsUplink
+        - NukeOpsUplink
+        - LoneOpsUplink
 
 - type: listing
   id: UplinkMindslaveSurgeryFixBundle
@@ -55,7 +55,11 @@
     Telecrystal: 4
   categories:
   - UplinkImplants
-
+  conditions:
+  - !type:BuyerWhitelistCondition
+    blacklist:
+      components:
+      - SurplusBundle
 # JobItems
 
 - type: listing