A new security SMG, maybe (#5212)

* still very wip sprite wise but functions

* idunno if it worked

* testing suitstorage

* ok getting there,

* ok maybe ready now :3

* oopsie daisy,

* Revert "oopsie daisy,"

This reverts commit d9bfdff6c2.

* okay please play nice github,

* im just a dog smh

* changes done ^^

* figured should at least make it consistent with other safe ids

* added descriptions to em all :3

* Partial migration of removed content from upstream #34293. Moved files to DV namespace.

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>

Resources/Migrations/migration.yml

@@ -549,11 +549,11 @@ WeaponSubMachineGunVectorRubber: null
 PosterContrabandLustyExomorph: PosterContrabandRealExomorph
 PosterContrabandBustyBackdoorExoBabes6: PosterContrabandRouny
 
-# 2025-02-20
-MagazineBoxAntiMaterielBig: null
-MagazineBoxCaselessRifle10x24: null
-MagazineBoxCaselessRifleBig: null
-MagazinePistolHighCapacityRubber: null
+# 2025-02-20 # DeltaV - We still have these. Migrated to _DV namespace.
+#MagazineBoxAntiMaterielBig: null
+#MagazineBoxCaselessRifle10x24: null
+#MagazineBoxCaselessRifleBig: null
+#MagazinePistolHighCapacityRubber: null
 
 # 2025-03-18
 EpinephrineChemistryBottle: ChemistryBottleEpinephrine

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

@@ -25,26 +25,6 @@
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxAntiMateriel
-  id: MagazineBoxAntiMaterielBig
-  name: ammunition box (.60 anti-materiel)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 30
-    proto: CartridgeAntiMateriel
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxAntiMateriel
   id: MagazineBoxAntiMateriel

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -25,46 +25,6 @@
   - type: Appearance
 
 # Boxes
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifle10x24
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-10x24
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag10-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: mag10
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
-- type: entity
-  parent: BaseMagazineBoxCaselessRifle
-  id: MagazineBoxCaselessRifleBig
-  name: ammunition box (.25 caseless)
-  components:
-  - type: BallisticAmmoProvider
-    capacity: 200
-    proto: CartridgeCaselessRifle
-  - type: Sprite
-    layers:
-    - state: base-b
-      map: ["enum.GunVisualLayers.Base"]
-    - state: magb-1
-      map: ["enum.GunVisualLayers.Mag"]
-  - type: MagazineVisuals
-    magState: magb
-    steps: 4
-    zeroVisible: false
-  - type: Appearance
-
 - type: entity
   parent: BaseMagazineBoxCaselessRifle
   id: MagazineBoxCaselessRifle

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -45,7 +45,7 @@
     whitelist:
       tags:
         - CartridgePistol
-    capacity: 16
+    capacity: 20 # Delta-V, was 16
   - type: Item
     size: Small
   - type: ContainerContainer
@@ -247,6 +247,7 @@
 - type: entity
   id: MagazinePistolHighCapacityEmpty
   name: machine pistol magazine (.35 auto any)
+  description: 20-round double-stack single feed magazine for machine pistols. #Delta V
   suffix: empty
   parent: BaseMagazinePistolHighCapacity
   components:
@@ -268,6 +269,7 @@
 - type: entity
   id: MagazinePistolHighCapacity
   name: machine pistol magazine (.35 auto)
+  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold general-purpose kinetic ammunition. #Delta V
   parent: BaseMagazinePistolHighCapacity
   components:
   - type: BallisticAmmoProvider
@@ -292,6 +294,7 @@
 - type: entity
   id: MagazinePistolHighCapacityPractice
   name: machine pistol magazine (.35 auto practice)
+  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold non-harmful chalk ammunition. #Delta V
   parent: BaseMagazinePistolHighCapacity
   components:
   - type: BallisticAmmoProvider
@@ -313,20 +316,6 @@
       - state: inhand-right-stripe
         color: "#ea5800"
 
-- type: entity
-  id: MagazinePistolHighCapacityRubber
-  name: machine pistol magazine (.35 auto rubber)
-  parent: BaseMagazinePistolHighCapacity
-  components:
-  - type: BallisticAmmoProvider
-    proto: CartridgePistolRubber # DeltaV: upstream still has this for some reason but not using rubber
-  - type: Sprite
-    layers:
-    - state: rubber
-      map: ["enum.GunVisualLayers.Base"]
-    - state: mag-1
-      map: ["enum.GunVisualLayers.Mag"]
-
 - type: entity
   id: MagazinePistolSubMachineGun
   name: SMG magazine (.35 auto)
@@ -443,4 +432,3 @@
       - state: inhand-left-mag
       right:
       - state: inhand-right-mag
-

Resources/Prototypes/_DV/Catalog/Fills/Lockers/security.yml

@@ -147,3 +147,15 @@
       amount: 2
     - id: BoxShotgunPractice
       amount: 2
+
+- type: entity
+  parent: GunSafeBaseSecure
+  id: GunSafeSubMachineGunPatos
+  name: patos safe
+  components:
+  - type: StorageFill
+    contents:
+    - id: WeaponSubMachineGunPatos
+      amount: 2
+    - id: MagazinePistolHighCapacity
+      amount: 4

Resources/Prototypes/_DV/Entities/Markers/Spawners/Random/safes.yml

@@ -81,3 +81,14 @@
         children:
         - id: SalvageGunSafeRevolverSnub
         - id: SalvageGunSafeVulcan
+
+- type: entity
+  parent: BaseGunSafeSpawner
+  id: SubMachineGunSafeSpawner
+  suffix: SubMachineGun
+  components:
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: GunSafeSubMachineGunDrozd
+      - id: GunSafeSubMachineGunPatos

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/antimateriel.yml

@@ -1,3 +1,23 @@
+- type: entity
+  parent: BaseMagazineBoxAntiMateriel
+  id: MagazineBoxAntiMaterielBig
+  name: ammunition box (.60 anti-materiel)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 30
+    proto: CartridgeAntiMateriel
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: magb
+    steps: 4
+    zeroVisible: false
+  - type: Appearance
+
 - type: entity
   parent: MagazineBoxAntiMateriel
   id: MagazineBoxLMGAntiMateriel

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml

@@ -0,0 +1,39 @@
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifle10x24
+  name: ammunition box (.25 caseless)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeCaselessRifle
+  - type: Sprite
+    layers:
+    - state: base-10x24
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag10-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: mag10
+    steps: 4
+    zeroVisible: false
+  - type: Appearance
+
+- type: entity
+  parent: BaseMagazineBoxCaselessRifle
+  id: MagazineBoxCaselessRifleBig
+  name: ammunition box (.25 caseless)
+  components:
+  - type: BallisticAmmoProvider
+    capacity: 200
+    proto: CartridgeCaselessRifle
+  - type: Sprite
+    layers:
+    - state: base-b
+      map: ["enum.GunVisualLayers.Base"]
+    - state: magb-1
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: MagazineVisuals
+    magState: magb
+    steps: 4
+    zeroVisible: false
+  - type: Appearance

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml

@@ -1,4 +1,48 @@
 # .35 auto
+- type: entity
+  id: MagazinePistolHighCapacityRubber
+  name: machine pistol magazine (.35 auto rubber)
+  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold less-lethal rubber ammunition. #Delta V
+  parent: BaseMagazinePistolHighCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolRubber
+  - type: Sprite
+    layers:
+    - state: rubber
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolHighCapacityIncendiary
+  name: machine pistol magazine (.35 auto incendiary)
+  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold self-igniting incendiary ammunition. #Delta V
+  parent: BaseMagazinePistolHighCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolIncendiary
+  - type: Sprite
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
+
+- type: entity
+  id: MagazinePistolHighCapacityUranium
+  name: machine pistol magazine (.35 auto uranium)
+  description: 20-round double-stack single feed magazine for machine pistols. Intended to hold exotic uranium-core ammunition. #Delta V
+  parent: BaseMagazinePistolHighCapacity
+  components:
+  - type: BallisticAmmoProvider
+    proto: CartridgePistolUranium
+  - type: Sprite
+    layers:
+    - state: uranium
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-1
+      map: ["enum.GunVisualLayers.Mag"]
 
 - type: entity
   parent: BaseMagazinePistol

Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml

@@ -48,3 +48,66 @@
     steps: 1
     zeroVisible: true
   - type: Appearance
+
+- type: entity
+  name: Patos
+  parent: BaseWeaponSubMachineGun
+  id: WeaponSubMachineGunPatos
+  description: A compact and lightweight personal defense weapon, with an aggressive compensator. Uses .35 auto ammo.
+  components:
+  - type: Sprite
+    sprite: _DV/Objects/Weapons/Guns/SMGs/patos.rsi
+    layers:
+    - state: base
+      map: ["enum.GunVisualLayers.Base"]
+    - state: mag-0
+      map: ["enum.GunVisualLayers.Mag"]
+  - type: Item
+    size: Normal
+    shape:
+    - 0,0,1,1
+  - type: Clothing
+    sprite: _DV/Objects/Weapons/Guns/SMGs/patos.rsi
+    slots:
+    - Back
+    - suitStorage
+  - type: Gun
+    minAngle: 4
+    maxAngle: 24
+    fireRate: 7
+    angleIncrease: 4.5
+    angleDecay: 24
+    selectedMode: FullAuto
+    availableModes:
+    - SemiAuto
+    - FullAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/smg.ogg
+    defaultDirection: 1, 0
+  - type: ChamberMagazineAmmoProvider
+    soundRack:
+      path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolHighCapacity
+        insertSound: /Audio/Weapons/Guns/MagIn/smg_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/smg_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+          - MagazinePistolHighCapacity
+        whitelistFailPopup: gun-magazine-whitelist-fail
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistol
+        priority: 1
+        whitelist:
+          tags:
+          - CartridgePistol
+  - type: MagazineVisuals
+    magState: mag
+    steps: 5
+    zeroVisible: true
+  - type: Appearance

Resources/Prototypes/_DV/Recipes/Lathes/Packs/security.yml

@@ -17,6 +17,7 @@
   recipes:
   - MagazineBoxSpecialPractice
   - SpeedLoaderSpecialPractice
+  - MagazinePistolHighCapacityPractice
 
 - type: latheRecipePack
   id: SecurityAmmoStaticDeltaV
@@ -29,6 +30,7 @@
   - BoxShellTranquilizer
   - MagazineShotgunBeanbag
   - MagazineLaser
+  - MagazinePistolHighCapacity
 
 - type: latheRecipePack
   id: SecurityShotgunDrumsStatic
@@ -50,6 +52,8 @@
   - MagazineBoxLightRifleRubber
   - MagazineBoxRifleRubber
   - MagazineBoxSpecialRubber
+  - MagazinePistolSubMachineGunRubber
+  - MagazinePistolHighCapacityRubber
 
 - type: latheRecipePack
   parent: SecurityDisablers
@@ -69,6 +73,8 @@
   - MagazineBoxSpecialHoly
   - MagazineBoxSpecialMindbreaker
   - GamblagatorCapacitor
+  - MagazinePistolHighCapacityUranium
+  - MagazinePistolHighCapacityIncendiary
 
 - type: latheRecipePack
   parent: SecurityHardsuits

Resources/Prototypes/_DV/Recipes/Lathes/security.yml

@@ -133,6 +133,22 @@
     Steel: 25
     Plastic: 500
 
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolSubMachineGunRubber
+  result: MagazinePistolSubMachineGunRubber
+  materials:
+    Steel: 25
+    Plastic: 360
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacityRubber
+  result: MagazinePistolHighCapacityRubber
+  materials:
+    Steel: 25
+    Plastic: 240
+
 - type: latheRecipe
   parent: BaseAmmoRecipe
   id: SpeedLoaderMagnumRubber
@@ -169,6 +185,40 @@
   materials:
     Plastic: 750
 
+
+# Machine pistol mags, aside from rubber
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacity
+  result: MagazinePistolHighCapacity
+  materials:
+    Steel: 210
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacityPractice
+  result: MagazinePistolHighCapacityPractice
+  materials:
+    Steel: 125
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacityIncendiary
+  result: MagazinePistolHighCapacityIncendiary
+  materials:
+    Steel: 25
+    Plastic: 225
+
+- type: latheRecipe
+  parent: BaseAmmoRecipe
+  id: MagazinePistolHighCapacityUranium
+  result: MagazinePistolHighCapacityUranium
+  materials:
+    Steel: 25
+    Plastic: 200
+    Uranium: 200
+
 # Armour vests
 
 - type: latheRecipe

Resources/Prototypes/_DV/Research/arsenal.yml

@@ -39,6 +39,7 @@
   - BoxShotgunUranium
   - SpeedLoaderSpecialUranium
   - MagazineBoxSpecialUranium
+  - MagazinePistolHighCapacityUranium
   # Incendiary
   - BoxShotgunIncendiary
   - MagazineRifleIncendiary
@@ -54,6 +55,7 @@
   - SpeedLoaderSpecialUranium
   - MagazineBoxSpecialIncendiary
   - MagazineBoxSpecialHoly
+  - MagazinePistolHighCapacityIncendiary
 
 - type: technology
   id: EnergyGuns

Resources/Textures/_DV/Objects/Weapons/Guns/SMGs/patos.rsi/meta.json

@@ -0,0 +1,51 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "sprites made by keke38",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "base"
+        },
+        {
+            "name": "mag-0"
+        },
+        {
+            "name": "mag-1"
+        },
+        {
+            "name": "mag-2"
+        },
+        {
+            "name": "mag-3"
+        },
+        {
+            "name": "mag-4"
+        },
+        {
+            "name": "bolt-open"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "equipped-BACKPACK",
+            "directions": 4
+        },
+        {
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
+        }
+    ]
+}