From: Nairod <110078045+Nairodian@users.noreply.github.com> Date: Sun, 1 Oct 2023 20:18:05 +0000 (-0500) Subject: Practice Ammunition Tech (#20331) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=fcdedb377dbdd8d89a1a2c02b7c6426a057cb14a;p=space-station-14.git Practice Ammunition Tech (#20331) --- diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index cc2939a467..cb4f30de6a 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -36,6 +36,7 @@ research-technology-draconic-munitions = Draconic Munitions research-technology-explosive-technology = Explosive Technology research-technology-weaponized-laser-manipulation = Weaponized Laser Manipulation research-technology-nonlethal-ammunition = Nonlethal Ammunition +research-technology-practice-ammunition = Practice Ammunition research-technology-concentrated-laser-weaponry = Concentrated Laser Weaponry research-technology-wave-particle-harnessing = Wave Particle Harnessing research-technology-advanced-riot-control = Advanced Riot Control diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 42c97f4f3a..e86882028e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -537,38 +537,45 @@ - TargetSyndicate - TargetClown dynamicRecipes: - - CartridgePistolRubber + - CartridgeLightRifleIncendiary + - CartridgeMagnumIncendiary + - CartridgePistolIncendiary + - CartridgeRifleIncendiary + - CartridgeLightRifleRubber - CartridgeMagnumRubber - - ShellShotgunBeanbag + - CartridgePistolRubber - CartridgeRifleRubber - - CartridgeLightRifleRubber - - MagazineBoxPistolRubber + - ExplosivePayload + - FlashPayload + - HoloprojectorSecurity + - MagazineBoxLightRifleIncendiary + - MagazineBoxMagnumIncendiary + - MagazineBoxPistolIncendiary + - MagazineBoxRifleIncendiary + - MagazineBoxLightRiflePractice + - MagazineBoxMagnumPractice + - MagazineBoxPistolPractice + - MagazineBoxRiflePractice + - MagazineBoxLightRifleRubber - MagazineBoxMagnumRubber + - MagazineBoxPistolRubber - MagazineBoxRifleRubber - - MagazineBoxLightRifleRubber + - ShellShotgunBeanbag - ShellShotgunIncendiary - - CartridgePistolIncendiary - - CartridgeMagnumIncendiary - - CartridgeLightRifleIncendiary - - CartridgeRifleIncendiary - - MagazineBoxPistolIncendiary - - MagazineBoxMagnumIncendiary - - MagazineBoxLightRifleIncendiary - - MagazineBoxRifleIncendiary + - ShellShotgunPractice - Signaller - SignalTrigger - - VoiceTrigger + - TelescopicShield - TimerTrigger - Truncheon - - TelescopicShield - - HoloprojectorSecurity - - FlashPayload - - ExplosivePayload - - WeaponLaserCarbine + - VoiceTrigger - WeaponAdvancedLaser + - WeaponDisablerPractice - WeaponLaserCannon - - WeaponXrayCannon + - WeaponLaserCarbine + - WeaponLaserCarbinePractice - WeaponTaser + - WeaponXrayCannon - type: MaterialStorage whitelist: tags: diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 85a0e8008d..ee29b4261a 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -412,3 +412,56 @@ completetime: 5 materials: Plastic: 950 + +- type: latheRecipe + id: ShellShotgunPractice + result: ShellShotgunPractice + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: MagazineBoxPistolPractice + result: MagazineBoxPistolPractice + completetime: 5 + materials: + Plastic: 600 + +- type: latheRecipe + id: MagazineBoxMagnumPractice + result: MagazineBoxMagnumPractice + completetime: 5 + materials: + Plastic: 1200 + +- type: latheRecipe + id: MagazineBoxLightRiflePractice + result: MagazineBoxLightRiflePractice + completetime: 5 + materials: + Plastic: 1000 + +- type: latheRecipe + id: MagazineBoxRiflePractice + result: MagazineBoxRiflePractice + completetime: 5 + materials: + Plastic: 900 + +- type: latheRecipe + id: WeaponLaserCarbinePractice + result: WeaponLaserCarbinePractice + completetime: 6 + materials: + Steel: 1800 + Glass: 400 + Plastic: 250 + +- type: latheRecipe + id: WeaponDisablerPractice + result: WeaponDisablerPractice + completetime: 4 + materials: + Steel: 500 + Glass: 100 + Plastic: 200 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5d0d2cef84..cfd0faecd3 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -84,6 +84,24 @@ - MagazineBoxLightRifleRubber - MagazineBoxRifleRubber +- type: technology + id: PracticeAmmunition + name: research-technology-practice-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: practice + discipline: Arsenal + tier: 1 + cost: 2000 + recipeUnlocks: + - ShellShotgunPractice + - MagazineBoxPistolPractice + - MagazineBoxMagnumPractice + - MagazineBoxLightRiflePractice + - MagazineBoxRiflePractice + - WeaponLaserCarbinePractice + - WeaponDisablerPractice + # Tier 2 - type: technology