diff --git a/Resources/Prototypes/Backmen/Adminbuse/DED.yml b/Resources/Prototypes/Backmen/Adminbuse/DED.yml
index 00869d6b046..5bceb264389 100644
--- a/Resources/Prototypes/Backmen/Adminbuse/DED.yml
+++ b/Resources/Prototypes/Backmen/Adminbuse/DED.yml
@@ -124,7 +124,7 @@
     head: ClothingHeadHatBeretMobileTaskForce
     id: DedSquadronLeaderGavnaIDCard
     ears: ClothingHeadsetCentComCC
-    belt: WeaponRevolverMateba
+    belt: WeaponRevolverMatebaNew
     pocket1: EnergySwordDedSad
     pocket2: WeaponPulsePistol
 
@@ -143,7 +143,7 @@
     suitstorage: OxygenTankFilled
     id: DedSquadronGavnaIDCard
     ears: ClothingHeadsetCentComCC
-    belt: WeaponRevolverMateba
+    belt: WeaponRevolverMatebaNew
     pocket1: EnergySwordDedSad
     pocket2: WeaponPulsePistol
 
diff --git a/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml b/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml
index 1d2cfb6498e..99a8810726b 100644
--- a/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml
+++ b/Resources/Prototypes/Backmen/Adminbuse/centcomm_kid.yml
@@ -340,25 +340,14 @@
 
 
 - type: entity
-  name: автоматический Силовик
-  parent: WeaponShotgunEnforcer
+  parent: WeaponShotgun39
   id: WeaponShotgunEnforcerRXBZZ
-  description: Дробовик марки Frozen Star нового поколения. Использует патроны калибра .50 ружейный.
   components:
-  - type: BallisticAmmoProvider
-    whitelist:
-      tags:
-      - ShellShotgun
-    capacity: 10
-    proto: ShellShotgun
-    soundInsert:
-      path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg
-
 
 - type: entity
   name: Лектер
   suffix: Зажигательные
-  parent: WeaponRifleLecter
+  parent: WeaponRifleAR18
   id: WeaponRifleLecterFire
   description: Первоклассная армейская штурмовая винтовка. Использует патроны калибра .20 винтовочный.
   components:
diff --git a/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml b/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml
index a4947e5d5a8..4e07d8eb036 100644
--- a/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml
+++ b/Resources/Prototypes/Backmen/Adminbuse/ert_corvax.yml
@@ -108,10 +108,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -150,10 +150,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: trayScanner
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -202,10 +202,10 @@
         - id: BattleMedipen
         - id: BattleMedipen
         - id: WeaponDisabler
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -255,10 +255,10 @@
         - id: BoxFlare
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
-        - id: WeaponRifleLecter
+        - id: WeaponRifleAR18
         - id: MagazineRifle
         - id: MagazineRifle
         - id: MagazineRifle
@@ -297,7 +297,7 @@
       contents:
         - id: BattleMedipen
         - id: BattleMedipen
-        - id: WeaponPistolMk58
+        - id: WeaponPistolACP14
         - id: MagazinePistol
         - id: MagazinePistol
         - id: MagazinePistol
diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
index 23406d90911..1ddf1115a42 100644
--- a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
+++ b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml
@@ -267,7 +267,7 @@
   - type: MultiHandedItem
 
 - type: entity
-  id: BaseMagazineHeavyRifle
+  id: BaseMagazineHeavyRifle50
   name: "magazine (.50 BMG)"
   parent: BaseItem
   abstract: true
@@ -301,7 +301,7 @@
 - type: entity
   id: MagazineHeavyRifleMaDeuse
   name: "magazine (.50 BMG)"
-  parent: BaseMagazineHeavyRifle
+  parent: BaseMagazineHeavyRifle50
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeAntiMateriel
@@ -1787,7 +1787,7 @@
         priority: 2
         whitelist:
           tags:
-            - MagazineHeavyRifle
+            - MagazineHeavyRifle62
   - type: ContainerContainer
     containers:
       gun_magazine: !type:ContainerSlot
@@ -1801,7 +1801,7 @@
     wieldTime: 1.3
 
 - type: Tag
-  id: MagazineHeavyRifle
+  id: MagazineHeavyRifle62
 
 - type: entity
   id: MagazineHeavyRifleBR64
@@ -1811,7 +1811,7 @@
   components:
   - type: Tag
     tags:
