[replacement] Drozd (#16071)

* Drozd

Drozd.

* migr

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index e46187a28f5f3a182456b26dfffe37b325e2edff..f3bd817926f5d1bcacf56e4e8142289a96f9ef5c 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -194,7 +194,7 @@
     contents:
       - id: WeaponSubMachineGunWt550
         amount: 2
-      - id: MagazineMagnumSubMachineGun
+      - id: MagazinePistolSubMachineGun
         amount: 4
 
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
index 7db5adbd269c5b624d5e22e0697a6a3a88b334c8..47c77d6f772f8252fa4e0a17e2e137ef3fdc4b64 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -101,10 +101,61 @@
     zeroVisible: true
   - type: Appearance
 
+- type: entity
+  name: Drozd
+  parent: BaseWeaponSubMachineGun
+  id: WeaponSubMachineGunDrozd
+  description: An excellent fully automatic Heavy SMG.
+  components:
+    - type: Sprite
+      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+      layers:
+        - state: base
+          map: ["enum.GunVisualLayers.Base"]
+        - state: mag-0
+          map: ["enum.GunVisualLayers.Mag"]
+    - type: Clothing
+      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
+    - type: Gun
+      fireRate: 6
+      selectedMode: FullAuto
+      soundGunshot:
+        path: /Audio/Weapons/Guns/Gunshots/atreides.ogg
+      availableModes:
+        - FullAuto
+    - type: ItemSlots
+      slots:
+        gun_magazine:
+          name: Magazine
+          startingItem: MagazinePistolSubMachineGun
+          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: CartridgePistol
+          priority: 1
+          whitelist:
+            tags:
+              - CartridgePistol
+    - type: ContainerContainer
+      containers:
+        gun_magazine: !type:ContainerSlot
+        gun_chamber: !type:ContainerSlot
+    - type: MagazineVisuals
+      magState: mag
+      steps: 1
+      zeroVisible: true
+    - type: Appearance
+
 - type: entity
   name: Vector
   parent: BaseWeaponSubMachineGun
   id: WeaponSubMachineGunVector
+  suffix: Deprecated use Drozd
   description: An excellent fully automatic Heavy SMG. Uses .45 magnum ammo.
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/LootTables/suspicion_loot_table.yml b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
index 1c034231bebeed5c0616de8ccb966fed24948e00..c2b00488a8beabfc810f374f0095e3b35cb2aad2 100644 (file)
--- a/Resources/Prototypes/LootTables/suspicion_loot_table.yml
+++ b/Resources/Prototypes/LootTables/suspicion_loot_table.yml
@@ -143,7 +143,7 @@
     maxAmount: 15
   - id: MagazinePistolHighCapacity
     maxAmount: 15
-  - id: MagazineMagnumSubMachineGun
+  - id: MagazinePistolSubMachineGun
     maxAmount: 15
   - id: CartridgeRocket
     maxAmount: 15

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png
new file mode 100644 (file)
index 0000000..b4b511c
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/base.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png
new file mode 100644 (file)
index 0000000..11c3bef
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..eec6989
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..535242e
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png
new file mode 100644 (file)
index 0000000..f909b59
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/mag-0.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
new file mode 100644 (file)
index 0000000..6feb9a4
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json
@@ -0,0 +1,31 @@
+{
+       "version": 1,
+       "license": "CC-BY-SA-3.0",
+       "copyright": "Taken/modified from cev-eris at https://github.com/discordia-space/CEV-Eris/raw/56cbafd6ad8c013ccd5472d6c4a0db790f7f872a/icons/obj/guns/projectile/drozd.dmi",
+       "size": {
+               "x": 32,
+               "y": 32
+       },
+       "states": [
+               {
+                       "name": "icon"
+               },
+               {
+                       "name": "base"
+               },
+               {
+                       "name": "mag-0"
+               },
+               {
+                       "name": "suppressor"
+               },
+               {
+                       "name": "inhand-left",
+                       "directions": 4
+               },
+               {
+                       "name": "inhand-right",
+                       "directions": 4
+               }
+       ]
+}
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png
new file mode 100644 (file)
index 0000000..b3af6f6
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/suppressor.png differ

diff --git a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
index 22283782c5b8dc47b144e28e724ac18957119af3..79ab6b4bd417f27d641b9758c87b2b9fe313b710 100644 (file)
--- a/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
+++ b/Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken/modified vgtation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides)",
+    "copyright": "Taken/modified vgstation at https://github.com/vgstation-coders/vgstation13/pull/20330/commits/1604c9cc61a48585e25b5f9eba3e179c06362372, backpack sprite by Peptide (copy of Atreides)",
     "size": {
         "x": 32,
         "y": 32

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 99e6b3bb6d7d1c9566640f06d7fd877782d39efd..cb543c920ddda04aef737ca2db0cbb898de671cf 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -9,3 +9,13 @@
 
 chem_dispenser: ChemDispenser
 
+# 2023-05-04
+BoxMagazineMagnumSubMachineGun: BoxMagazinePistolSubMachineGun
+BoxMagazineMagnumSubMachineGunPractice: BoxMagazinePistolSubMachineGunPractice
+BoxMagazineMagnumSubMachineGunRubber: BoxMagazinePistolSubMachineGunRubber
+
+MagazineMagnumSubMachineGun: MagazinePistolSubMachineGun
+MagazineMagnumSubMachineGunHighVelocity: MagazinePistolSubMachineGunHighVelocity
+MagazineMagnumSubMachineGunPractice: MagazinePistolSubMachineGunPractice
+MagazineMagnumSubMachineGunRubber: MagazinePistolSubMachineGunRubber
+WeaponSubMachineGunVector: WeaponSubMachineGunDrozd