Changes2

Content.Server/_NF/Shipyard/Systems/ShipyardSystem.Consoles.cs

@@ -496,7 +496,14 @@ public void OnLoadMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
         bool loaded = false;
         try
         {
-            if (!string.IsNullOrWhiteSpace(args.SourceFilePath))
+            // HardLight start
+            if (!string.IsNullOrWhiteSpace(args.YamlData))
+            {
+                loaded = TryPurchaseShuttleFromYamlData(uid, args.YamlData, out shuttleUidOut);
+            }
+
+            if (!loaded && !string.IsNullOrWhiteSpace(args.SourceFilePath))
+            // HardLight end
             {
                 // Normalize to a ResPath under /UserData
                 var norm = args.SourceFilePath!.Replace('\\', '/');
@@ -508,12 +515,6 @@ public void OnLoadMessage(EntityUid uid, ShipyardConsoleComponent component, Shi
                 var resPath = new ResPath(norm);
                 loaded = TryPurchaseShuttleFromFile(uid, resPath, out shuttleUidOut);
             }
-
-            // Fallback: write to a temp file and then load via purchase-from-file
-            if (!loaded)
-            {
-                loaded = TryPurchaseShuttleFromYamlData(uid, args.YamlData, out shuttleUidOut);
-            }
         }
         catch (Exception ex)
         {

Content.Shared/NPC/Systems/NpcFactionSystem.Exception.cs

@@ -76,6 +76,9 @@ public IEnumerable<EntityUid> GetHostiles(Entity<FactionExceptionComponent?> ent
     /// </summary>
     public void IgnoreEntity(Entity<FactionExceptionComponent?> ent, Entity<FactionExceptionTrackerComponent?> target)
     {
+        if (!target.Owner.IsValid() || !EntityManager.EntityExists(target.Owner)) // HardLight
+            return;
+
         ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
         ent.Comp.Ignored.Add(target);
         target.Comp ??= EnsureComp<FactionExceptionTrackerComponent>(target);
@@ -99,6 +102,9 @@ public void IgnoreEntities(Entity<FactionExceptionComponent?> ent, IEnumerable<E
     /// </summary>
     public void AggroEntity(Entity<FactionExceptionComponent?> ent, Entity<FactionExceptionTrackerComponent?> target)
     {
+        if (!target.Owner.IsValid() || !EntityManager.EntityExists(target.Owner)) // HardLight
+            return;
+
         ent.Comp ??= EnsureComp<FactionExceptionComponent>(ent);
         ent.Comp.Hostiles.Add(target);
         target.Comp ??= EnsureComp<FactionExceptionTrackerComponent>(target);

Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml

@@ -75,6 +75,7 @@
   - type: ActivatableUI
     key: enum.BorgUiKey.Key
   - type: Targeting # Shitmed
+  - type: SurgeryTarget # HardLight: Necessary for Cyborgs to perform surgery.
   - type: SiliconLawBound
   - type: ActionGrant
     actions:

Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles.rsi/meta.json

@@ -102,6 +102,51 @@
           0.060000002
         ]
       ]
+    },
+	{
+      "name": "abyss_laser",
+      "delays": [
+        [
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002
+        ]
+      ]
+    },
+	{
+      "name": "impact_abyss_laser",
+      "delays": [
+        [
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002
+        ]
+      ]
+    },
+	{
+      "name": "muzzle_abyss_laser",
+      "delays": [
+        [
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002,
+          0.060000002
+        ]
+      ]
     },
     {
       "name": "beamlight",