-      - MagazineHeavyRifle
+      - MagazineHeavyRifle62
   - type: BallisticAmmoProvider
     mayTransfer: true
     capacity: 20
@@ -1853,7 +1853,7 @@
     proto: BulletRifle
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 20combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2073,7 +2073,7 @@
 - type: entity
   name: Mateba
   parent: BaseWeaponRevolver
-  id: WeaponRevolverMateba
+  id: WeaponRevolverMatebaNew
   suffix: Револьвер
   description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
   components:
@@ -2091,7 +2091,7 @@
 - type: entity
   name: Kardashev-Mosin
   parent: BaseWeaponSniper
-  id: WeaponSniperMosin
+  id: WeaponSniperMosinNew
   suffix: Винтовка
   description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
   components:
@@ -2277,7 +2277,7 @@
     deleteOnSpawn: true
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 45combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2496,7 +2496,7 @@
     proto: BulletRifle
   - type: Sprite
     netsync: false
-    sprite: Backmen/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi
+    sprite: Backmen/Objects/Weapons/Gunsx64/Ammunition/Casings/ammo_casing.rsi
     layers:
     - state: 30combat #corvax-resprite
       map: ["enum.AmmoVisualLayers.Base"]
@@ -2799,7 +2799,7 @@
 - type: entity
   id: MagazineHeavyRifleV41
   name: "magazine (.20 rifle)"
-  parent: BaseMagazineHeavyRifle
+  parent: BaseMagazineHeavyRifle50
   components:
   - type: BallisticAmmoProvider
     proto: CartridgeRifle
diff --git a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml
index 810b1ae332b..496a98a4064 100644
--- a/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml
+++ b/Resources/Prototypes/Backmen/Roles/Jobs/CentCom/intern.yml
@@ -54,7 +54,7 @@
   id: CentComInternGearArmed # POWER IN QUANTITY!
   equipment:
     jumpsuit: ClothingUniformJumpsuitCentcomIntern
-    back: WeaponSniperMosin
+    back: WeaponSniperMosinNew
     shoes: ClothingShoesColorBlack
     eyes: ClothingEyesGlassesSunglasses
     neck: CombatKnifeSpetsnaz
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
index 7b3130a63db..d44b02589f4 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -325,7 +325,7 @@
         - id: BoxSurvivalEngineering
         - id: WeaponPulseRifle
         - id: WeaponPulsePistol
-        - id: WeaponRevolverMateba
+        - id: WeaponRevolverMatebaNew
         - id: SpeedLoaderMagnumAP
         - id: SpeedLoaderMagnumAP
         - id: BoxFlashbang
diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
index a00f3bc4fc6..b8811f9212b 100644
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -293,7 +293,7 @@
   - type: StorageFill
     contents:
       - id: BoxSurvivalSyndicate
-      - id: WeaponPistolViper
+      - id: WeaponPistolHIB88M4
       - id: PinpointerNuclear
       - id: MicroBombImplanter
 
@@ -311,7 +311,7 @@
       - id: SawAdvanced
       - id: Cautery
       - id: CombatKnife
-      - id: WeaponPistolViper
+      - id: WeaponPistolHIB88M4
       - id: PinpointerNuclear
       - id: HandheldHealthAnalyzer
       - id: CombatMedipen
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
index 6482c5dd914..811f1f3ce8d 100644
--- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
+++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
@@ -120,7 +120,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolTopSubMachineGun
         amount: 3
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
index 868de3c8248..8fa732112ac 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml
@@ -4,9 +4,9 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponSubMachineGunWt550
+      - id: WeaponSubMachineGunP90
         amount: 2
-      - id: MagazinePistolSubMachineGunTopMounted
+      - id: MagazinePistolTopSubMachineGun
         amount: 4
 
 - type: entity
@@ -15,7 +15,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponShotgunEnforcer
+      - id: WeaponShotgun39
         amount: 2
       - id: BoxLethalshot
         amount: 3
@@ -44,7 +44,7 @@
   components:
   - type: StorageFill
     contents:
-      - id: WeaponLaserCarbine
+      - id: WeaponEarthGovLaserRifle
         amount: 3
 
 - type: entity
@@ -53,7 +53,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponPistolMk58
+    - id: WeaponPistolACP14
       amount: 2
     - id: MagazinePistol
       amount: 4
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
index feae7a8942f..25b5c73bcbd 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml
@@ -84,7 +84,7 @@
         prob: 0.0001
       - id: WeaponRevolverPython
         prob: 0.0001
