Remove non-lethal vector variant (#16076)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 47c77d6f772f8252fa4e0a17e2e137ef3fdc4b64..7974785e9be370722f3d2a3b659286fc1f2b6640 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -141,10 +141,6 @@
           whitelist:
             tags:
               - CartridgePistol
-    - type: ContainerContainer
-      containers:
-        gun_magazine: !type:ContainerSlot
-        gun_chamber: !type:ContainerSlot
     - type: MagazineVisuals
       magState: mag
       steps: 1
@@ -192,10 +188,6 @@
         whitelist:
           tags:
             - CartridgeMagnum
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot
   - type: MagazineVisuals
     magState: mag
     steps: 1
@@ -252,6 +244,32 @@
     zeroVisible: true
   - type: Appearance
 
+# Rubber
+- type: entity
+  name: Drozd
+  parent: WeaponSubMachineGunDrozd
+  id: WeaponSubMachineGunDrozdRubber
+  suffix: Non-Lethal
+  components:
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGunRubber
+          insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+          ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+          priority: 2
+          whitelist:
+            tags:
+              - MagazinePistolSubMachineGun
+        gun_chamber:
+          name: Chamber
+          startingItem: CartridgePistolRubber
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistol
+
 - type: entity
   name: Vector
   parent: WeaponSubMachineGunVector
@@ -277,7 +295,3 @@
         whitelist:
           tags:
             - CartridgeMagnum
-  - type: ContainerContainer
-    containers:
-      gun_magazine: !type:ContainerSlot
-      gun_chamber: !type:ContainerSlot

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 2e3b0bef124b8152acad5aeea4dbfb624be3fb02..ec7ece673014866172d868baa77b60b8aedafc8d 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -42,6 +42,7 @@ MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity
 MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice
 MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber
 WeaponSubMachineGunVector: WeaponSubMachineGunDrozd
+WeaponSubMachineGunVectorRubber: WeaponSubMachineGunDrozdRubber
 
 MagazineBoxAntiMaterial: MagazineBoxAntiMateriel
 CartridgeAntiMaterial: CartridgeAntiMateriel