Remove Rubber Rounds, Give Security Disablers (#26470)

Remove Rubbers, give sec Disablers
2024-03-27 10:11:13 -05:00
parent cb8f145975
commit 9594afa400
9 changed files with 6 additions and 116 deletions
--- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml
@@ -174,7 +174,6 @@
    contents:
        - id: WeaponRevolverInspector
        - id: SpeedLoaderMagnum
-        - id: SpeedLoaderMagnumRubber

 - type: entity
  id: ClothingBeltChefFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -7,7 +7,6 @@
    contents:
      - id: FlashlightSeclite
      - id: WeaponDisabler
-        prob: 0.3
      - id: ClothingBeltSecurityFilled
      - id: Flash
      - id: ClothingEyesGlassesSunglasses
@@ -31,7 +30,6 @@
    contents:
      - id: FlashlightSeclite
      - id: WeaponDisabler
-        prob: 0.3
      - id: ClothingBeltSecurityFilled
      - id: Flash
      - id: ClothingEyesGlassesSunglasses
@@ -54,6 +52,7 @@
    contents:
      - id: FlashlightSeclite
        prob: 0.8
+      - id: WeaponDisabler
      - id: ClothingUniformJumpsuitSecGrey
        prob: 0.3
      - id: ClothingHeadHelmetBasic
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -177,15 +177,7 @@
       - MagazineBoxLightRifle
       - GrenadeBlast
    emagDynamicRecipes:
-      - CartridgePistolRubber
-      - CartridgeMagnumRubber
      - ShellShotgunBeanbag
-      - CartridgeRifleRubber
-      - CartridgeLightRifleRubber
-      - MagazineBoxPistolRubber
-      - MagazineBoxMagnumRubber
-      - MagazineBoxRifleRubber
-      - MagazineBoxLightRifleRubber
      - ShellShotgunIncendiary
      - CartridgePistolIncendiary
      - CartridgeMagnumIncendiary
@@ -657,6 +649,7 @@
      - ForensicPad
      - RiotShield
      - ShellShotgun
+      - ShellShotgunBeanbag
      - ShellShotgunSlug
      - ShellShotgunFlare
      - ShellTranquilizer
@@ -689,10 +682,6 @@
      - CartridgeMagnumUranium
      - CartridgePistolUranium
      - CartridgeRifleUranium
-      - CartridgeLightRifleRubber
-      - CartridgeMagnumRubber
-      - CartridgePistolRubber
-      - CartridgeRifleRubber
      - ClothingEyesGlassesSecurity
      - ExplosivePayload
      - FlashPayload
@@ -705,14 +694,9 @@
      - MagazineBoxMagnumUranium
      - MagazineBoxPistolUranium
      - MagazineBoxRifleUranium
-      - MagazineBoxLightRifleRubber
-      - MagazineBoxMagnumRubber
-      - MagazineBoxPistolRubber
-      - MagazineBoxRifleRubber
      - MagazineGrenadeEmpty
      - GrenadeEMP
      - GrenadeFlash
-      - ShellShotgunBeanbag
      - ShellShotgunIncendiary
      - ShellShotgunUranium
      - Signaller
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -146,24 +146,6 @@
    Plastic: 15
    Steel: 10

- type: latheRecipe
-  id: CartridgePistolRubber
-  result: CartridgePistolRubber
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 5
-    Steel: 5
-
- type: latheRecipe
-  id: CartridgeMagnumRubber
-  result: CartridgeMagnumRubber
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 5
-    Steel: 5
-
 - type: latheRecipe
  id: CartridgeRifle
  result: CartridgeRifle
@@ -172,24 +154,6 @@
  materials:
    Steel: 15

- type: latheRecipe
-  id: CartridgeLightRifleRubber
-  result: CartridgeLightRifleRubber
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 10
-    Steel: 5
-
- type: latheRecipe
-  id: CartridgeRifleRubber
-  result: CartridgeRifleRubber
-  category: Ammo
-  completetime: 2
-  materials:
-    Plastic: 10
-    Steel: 5
-
 - type: latheRecipe
  id: CartridgePistol
  result: CartridgePistol
@@ -306,15 +270,6 @@
  materials:
    Steel: 650

- type: latheRecipe
-  id: MagazineBoxPistolRubber
-  result: MagazineBoxPistolRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 300
-
 - type: latheRecipe
  id: MagazineBoxMagnum
  result: MagazineBoxMagnum
@@ -323,15 +278,6 @@
  materials:
    Steel: 1250

- type: latheRecipe
-  id: MagazineBoxMagnumRubber
-  result: MagazineBoxMagnumRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 300
-
 - type: latheRecipe
  id: MagazineRifle
  result: MagazineRifle
@@ -356,15 +302,6 @@
  materials:
    Steel: 950

- type: latheRecipe
-  id: MagazineBoxRifleRubber
-  result: MagazineBoxRifleRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 600
-
 - type: latheRecipe
  id: MagazineBoxLightRifle
  result: MagazineBoxLightRifle
@@ -373,15 +310,6 @@
  materials:
    Steel: 1800

- type: latheRecipe
-  id: MagazineBoxLightRifleRubber
-  result: MagazineBoxLightRifleRubber
-  category: Ammo
-  completetime: 5
-  materials:
-    Steel: 350
-    Plastic: 600
-
 - type: latheRecipe
  id: SpeedLoaderMagnum
  result: SpeedLoaderMagnum
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -46,26 +46,6 @@
  recipeUnlocks:
  - WeaponLaserCarbine

- type: technology
-  id: NonlethalAmmunition
-  name: research-technology-nonlethal-ammunition
-  icon:
-    sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi
-    state: beanbag
-  discipline: Arsenal
-  tier: 1
-  cost: 5000
-  recipeUnlocks:
-  - ShellShotgunBeanbag
-  - CartridgePistolRubber
-  - CartridgeMagnumRubber
-  - CartridgeLightRifleRubber
-  - CartridgeRifleRubber
-  - MagazineBoxPistolRubber
-  - MagazineBoxMagnumRubber
-  - MagazineBoxLightRifleRubber
-  - MagazineBoxRifleRubber
-
 - type: technology
  id: UraniumMunitions
  name: research-technology-uranium-munitions
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -52,7 +52,7 @@
    gloves: ClothingHandsGlovesCombat
    ears: ClothingHeadsetAltSecurity
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
  innerClothingSkirt: ClothingUniformJumpskirtHoS
  satchel: ClothingBackpackSatchelHOSFilled
  duffelbag: ClothingBackpackDuffelHOSFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
@@ -35,7 +35,7 @@
    id: SecurityCadetPDA
    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
    pocket2: BookSecurity
  innerClothingSkirt: ClothingUniformJumpskirtColorRed
  satchel: ClothingBackpackSatchelSecurityFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
@@ -34,7 +34,7 @@
    id: SecurityPDA
    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
  innerClothingSkirt: ClothingUniformJumpskirtSec
  satchel: ClothingBackpackSatchelSecurityFilled
  duffelbag: ClothingBackpackDuffelSecurityFilled
--- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml
@@ -36,7 +36,7 @@
    id: WardenPDA
    ears: ClothingHeadsetSecurity
    belt: ClothingBeltSecurityFilled
-    pocket1: WeaponPistolMk58Nonlethal
+    pocket1: WeaponPistolMk58
  innerClothingSkirt: ClothingUniformJumpskirtWarden
  satchel: ClothingBackpackSatchelSecurityFilled
  duffelbag: ClothingBackpackDuffelSecurityFilled