-      - id: WeaponRevolverMateba
+      - id: WeaponRevolverMatebaNew
         prob: 0.0001
 
 - type: entity
diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
index c895e00d49c..0859984c92d 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml
@@ -42,7 +42,7 @@
         amount: 2
       - id: ClothingHeadHelmetRiot
         amount: 2
-      - id: WeaponShotgunEnforcerRubber
+      - id: WeaponShotgun39
         amount: 2
       - id: BoxBeanbag
         amount: 2
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
index ce12c0921a8..5e1935e65cb 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
@@ -171,7 +171,7 @@
         - id: BalloonSyn
           prob: 0.005
           orGroup: syndiemaintloot
-        - id: WeaponSniperMosin
+        - id: WeaponSniperMosinNew
           prob: 0.0010
           orGroup: syndiemaintloot
 
@@ -264,6 +264,6 @@
         - id: BalloonSyn
           prob: 0.005
           orGroup: syndiemaintloot
-        - id: WeaponSniperMosin
+        - id: WeaponSniperMosinNew
           prob: 0.0010
           orGroup: syndiemaintloot
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index dcf4fde4890..557f46951a9 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -196,7 +196,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponPistolMk58
+    - id: WeaponPistolACP14
       amount: 4
     - id: MagazinePistol
       amount: 8
@@ -208,7 +208,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponRifleLecter
+    - id: WeaponRifleAR18
       amount: 2
     - id: MagazineRifle
       amount: 4
@@ -220,7 +220,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponSubMachineGunDrozd
+    - id: WeaponSubMachineGunVectorSpecial
       amount: 2
     - id: MagazinePistolSubMachineGun
       amount: 4
@@ -232,7 +232,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponShotgunEnforcer
+    - id: WeaponShotgun39
       amount: 2
     - id: MagazineShotgun
       amount: 4
@@ -244,7 +244,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponShotgunKammerer
+    - id: WeaponShotguntrenchgun4034
       amount: 2
     - id: MagazineShotgun
       amount: 4
@@ -257,7 +257,7 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponSubMachineGunWt550
+    - id: WeaponSubMachineGunP90
       amount: 2
     - id: MagazinePistolSubMachineGun
       amount: 4
@@ -269,5 +269,5 @@
   components:
   - type: StorageFill
     contents:
-    - id: WeaponLaserCarbine
+    - id: WeaponEarthGovLaserRifle
       amount: 3
diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 357ea29400c..258231342a4 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -5,7 +5,7 @@
   id: UplinkPistolViper
   name: uplink-pistol-viper-name
   description: uplink-pistol-viper-desc
-  productEntity: WeaponPistolViper
+  productEntity: WeaponPistolHIB88M4
   cost:
     Telecrystal: 3
   categories:
@@ -37,7 +37,7 @@
   id: UplinkRifleMosin
   name: uplink-rifle-mosin-name
   description: uplink-rifle-mosin-desc
-  productEntity: WeaponSniperMosin
+  productEntity: WeaponSniperMosinNew
   cost:
     Telecrystal: 1
   categories:
@@ -678,49 +678,49 @@
   categories:
   - UplinkBundles
 
