diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml index fc506ec594a..c71a58a82b1 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml @@ -102,6 +102,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazineMagnumIncendiary + name: pistol magazine (.45 magnum incendiary) + parent: BaseMagazineMagnum + components: + - type: BallisticAmmoProvider + proto: CartridgeMagnumIncendiary + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazineMagnumUranium name: pistol magazine (.45 magnum uranium) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index c57a8adaa5f..a74d259ce82 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -330,6 +330,20 @@ - state: mag-1 map: ["enum.GunVisualLayers.Mag"] +- type: entity + id: MagazinePistolSubMachineGunIncendiary + name: SMG magazine (.35 auto incendiary) + parent: BaseMagazinePistolSubMachineGun + components: + - type: BallisticAmmoProvider + proto: CartridgePistolIncendiary + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: entity id: MagazinePistolSubMachineGunUranium name: SMG magazine (.35 auto uranium) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index adf6bd94aa8..850b2c0d74f 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -805,6 +805,8 @@ - MagazinePistolSubMachineGunEmpty - MagazinePistolSubMachineGunTopMounted - MagazinePistolSubMachineGunTopMountedEmpty + - MagazineMagnum + - MagazineMagnumEmpty - MagazineRifle - MagazineRifleEmpty - MagazineShotgun @@ -868,10 +870,19 @@ - MagazineBoxPistolRubber - MagazineBoxRifleRubber - MagazineGrenadeEmpty + - MagazineLightRifleRubber - MagazineLightRifleIncendiary - MagazineLightRifleUranium + - MagazinePistolRubber - MagazinePistolIncendiary - MagazinePistolUranium + - MagazinePistolSubMachineGunRubber + - MagazinePistolSubMachineGunIncendiary + - MagazinePistolSubMachineGunUranium + - MagazineMagnumRubber + - MagazineMagnumIncendiary + - MagazineMagnumUranium + - MagazineRifleRubber - MagazineRifleIncendiary - MagazineRifleUranium - MagazineShotgunBeanbag @@ -887,6 +898,7 @@ - ShuttleGunSvalinnMachineGunCircuitboard - Signaller - SignalTrigger + - SpeedLoaderMagnumRubber - SpeedLoaderMagnumIncendiary - SpeedLoaderMagnumUranium - TelescopicShield diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 5b126f76973..6d00f40ce21 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -242,6 +242,15 @@ materials: Steel: 145 +- type: latheRecipe + id: MagazinePistolRubber + result: MagazinePistolRubber + category: Ammo + completetime: 5 + materials: + Steel: 45 + Plastic: 100 + - type: latheRecipe id: MagazinePistolPractice result: MagazinePistolPractice @@ -285,6 +294,34 @@ materials: Steel: 300 +- type: latheRecipe + id: MagazinePistolSubMachineGunRubber + result: MagazinePistolSubMachineGunRubber + category: Ammo + completetime: 5 + materials: + Steel: 100 + Plastic: 200 + +- type: latheRecipe + id: MagazinePistolSubMachineGunUranium + result: MagazinePistolSubMachineGunUranium + category: Ammo + completetime: 5 + materials: + Steel: 25 + Plastic: 225 + Uranium: 225 + +- type: latheRecipe + id: MagazinePistolSubMachineGunIncendiary + result: MagazinePistolSubMachineGunIncendiary + category: Ammo + completetime: 5 + materials: + Steel: 25 + Plastic: 400 + - type: latheRecipe id: MagazinePistolSubMachineGunTopMountedEmpty result: MagazinePistolSubMachineGunTopMountedEmpty @@ -351,6 +388,14 @@ materials: Steel: 475 +- type: latheRecipe + id: MagazineRifleRubber + result: MagazineRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 150 + Plastic: 325 - type: latheRecipe id: MagazineRiflePractice @@ -395,6 +440,15 @@ materials: Steel: 565 +- type: latheRecipe + id: MagazineLightRifleRubber + result: MagazineLightRifleRubber + category: Ammo + completetime: 5 + materials: + Steel: 125 + Plastic: 350 + - type: latheRecipe id: MagazineLightRiflePractice result: MagazineLightRiflePractice @@ -403,7 +457,6 @@ materials: Steel: 205 - - type: latheRecipe id: MagazineLightRifleUranium result: MagazineLightRifleUranium @@ -423,6 +476,50 @@ Steel: 25 Plastic: 540 +- type: latheRecipe + id: MagazineMagnumEmpty + result: MagazineMagnumEmpty + category: Ammo + completetime: 5 + materials: + Steel: 30 + +- type: latheRecipe + id: MagazineMagnum + result: MagazineMagnum + category: Ammo + completetime: 5 + materials: + Steel: 150 + +- type: latheRecipe + id: MagazineMagnumRubber + result: MagazineMagnumRubber + category: Ammo + completetime: 5 + materials: + Steel: 50 + Plastic: 100 + +- type: latheRecipe + id: MagazineMagnumUranium + result: MagazineMagnumUranium + category: Ammo + completetime: 5 + materials: + Steel: 30 + Plastic: 75 + Uranium: 150 + +- type: latheRecipe + id: MagazineMagnumIncendiary + result: MagazineMagnumIncendiary + category: Ammo + completetime: 5 + materials: + Steel: 30 + Plastic: 150 + - type: latheRecipe id: MagazineBoxRifle result: MagazineBoxRifle @@ -475,21 +572,21 @@ Plastic: 160 - type: latheRecipe - id: SpeedLoaderMagnumEmpty - result: SpeedLoaderMagnumEmpty + id: MagazineBoxLightRifleRubber + result: MagazineBoxLightRifleRubber category: Ammo completetime: 5 materials: - Steel: 50 + Steel: 350 + Plastic: 600 - type: latheRecipe - id: MagazineBoxLightRifleRubber - result: MagazineBoxLightRifleRubber + id: SpeedLoaderMagnumEmpty + result: SpeedLoaderMagnumEmpty category: Ammo completetime: 5 materials: - Steel: 350 - Plastic: 600 + Steel: 50 - type: latheRecipe id: SpeedLoaderMagnum @@ -499,6 +596,15 @@ materials: Steel: 190 +- type: latheRecipe + id: SpeedLoaderMagnumRubber + result: SpeedLoaderMagnumRubber + category: Ammo + completetime: 5 + materials: + Steel: 50 + Plastic: 70 + - type: latheRecipe id: SpeedLoaderMagnumPractice result: SpeedLoaderMagnumPractice @@ -758,46 +864,46 @@ result: MagazineGrenadeEmpty completetime: 3 materials: - Steel: 150 - Plastic: 50 + Steel: 150 + Plastic: 50 - type: latheRecipe id: GrenadeEMP result: GrenadeEMP completetime: 3 materials: - Steel: 150 - Plastic: 100 - Glass: 20 + Steel: 150 + Plastic: 100 + Glass: 20 - type: latheRecipe id: GrenadeBlast result: GrenadeBlast completetime: 3 materials: - Steel: 150 - Plastic: 100 - Gold: 50 + Steel: 150 + Plastic: 100 + Gold: 50 - type: latheRecipe id: GrenadeFlash result: GrenadeFlash completetime: 3 materials: - Steel: 150 - Plastic: 100 - Glass: 20 + Steel: 150 + Plastic: 100 + Glass: 20 - type: latheRecipe id: PortableRecharger result: PortableRecharger completetime: 15 materials: - Steel: 2000 - Uranium: 2000 - Plastic: 1000 - Plasma: 500 - Glass: 500 + Steel: 2000 + Uranium: 2000 + Plastic: 1000 + Plasma: 500 + Glass: 500 - type: latheRecipe id: ShellShotgun diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index ee2be33c831..6a1d1e37730 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -27,6 +27,8 @@ - BoxShotgunIncendiary - MagazineRifleIncendiary - MagazinePistolIncendiary + - MagazinePistolSubMachineGunIncendiary + - MagazineMagnumIncendiary - MagazineLightRifleIncendiary - SpeedLoaderMagnumIncendiary - MagazineShotgunIncendiary @@ -68,6 +70,12 @@ - CartridgeMagnumRubber - CartridgeLightRifleRubber - CartridgeRifleRubber + - MagazineRifleRubber + - MagazinePistolRubber + - MagazinePistolSubMachineGunRubber + - MagazineMagnumRubber + - MagazineLightRifleRubber + - SpeedLoaderMagnumRubber - MagazineBoxPistolRubber - MagazineBoxMagnumRubber - MagazineBoxLightRifleRubber @@ -88,6 +96,8 @@ recipeUnlocks: - MagazineRifleUranium - MagazinePistolUranium + - MagazinePistolSubMachineGunUranium + - MagazineMagnumUranium - MagazineLightRifleUranium - SpeedLoaderMagnumUranium - MagazineBoxPistolUranium