move revolver to detective inventory (#19246)

2023-08-24 23:36:44 -04:00
parent a476d7925a
commit 2bc0e39c97
6 changed files with 52 additions and 9 deletions
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -29,6 +29,18 @@
      - id: Flash
      - id: MagazinePistol
      
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSecurity
+  id: ClothingBackpackSecurityFilledDetective
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackMedical
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -28,6 +28,18 @@
      - id: Flash
      - id: MagazinePistol
      
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackDuffelSecurity
+  id: ClothingBackpackDuffelSecurityFilledDetective
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackDuffelBrigmedic
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -28,6 +28,18 @@
      - id: Flash
      - id: MagazinePistol
      
+- type: entity
+  noSpawn: true
+  parent: ClothingBackpackSatchelSecurity
+  id: ClothingBackpackSatchelSecurityFilledDetective
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSecurity
+      - id: Flash
+      - id: ForensicPad
+      - id: ForensicScanner
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSatchelBrigmedic
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -159,3 +159,14 @@
    - id: WeaponWandFireball
    - id: WeaponWandDeath
    - id: WeaponWandPolymorphDoor
+
+- type: entity
+  id: ClothingBeltHolsterFilled
+  parent: ClothingBeltHolster
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+        - id: WeaponRevolverInspector
+        - id: SpeedLoaderMagnum
+        - id: SpeedLoaderMagnumRubber
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -124,9 +124,7 @@
      - id: FlashlightSeclite
      - id: ForensicScanner
      - id: BoxForensicPad
-      - id: WeaponRevolverInspector
      - id: DrinkDetFlask
-      - id: SpeedLoaderMagnum
      - id: ClothingHandsGlovesForensic

 - type: entity
--- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml
@@ -22,16 +22,14 @@
  id: DetectiveGear
  equipment:
    jumpsuit: ClothingUniformJumpsuitDetective
-    back: ClothingBackpackSecurityFilled
+    back: ClothingBackpackSecurityFilledDetective
    shoes: ClothingShoesBootsCombatFilled
    eyes: ClothingEyesGlassesSunglasses
    head: ClothingHeadHatFedoraBrown
    outerClothing: ClothingOuterVestDetective
    id: DetectivePDA
    ears: ClothingHeadsetSecurity
-    pocket1: ForensicPad
-    pocket2: ForensicScanner
-    belt: ClothingBeltHolster
-  innerclothingskirt: ClothingUniformJumpskirtDetective
-  satchel: ClothingBackpackSatchelSecurityFilled
-  duffelbag: ClothingBackpackDuffelSecurityFilled
+    belt: ClothingBeltHolsterFilled
+    innerclothingskirt: ClothingUniformJumpskirtDetective
+    satchel: ClothingBackpackSatchelSecurityFilledDetective
+    duffelbag: ClothingBackpackDuffelSecurityFilledDetective