-- type: listing
-  id: UplinkC20RBundle
-  name: uplink-c20r-bundle-name
-  description: uplink-c20r-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
-  cost:
-    Telecrystal: 17
-  categories:
-  - UplinkBundles
-
-- type: listing
-  id: UplinkBulldogBundle
-  name: uplink-buldog-bundle-name
-  description: uplink-buldog-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
-  cost:
-    Telecrystal: 20
-  categories:
-  - UplinkBundles
-
-- type: listing
-  id: UplinkGrenadeLauncherBundle
-  name: uplink-grenade-launcher-bundle-name
-  description: uplink-grenade-launcher-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
-  cost:
-    Telecrystal: 25
-  categories:
-  - UplinkBundles
-
-- type: listing
-  id: UplinkL6SawBundle
-  name: uplink-l6-saw-bundle-name
-  description: uplink-l6-saw-bundle-desc
-  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
-  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
-  cost:
-    Telecrystal: 30
-  categories:
-  - UplinkBundles
+#- type: listing
+#  id: UplinkC20RBundle
+#  name: uplink-c20r-bundle-name
+#  description: uplink-c20r-bundle-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/SMGs/c20r.rsi, state: icon }
+#  productEntity: ClothingBackpackDuffelSyndicateFilledSMG
+#  cost:
+#    Telecrystal: 17
+#  categories:
+#  - UplinkBundles
+
+#- type: listing
+#  id: UplinkBulldogBundle
+#  name: uplink-buldog-bundle-name
+#  description: uplink-buldog-bundle-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi, state: icon }
+#  productEntity: ClothingBackpackDuffelSyndicateFilledShotgun
+#  cost:
+#    Telecrystal: 20
+#  categories:
+#  - UplinkBundles
+
+#- type: listing
+#  id: UplinkGrenadeLauncherBundle
+#  name: uplink-grenade-launcher-bundle-name
+#  description: uplink-grenade-launcher-bundle-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi, state: icon }
+#  productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
+#  cost:
+#    Telecrystal: 25
+#  categories:
+#  - UplinkBundles
+
+#- type: listing
+#  id: UplinkL6SawBundle
+#  name: uplink-l6-saw-bundle-name
+#  description: uplink-l6-saw-bundle-desc
+#  icon: { sprite: /Textures/Objects/Weapons/Guns/LMGs/l6.rsi, state: icon }
+#  productEntity: ClothingBackpackDuffelSyndicateFilledLMG
+#  cost:
+#    Telecrystal: 30
+#  categories:
+#  - UplinkBundles
 
 - type: listing
   id: UplinkZombieBundle
@@ -1407,3 +1407,336 @@
   conditions:
   - !type:ListingLimitedStockCondition
     stock: 1
