diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e4f70afc07..69d74f956c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -841,6 +841,20 @@ - SpeedLoaderSpecialEmpty - SpeedLoaderSpecialPractice - MagazinePistolSpecial + - MagazineRifleRubber + - MagazinePistolRubber + - MagazineLightRifleRubber + - SpeedLoaderMagnumRubber + - SpeedLoaderSpecialRubber + - MagazineBoxPistolRubber + - MagazineBoxMagnumRubber + - MagazineBoxLightRifleRubber + - MagazineBoxRifleRubber + - MagazineBoxSpecialRubber + - MagazineShotgunBeanbag + - BoxShellTranquilizer + - BoxBeanbag + - WeaponDisabler # End DeltaV additions dynamicRecipes: - EncryptionKeySyndie # Nyano diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index a768ac4563..a8192a0284 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -34,32 +34,21 @@ 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: - - MagazineShotgunBeanbag - - BoxShellTranquilizer - - BoxBeanbag - - WeaponDisabler - # DeltaV - rubber ammo which upstream removed - - MagazineRifleRubber - - MagazinePistolRubber - - MagazineLightRifleRubber - - SpeedLoaderMagnumRubber - - SpeedLoaderSpecialRubber - - MagazineBoxPistolRubber - - MagazineBoxMagnumRubber - - MagazineBoxLightRifleRubber - - MagazineBoxRifleRubber - - MagazineBoxSpecialRubber - # End of modified code +# DeltaV: made nonlethals roundstart, see #2758 +#- 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: +# - MagazineShotgunBeanbag +# - BoxShellTranquilizer +# - BoxBeanbag +# - WeaponDisabler - type: technology id: UraniumMunitions