Revert "Remove Rubber Rounds, Give Security Disablers (#26470)"
This reverts commit 9594afa400.
# Conflicts:
# Resources/Prototypes/Catalog/Fills/Lockers/security.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
# Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
# Resources/Prototypes/Roles/Jobs/Security/warden.yml
This commit is contained in:
@@ -176,6 +176,7 @@
|
|||||||
contents:
|
contents:
|
||||||
- id: WeaponRevolverInspector
|
- id: WeaponRevolverInspector
|
||||||
- id: SpeedLoaderMagnum
|
- id: SpeedLoaderMagnum
|
||||||
|
- id: SpeedLoaderMagnumRubber
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: ClothingBeltChefFilled
|
id: ClothingBeltChefFilled
|
||||||
|
|||||||
@@ -689,7 +689,6 @@
|
|||||||
- ForensicPad
|
- ForensicPad
|
||||||
- RiotShield
|
- RiotShield
|
||||||
- ShellShotgun
|
- ShellShotgun
|
||||||
- ShellShotgunBeanbag
|
|
||||||
- ShellShotgunSlug
|
- ShellShotgunSlug
|
||||||
- ShellShotgunFlare
|
- ShellShotgunFlare
|
||||||
- ShellTranquilizer
|
- ShellTranquilizer
|
||||||
|
|||||||
@@ -314,6 +314,15 @@
|
|||||||
Steel: 300
|
Steel: 300
|
||||||
Plastic: 300
|
Plastic: 300
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
id: MagazineBoxPistolRubber
|
||||||
|
result: MagazineBoxPistolRubber
|
||||||
|
category: Ammo
|
||||||
|
completetime: 5
|
||||||
|
materials:
|
||||||
|
Steel: 350
|
||||||
|
Plastic: 300
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
id: MagazineBoxMagnum
|
id: MagazineBoxMagnum
|
||||||
result: MagazineBoxMagnum
|
result: MagazineBoxMagnum
|
||||||
@@ -331,6 +340,15 @@
|
|||||||
Steel: 500
|
Steel: 500
|
||||||
Plastic: 700
|
Plastic: 700
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
id: MagazineBoxMagnumRubber
|
||||||
|
result: MagazineBoxMagnumRubber
|
||||||
|
category: Ammo
|
||||||
|
completetime: 5
|
||||||
|
materials:
|
||||||
|
Steel: 350
|
||||||
|
Plastic: 300
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
id: MagazineRifle
|
id: MagazineRifle
|
||||||
result: MagazineRifle
|
result: MagazineRifle
|
||||||
@@ -364,6 +382,15 @@
|
|||||||
Steel: 350
|
Steel: 350
|
||||||
Plastic: 550
|
Plastic: 550
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
id: MagazineBoxRifleRubber
|
||||||
|
result: MagazineBoxRifleRubber
|
||||||
|
category: Ammo
|
||||||
|
completetime: 5
|
||||||
|
materials:
|
||||||
|
Steel: 350
|
||||||
|
Plastic: 600
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
id: MagazineBoxLightRifle
|
id: MagazineBoxLightRifle
|
||||||
result: MagazineBoxLightRifle
|
result: MagazineBoxLightRifle
|
||||||
@@ -381,6 +408,15 @@
|
|||||||
Steel: 350
|
Steel: 350
|
||||||
Plastic: 550
|
Plastic: 550
|
||||||
|
|
||||||
|
- type: latheRecipe
|
||||||
|
id: MagazineBoxLightRifleRubber
|
||||||
|
result: MagazineBoxLightRifleRubber
|
||||||
|
category: Ammo
|
||||||
|
completetime: 5
|
||||||
|
materials:
|
||||||
|
Steel: 350
|
||||||
|
Plastic: 600
|
||||||
|
|
||||||
- type: latheRecipe
|
- type: latheRecipe
|
||||||
id: SpeedLoaderMagnum
|
id: SpeedLoaderMagnum
|
||||||
result: SpeedLoaderMagnum
|
result: SpeedLoaderMagnum
|
||||||
|
|||||||
@@ -46,6 +46,26 @@
|
|||||||
recipeUnlocks:
|
recipeUnlocks:
|
||||||
- WeaponLaserCarbine
|
- 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
|
- type: technology
|
||||||
id: UraniumMunitions
|
id: UraniumMunitions
|
||||||
name: research-technology-uranium-munitions
|
name: research-technology-uranium-munitions
|
||||||
|
|||||||
Reference in New Issue
Block a user