Added rubber versions to SLP57 and Pollock and exchanging them with t…

…he loadouts to reflect how it was prior to sec sidearm loadouts (Revolvers unchanged)
DeltaV-Station · Jan 8, 2025 · 75428f6 · 75428f6
1 parent 4fdafdc
commit 75428f6
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 3 deletions.
diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -212,3 +212,51 @@
   - type: GuideHelp
     guides:
     - Cargo
+
+- type: entity
+  id: WeaponPistolPollockNonlethal
+  parent: WeaponPistolPollock
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
+
+- type: entity
+  id: WeaponPistolSLP57Nonlethal
+  parent: WeaponPistolSLP57
+  suffix: Non-lethal
+  components:
+  - type: ItemSlots
+    slots:
+      gun_magazine:
+        name: Magazine
+        startingItem: MagazinePistolRubber
+        insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg
+        ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - MagazinePistol
+      gun_chamber:
+        name: Chamber
+        startingItem: CartridgePistolRubber
+        priority: 1
+        whitelist:
+          tags:
+            - CartridgePistol
diff --git a/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/_DV/Loadouts/Jobs/Security/security_officer.yml
@@ -1,17 +1,17 @@
 - type: loadout
   id: SecurityFirearmWeaponPistolPollock
   equipment:
-    pocket1: WeaponPistolPollock
+    pocket1: WeaponPistolPollockNonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponPistolSLP57
   equipment:
-    pocket1: WeaponPistolSLP57
+    pocket1: WeaponPistolSLP57Nonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponPistolMk58
   equipment:
-    pocket1: WeaponPistolMk58
+    pocket1: WeaponPistolMk58Nonlethal
 
 - type: loadout
   id: SecurityFirearmWeaponDisabler