+
+#no_mad shit
+
+- type: listing
+  id: UplinkP90Bundle
+  name: набор "P90"
+  description: Старый добрый п90 военного образца, стал символом специальных операций, в комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/p90.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledP90
+  cost:
+    Telecrystal: 18
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledP90
+  name: набор "P90"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponSubMachineGunP90
+        - id: MagazinePistolTopSubMachineGun
+        - id: MagazinePistolTopSubMachineGun
+
+- type: listing
+  id: UplinkAKMSBundle
+  name: набор "AKMS"
+  description: Символ войны, легендарное оружие зарекомендовавшие себя кака самое надежное оружие в истории. В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/akms/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledAKMS
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledAKMS
+  name: набор "AKMS"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponAKMSRifle
+        - id: MagazineLightRifle
+        - id: MagazineLightRifle
+
+- type: listing
+  id: UplinkV31Bundle
+  name: набор "V31"
+  description: Основная винтовка вооруженных сил Сынов Марса, имеет реактивные патроны, эффективен против всего. В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/v31/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledV31
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledV31
+  name: набор "V31"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleV31
+        - id: MagazineRifleRocket20
+        - id: MagazineRifleRocket20
+
+- type: listing
+  id: UplinkAKSUBundle
+  name: набор "AKSU"
+  description: Оружие ГРУ СССП, надежное, компактное, а самое главное что ничем не отличается от своего более старшего брата, поэтому его и любят отряды особого назначения. В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/aksu.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledAKSU
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledAKSU
+  name: набор "AKSU"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleAKSU
+        - id: MagazineLightRifle
+        - id: MagazineLightRifle
+
+- type: listing
+  id: UplinkStG44Bundle
+  name: набор "StG44"
+  description: Первая "Штурмовая Винтовка" в истории, в отличии от её образца 1944 года, имеет современные внутренности, из-за особенности конструкции имеет более высокую скорострельность. В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/stg44/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledStG44
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledStG44
+  name: набор "StG44"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleSTG44
+        - id: MagazineLightRifle
+        - id: MagazineLightRifle
+
+- type: listing
+  id: UplinkMP7Bundle
+  name: набор "MP7"
+  description: Запрещенная на территории ОПЗ оружие, из-за её специфического назначения и функционала, зарекомендовала себя как оружие ганстеров галактики. В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp7/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledMP7
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledMP7
+  name: набор "MP7"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponSubMachineGunMP7
+        - id: MagazinePistolSubMachineGun
+        - id: MagazinePistolSubMachineGun
+
+- type: listing
+  id: UplinkMP38Bundle
+  name: набор "MP38"
+  description: Дешевая, простая пушка с открытым затвором, не нуждается в обслуживании... Скорее всего это оружие с тех самых времен... В комплетке 3 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/mp38/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledMP38
+  cost:
+    Telecrystal: 14
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledMP38
+  name: набор "MP38"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponSubMachineGunMP38
+        - id: MagazinePistolBoxSubMachineGun
+        - id: MagazinePistolBoxSubMachineGun
+
+- type: listing
+  id: UplinkPPSH41Bundle
+  name: набор "PPSH41"
+  description: ПиПиСиЭйч 41, стандартный пистолет-пулемет на вооружении СССП, попал на черный рынок из-за частых "набегов" на склады СССП, явно не проданных местными командирами. В комплетке 2 магазина.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/SMGs/ppsh41/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledPPSH41
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledPPSH41
+  name: набор "PPSH41"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponSubMachineGunPPSH41
+        - id: MagazinePistolDrumSubMachineGun
+
+- type: listing
+  id: UplinkDEagle
+  name: Пустынный орёл
+  description: Большой, стильный, мощный дигл на базе .45 калибра, был создан для охоты на слонов, но чем СБешник не слон? Не так-ли?
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Pistols/deagle/big.rsi, state: icon }
+  productEntity: WeaponPistolDEagle
+  cost:
+    Telecrystal: 4
+  categories:
+  - UplinkWeapons
+
+- type: listing
+  id: UplinkMagazineMagnumPistol
+  name: магазин (.45 магнум)
+  description: Магазин для того самого пустынного орла.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Magazines/Magnum/magnum_pistol_mag.rsi, state: base }
+  productEntity: MagazineMagnumPistol
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkAmmo
+
+- type: listing
+  id: UplinkZauerBundle
+  name: набор "Zauer"
+  description: Простой и надеждный, штурмовой автоматически дробовик зауер. содержит барабан пуль и 3 барабана дроби.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Shotguns/zauer/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledZauer
+  cost:
+    Telecrystal: 20
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledZauer
+  name: набор "Zauer"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponShotgunZauer
+        - id: MagazineShotgun
+        - id: MagazineShotgun
+        - id: MagazineShotgunBeanbag
+
+- type: listing
+  id: UplinkGrenadeLauncher79Bundle
+  name: набор "GL-79"
+  description: Новенький, ручной гранатомет с барабанным системой, имеет 12 гранат в комплекте
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Launchers/gl-64/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledGL79
+  cost:
+    Telecrystal: 25
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledGL79
+  name: набор "GL-79"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponLauncherGL70
+        - id: GrenadeFrag
+          amount: 2
+        - id: GrenadeBlast
+          amount: 4
+
+- type: listing
+  id: UplinkRPDBundle
+  name: Набор "RPD"
+  description: Старый добрый ПК, который был успешно "украден" со старых складов СССП, отличная дакка, подходит для всех возрастов террористов. имеет 3 коробки патронов.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/LMGs/rpd/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledRPD
+  cost:
+    Telecrystal: 30
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledRPD
+  name: набор "RPD"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponLightMachineGunRPD
+        - id: MagazineLightRiflePkBox
+          amount: 2
+
+- type: listing
+  id: UplinkBR64Bundle
+  name: Набор "BR-64"
+  description: Специальная винтовка, не оставляющая следов, самое передовое вооружение, имеющая самое лучшее оборудование, не винтовка, а целая научная станция. Имеет 3 магазина .25 калибра.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Rifles/br-64/big.rsi, state: icon }
+  productEntity: ClothingBackpackDuffelSyndicateFilledBR64
+  cost:
+    Telecrystal: 17
+  categories:
+  - UplinkBundles
+
+- type: entity
+  parent: ClothingBackpackDuffelSyndicate
+  id: ClothingBackpackDuffelSyndicateFilledBR64
+  name: набор "BR-64"
+  components:
+    - type: StorageFill
+      contents:
+        - id: WeaponRifleBR64
+        - id: MagazineCaselessRifleShort
+          amount: 2
+
+#- type: listing
+#  id: UplinkFlamethrowerBundle
+#  name: набор "Огнемет М6"
+#  description: Огнемет имеющий шланг под специальный резервуар с огненой смесью, которая способна гореть даже в полном вакууме! Имеет в наборе 1 powerpack.
+#  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Flamethrowers/M6/big.rsi, state: icon }
+#  productEntity: ClothingBackpackDuffelSyndicateFilledflamethrower
+#  cost:
+#    Telecrystal: 12
+#  categories:
+#  - UplinkBundles
+
+#- type: entity
+#  parent: ClothingBackpackDuffelSyndicate
+#  id: ClothingBackpackDuffelSyndicateFilledflamethrower
+#  name: набор "Огнемет М6"
+#  components:
+#    - type: StorageFill
+#      contents:
+#        - id: WeaponflamethrowerSG
+#        - id: PowerpackFlame
+
+- type: listing
+  id: UplinkFlamethrower
+  name: Огнемет М6
+  description: Огнемет с небольшой специальным портом под маленькие баллоны с огненой смесью, которая способна гореть даже в полном вакууме!
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Flamethrowers/M6/big.rsi, state: icon }
+  productEntity: FirethrowerGun
+  cost:
+    Telecrystal: 5
+  categories:
+  - UplinkWeapons
+
+- type: listing
+  id: UplinkFuelTankFirethrower
+  name: Топливный бак
+  description: Топливный бак для огнемёта.
+  icon: { sprite: Backmen/Objects/Weapons/Gunsx64/Flamethrowers/tank.rsi, state: base }
+  productEntity: FuelTankFirethrower
+  cost:
+    Telecrystal: 1
+  categories:
+  - UplinkAmmo
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
index dc920caec04..e1f79e1889d 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -98,6 +98,7 @@
   parent: BaseWeaponBattery
   id: WeaponLaserCarbine
   description: Favoured by Nanotrasen Security for being cheap and easy to use.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
