From ad430fd877812d7c67fdb2ac9c65528111c5289e Mon Sep 17 00:00:00 2001
From: Livyathan <notlivyathan@gmail.com>
Date: Tue, 19 May 2026 22:24:33 -0400
Subject: [PATCH 1/2] update the yaml sanitizer + reparent some worn weapons

---
 Content.Server/_HL/Shipyard/ShipSaveYamlSanitizer.cs | 12 ++++++++++++
 .../Objects/Weapons/Guns/expedition_guns.yml         | 10 ++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Content.Server/_HL/Shipyard/ShipSaveYamlSanitizer.cs b/Content.Server/_HL/Shipyard/ShipSaveYamlSanitizer.cs
index 489473616a7..ff2d3e062b0 100644
--- a/Content.Server/_HL/Shipyard/ShipSaveYamlSanitizer.cs
+++ b/Content.Server/_HL/Shipyard/ShipSaveYamlSanitizer.cs
@@ -133,6 +133,18 @@ public static class ShipSaveYamlSanitizer
         "VendingMachineTankDispenserEVAPOI",
         "VendingMachineVendomatPOI",
         "VendingMachineYouToolPOI",
+        // Syndicate items
+        "ClothingOuterHardsuitSyndieCommander",
+        "ClothingOuterHardsuitJuggernaut",
+        "ClothingOuterArmorRaid",
+        "ClothingHeadHelmetRaid",
+        "WeaponLauncherChinaLake",
+        "WeaponLightMachineGunL6",
+        "BorgModuleL6C",
+        // ColSec items
+        "ClothingOuterHardsuitNfsdExperimental",
+        "WeaponLauncherRocket",
+        "WeaponLauncherRiotGun",
         // Everything else
         "ContainmentField",
         "PortalBlue",
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
index d8b00966f08..1038301d70c 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
@@ -414,25 +414,27 @@
 - type: entity
   parent:
   - BaseExpeditionWeaponTier5
-  - NFWeaponLauncherRocket
+  - WeaponLauncherRocket # HardLight: NFWeaponLauncherRocket<WeaponLauncherRocket
 #  categories: [ HideSpawnMenu ]
   id: NFWeaponLauncherRocketExpedition
+  name: worn RPG-7 # HardLight
 
 - type: entity
   parent:
   - BaseExpeditionWeaponTier5Syndicate
-  - NFWeaponLauncherChinaLake
+  - WeaponLauncherChinaLake # HardLight: NFWeaponLauncherChinaLake<WeaponLauncherChinaLake
 #  categories: [ HideSpawnMenu ]
   id: NFWeaponLauncherChinaLakeExpedition
+  name: worn china lake # HardLight
 
 # LMGs
 - type: entity
   parent:
   - BaseExpeditionWeaponTier5Syndicate
-  - NFWeaponLightMachineGunL6
+  - WeaponLightMachineGunL6 # HardLight: NFWeaponLightMachineGunL6<WeaponLightMachineGunL6
 #  categories: [ HideSpawnMenu ]
   id: NFWeaponLightMachineGunL6Expedition
-  name: worn L6
+  name: worn L6C ROW (762x39mm) # HardLight; worn L6<worn L6C ROW (762x39mm)
 
 # Energy
 - type: entity

From 2ba32286559774b4bb78a624e7fe97fbd3d32241 Mon Sep 17 00:00:00 2001
From: Livyathan <notlivyathan@gmail.com>
Date: Tue, 19 May 2026 22:27:49 -0400
Subject: [PATCH 2/2] wrong one

---
 .../_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
index 1038301d70c..ab4a413ebc9 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Guns/expedition_guns.yml
@@ -434,7 +434,7 @@
   - WeaponLightMachineGunL6 # HardLight: NFWeaponLightMachineGunL6<WeaponLightMachineGunL6
 #  categories: [ HideSpawnMenu ]
   id: NFWeaponLightMachineGunL6Expedition
-  name: worn L6C ROW (762x39mm) # HardLight; worn L6<worn L6C ROW (762x39mm)
+  name: worn L6 SAW (762x39mm) # HardLight; worn L6<worn L6 SAW (762x39mm)
 
 # Energy
 - type: entity