@@ -219,6 +220,7 @@
   parent: BaseWeaponBattery
   id: WeaponLaserCannon
   description: A heavy duty, high powered laser weapon.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
@@ -243,6 +245,7 @@
   parent: BaseWeaponBattery
   id: WeaponXrayCannon
   description: An experimental weapon that uses concentrated x-ray energy against its target.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Battery/xray.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
index 371e89d4cfc..032f93d27c2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -25,6 +25,7 @@
   parent: BaseWeaponLauncher
   id: WeaponLauncherChinaLake
   description: PLOOP
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
index c523fd27979..54c402084ac 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -92,6 +92,7 @@
   parent: BaseWeaponRevolver
   id: WeaponRevolverMateba
   description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index bc3b65ff3a0..ddfa4f1c76c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -55,6 +55,7 @@
   parent: BaseWeaponRifle
   id: WeaponRifleAk
   description: An iconic weapon of war. Uses .30 rifle ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Rifles/ak.rsi
@@ -103,6 +104,7 @@
   parent: BaseWeaponRifle
   id: WeaponRifleM90GrenadeLauncher
   description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
@@ -146,6 +148,7 @@
   parent: BaseWeaponRifle
   id: WeaponRifleLecter
   description: A high end military grade assault rifle. Uses .20 rifle ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index fbf56ec9e7a..eb3f042f9f2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -60,6 +60,7 @@
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunAtreides
   description: Pla-ket-ket-ket-ket! Uses .35 auto ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
@@ -83,6 +84,7 @@
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunC20r
   description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
@@ -109,6 +111,7 @@
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunDrozd
   description: An excellent fully automatic Heavy SMG.
+  noSpawn: true
   components:
     - type: Sprite
       sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
@@ -156,6 +159,7 @@
   id: WeaponSubMachineGunVector
   suffix: Deprecated use Drozd
   description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/SMGs/vector.rsi
@@ -202,6 +206,7 @@
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunWt550
   description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
@@ -254,6 +259,7 @@
   name: Drozd
   parent: WeaponSubMachineGunDrozd
   id: WeaponSubMachineGunDrozdRubber
+  noSpawn: true
   suffix: Non-Lethal
   components:
     - type: ItemSlots
@@ -280,6 +286,7 @@
   parent: WeaponSubMachineGunVector
   id: WeaponSubMachineGunVectorRubber
   description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
+  noSpawn: true
   suffix: Non-Lethal
   components:
   - type: ItemSlots
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
index 5393de1e8b6..21da1273b63 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -49,6 +49,7 @@
   parent: BaseItem
   id: WeaponShotgunBulldog
   description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
@@ -131,6 +132,7 @@
   parent: BaseWeaponShotgun
   id: WeaponShotgunEnforcer
   description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Shotguns/enforcer.rsi
@@ -146,6 +148,7 @@
   parent: BaseWeaponShotgun
   id: WeaponShotgunEnforcerRubber
   description: A next-generation Frozen Star shotgun. Uses .50 shotgun shells.
+  noSpawn: true
   suffix: Non-Lethal
   components:
   - type: Sprite
@@ -162,6 +165,7 @@
   name: Kammerer
   parent: BaseWeaponShotgun
   id: WeaponShotgunKammerer
+  noSpawn: true
   description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells.
   components:
   - type: Sprite
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
index ccccb633f69..a2b8ac321f2 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -42,6 +42,7 @@
   parent: BaseWeaponSniper
   id: WeaponSniperMosin
   description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo.
+  noSpawn: true
   components:
   - type: Sprite
     sprite: Objects/Weapons/Guns/Snipers/bolt_gun_wood.rsi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 0d86edb060b..4f7a015115c 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -539,7 +539,7 @@
       - ShellTranquilizer
       - MagazinePistol
       - MagazinePistolSubMachineGun
-      - MagazinePistolSubMachineGunTopMounted
+      - MagazinePistolTopSubMachineGun
       - MagazineRifle
       - MagazineLightRifle
       - MagazineBoxPistol
diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index b4a75f01ddd..b00416f3495 100644
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -30,7 +30,7 @@
 
 - type: latheRecipe
   id: WeaponLaserCarbine
-  result: WeaponLaserCarbine
+  result: WeaponEarthGovLaserRifle
   completetime: 8
   materials:
     Steel: 2000
@@ -48,7 +48,7 @@
 
 - type: latheRecipe
   id: WeaponLaserCannon
-  result: WeaponLaserCannon
+  result: WeaponEarthGovLaserSniper
   completetime: 5
   materials:
     Steel: 1250
@@ -57,7 +57,7 @@
 
 - type: latheRecipe
   id: WeaponXrayCannon
-  result: WeaponXrayCannon
+  result: WeaponEarthGovXRay
   completetime: 5
   materials:
     Steel: 1500
@@ -264,7 +264,7 @@
 
 - type: latheRecipe
   id: MagazinePistolSubMachineGunTopMounted
-  result: MagazinePistolSubMachineGunTopMounted
+  result: MagazinePistolTopSubMachineGun
   completetime: 5
   materials:
     Steel: 300
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
index 2be50b2e4b4..8adfdfccba7 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml
@@ -25,7 +25,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -42,7 +42,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -138,7 +138,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
     pocket2: FlashlightSeclite
 
 - type: startingGear
@@ -155,7 +155,7 @@
     id: ERTLeaderPDA
     ears: ClothingHeadsetAltCentCom
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
     pocket2: FlashlightSeclite
 
 - type: startingGear
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
index 9fff062a1fb..bf9d0b5c725 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -58,7 +58,7 @@
     gloves: ClothingHandsGlovesCombat
     ears: ClothingHeadsetAltSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
     pocket2: Eftpos
   innerClothingSkirt: ClothingUniformJumpskirtHoS
   satchel: ClothingBackpackSatchelHOSFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
index 4234a77933e..e641ff2767e 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -37,7 +37,7 @@
     outerClothing: ClothingOuterArmorBasic
     id: SecurityCadetPDA
     ears: ClothingHeadsetSecurity
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
   innerClothingSkirt: ClothingUniformJumpskirtSecGrey # Corvax-Resprite
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
index cbb93465ec9..67d17eb67da 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -39,7 +39,7 @@
     id: SecurityPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
   innerClothingSkirt: ClothingUniformJumpskirtSec
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
index 7dfb059f817..b4080f6d44a 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
@@ -48,7 +48,7 @@
     id: SeniorOfficerPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
   innerClothingSkirt: ClothingUniformJumpskirtSeniorOfficer
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
index 22864fa0942..f3e60db1aff 100644
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -41,7 +41,7 @@
     id: WardenPDA
     ears: ClothingHeadsetSecurity
     belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolG22
   innerClothingSkirt: ClothingUniformJumpskirtWarden
   satchel: ClothingBackpackSatchelSecurityFilled
   duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/migration.yml b/Resources/migration.yml
index a712b1cd408..32962981bdb 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -206,3 +206,6 @@ WeaponSubMachineGunWt550: WeaponSubMachineGunP90
 MagazinePistolSubMachineGunTopMounted: MagazinePistolTopSubMachineGun
 WeaponShotgunKammerer: WeaponShotguntrenchgun4034
 WeaponSubMachineGunC20r: WeaponSubMachineGunMP7
+WeaponRevolverMateba: WeaponRevolverMatebaNew
+WeaponSniperMosin: WeaponSniperMosinNew
+WeaponShotgunBulldog: WeaponShotgunZauer