diff --git a/Resources/Locale/en-US/_HL/Weapons/hi-power.ftl b/Resources/Locale/en-US/_HL/Weapons/hi-power.ftl index fe6127d7ea7..84a5b7bd256 100644 --- a/Resources/Locale/en-US/_HL/Weapons/hi-power.ftl +++ b/Resources/Locale/en-US/_HL/Weapons/hi-power.ftl @@ -1,2 +1,20 @@ cartridge-9x19mm-hi-power = Made of premium materials. Much more powerful. cartridge-9x19mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-45_ACP-hi-power = Made of premium materials. Much more powerful. +cartridge-45_ACP-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-46x30mm-hi-power = Made of premium materials. Much more powerful. +cartridge-46x30mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-45_magnum-hi-power = Made of premium materials. Much more powerful. +cartridge-45_magnum-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-556x45mm-hi-power = Made of premium materials. Much more powerful. +cartridge-556x45mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-57x28mm-hi-power = Made of premium materials. Much more powerful. +cartridge-57x28mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-762x39mm-hi-power = Made of premium materials. Much more powerful. +cartridge-762x39mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-762x51mm-hi-power = Made of premium materials. Much more powerful. +cartridge-762x51mm-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-762x54mmR-hi-power = Made of premium materials. Much more powerful. +cartridge-762x54mmR-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. +cartridge-8x65mmSKR-hi-power = Made of premium materials. Much more powerful. +cartridge-8x65mmSKR-flechette = Made of premium materials. Topped with an armor-piercing plasteel dart; weak but doesn't care what you're wearing. diff --git a/Resources/Locale/en-US/_HL/recipes/materials.ftl b/Resources/Locale/en-US/_HL/recipes/materials.ftl index a2aac70622e..ec6062c1bf3 100644 --- a/Resources/Locale/en-US/_HL/recipes/materials.ftl +++ b/Resources/Locale/en-US/_HL/recipes/materials.ftl @@ -11,4 +11,13 @@ stack-Capital-Frame = capital ship weapon frame stack-Capital-Servo = capital ship weapon servo stack-Capital-Internal = capital ship weapon internal stack-bullet-casing-9x19mm = brass casing (9x19mm) +stack-bullet-casing-45_ACP = brass casing (45 ACP) +stack-bullet-casing-46x30mm = brass casing (46x30mm) +stack-bullet-casing-45_magnum = brass casing (45 magnum) +stack-bullet-casing-556x45mm = brass casing (556x45mm) +stack-bullet-casing-57x28mm = brass casing (57x28mm) +stack-bullet-casing-762x39mm = brass casing (762x39mm) +stack-bullet-casing-762x51mm = brass casing (762x51mm) +stack-bullet-casing-762x54mmR = brass casing (762x54mmR) +stack-bullet-casing-8x65mmSKR = brass casing (8x65mm SKR) stack-bullet-flechette = flechette(s) diff --git a/Resources/Locale/en-US/_HL/stack/stacks.ftl b/Resources/Locale/en-US/_HL/stack/stacks.ftl index 08c706e67ca..a73b23cb18c 100644 --- a/Resources/Locale/en-US/_HL/stack/stacks.ftl +++ b/Resources/Locale/en-US/_HL/stack/stacks.ftl @@ -1,3 +1,12 @@ stack-hi-power-gunpowder = triple-base gunpowder stack-bullet-tip = bullet tip(s) stack-bullet-casings-9x19mm = brass casing(s) (9x19mm) +stack-bullet-casings-45_ACP = brass casing(s) (45 ACP) +stack-bullet-casings-46x30mm = brass casing(s) (46x30mm) +stack-bullet-casings-45_magnum = brass casing(s) (45 magnum) +stack-bullet-casings-556x45mm = brass casing(s) (556x45mm) +stack-bullet-casings-57x28mm = brass casing(s) (57x28mm) +stack-bullet-casings-762x39mm = brass casing(s) (762x39mm) +stack-bullet-casings-762x51mm = brass casing(s) (762x51mm) +stack-bullet-casings-762x54mmR = brass casing(s) (762x54mmR) +stack-bullet-casings-8x65mmSKR = brass casing(s) (8x65mm SKR) diff --git a/Resources/Prototypes/_HL/Entities/Objects/Materials/Materials.yml b/Resources/Prototypes/_HL/Entities/Objects/Materials/Materials.yml index a42d7fe6864..2c6fe4f44bd 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Materials/Materials.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Materials/Materials.yml @@ -638,7 +638,178 @@ Brass: 10 - type: Item size: Tiny - + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing45_ACP + name: brass casing (45 ACP) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 45 ACP. + components: + - type: Material + - type: Stack + stackType: BulletCasing45_ACP + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 10 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing46x30mm + name: brass casing (46x30mm) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 46x30mm. + components: + - type: Material + - type: Stack + stackType: BulletCasing46x30mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 10 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing45_magnum + name: brass casing (45 magnum) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 45 magnum. + components: + - type: Material + - type: Stack + stackType: BulletCasing45_magnum + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 30 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing556x45mm + name: brass casing (556x45mm) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 556x45mm. + components: + - type: Material + - type: Stack + stackType: BulletCasing556x45mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 10 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing57x28mm + name: brass casing (57x28mm) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 57x28mm. + components: + - type: Material + - type: Stack + stackType: BulletCasing57x28mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 10 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing762x39mm + name: brass casing (762x39mm) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x39mm. + components: + - type: Material + - type: Stack + stackType: BulletCasing762x39mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 20 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing762x51mm + name: brass casing (762x51mm) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x51mm. + components: + - type: Material + - type: Stack + stackType: BulletCasing762x51mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 20 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing762x54mmR + name: brass casing (762x54mmR) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 762x54mmR. + components: + - type: Material + - type: Stack + stackType: BulletCasing762x54mmR + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 30 + - type: Item + size: Tiny + +- type: entity + parent: MaterialBase + id: MaterialBulletCasing8x65mmSKR + name: brass casing (8x65mm SKR) + description: A high-quality brass bullet casing, for those who like to hand-pack their bullets. This one is 8x65mmSKR. + components: + - type: Material + - type: Stack + stackType: BulletCasing9x19mm + count: 1 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi + state: base-spent + - type: PhysicalComposition + materialComposition: + Brass: 30 + - type: Item + size: Tiny + - type: entity parent: MaterialBase id: MaterialBulletFlechette diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/hipower.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/hipower.yml index d42d60af2b7..3383e3e09a3 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/hipower.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/hipower.yml @@ -33,3 +33,327 @@ - type: Construction graph: Cartridge9x19mmFlechetteGraph node: shell + +- type: entity + id: Cartridge45_ACPHiPower + name: cartridge (45 ACP high-power) + parent: BaseCartridge45_ACP + components: + - type: CartridgeAmmo + proto: Bullet45_ACPHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge45_ACPHiPowerGraph + node: shell + +- type: entity + id: Cartridge45_ACPFlechette + name: cartridge (45 ACP flechette) + parent: BaseCartridge45_ACP + components: + - type: CartridgeAmmo + proto: Bullet45_ACPFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge45_ACPFlechetteGraph + node: shell + +- type: entity + id: Cartridge46x30mmHiPower + name: cartridge (46x30mm high-power) + parent: BaseCartridge46x30mm + components: + - type: CartridgeAmmo + proto: Bullet46x30mmHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge46x30mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge46x30mmFlechette + name: cartridge (46x30mm flechette) + parent: BaseCartridge46x30mm + components: + - type: CartridgeAmmo + proto: Bullet46x30mmFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge46x30mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge45_magnumHiPower + name: cartridge (45 magnum high-power) + parent: BaseCartridge45_magnum + components: + - type: CartridgeAmmo + proto: Bullet45_magnumHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge45_magnumHiPowerGraph + node: shell + +- type: entity + id: Cartridge45_magnumFlechette + name: cartridge (45 magnum flechette) + parent: BaseCartridge45_magnum + components: + - type: CartridgeAmmo + proto: Bullet45_magnumFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge45_magnumFlechetteGraph + node: shell + +- type: entity + id: Cartridge556x45mmHiPower + name: cartridge (556x45mm high-power) + parent: BaseCartridge556x45mm + components: + - type: CartridgeAmmo + proto: Bullet556x45mmHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge556x45mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge556x45mmFlechette + name: cartridge (556x45mm flechette) + parent: BaseCartridge556x45mm + components: + - type: CartridgeAmmo + proto: Bullet556x45mmFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge556x45mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge57x28mmHiPower + name: cartridge (57x28mm high-power) + parent: BaseCartridge57x28mm + components: + - type: CartridgeAmmo + proto: Bullet57x28mmHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge57x28mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge57x28mmFlechette + name: cartridge (57x28mm flechette) + parent: BaseCartridge57x28mm + components: + - type: CartridgeAmmo + proto: Bullet57x28mmFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge57x28mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x39mmHiPower + name: cartridge (762x39mm high-power) + parent: BaseCartridge762x39mm + components: + - type: CartridgeAmmo + proto: Bullet762x39mmHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x39mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x39mmFlechette + name: cartridge (762x39mm flechette) + parent: BaseCartridge762x39mm + components: + - type: CartridgeAmmo + proto: Bullet762x39mmFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x39mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x51mmHiPower + name: cartridge (762x51mm high-power) + parent: BaseCartridge762x51mm + components: + - type: CartridgeAmmo + proto: Bullet762x51mmHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x51mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x51mmFlechette + name: cartridge (762x51mm flechette) + parent: BaseCartridge762x51mm + components: + - type: CartridgeAmmo + proto: Bullet762x51mmFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x51mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x54mmRHiPower + name: cartridge (762x54mmR high-power) + parent: BaseCartridge762x54mmR + components: + - type: CartridgeAmmo + proto: Bullet762x54mmRHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x54mmRHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x54mmRFlechette + name: cartridge (762x54mmR flechette) + parent: BaseCartridge762x54mmR + components: + - type: CartridgeAmmo + proto: Bullet762x54mmRFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x54mmRFlechetteGraph + node: shell + +- type: entity + id: Cartridge8x65mmSKRHiPower + name: cartridge (8x65mm SKR high-power) + parent: BaseCartridge8x65mmSKR + components: + - type: CartridgeAmmo + proto: Bullet8x65mmSKRHiPower + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge8x65mmSKRHiPowerGraph + node: shell + +- type: entity + id: Cartridge8x65mmSKRFlechette + name: cartridge (8x65mm SKR flechette) + parent: BaseCartridge8x65mmSKR + components: + - type: CartridgeAmmo + proto: Bullet8x65mmSKRFlechette + deleteOnSpawn: true + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge8x65mmSKRFlechetteGraph + node: shell diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartriges/hipower.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartriges/hipower.yml new file mode 100644 index 00000000000..5927c7bd248 --- /dev/null +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Cartriges/hipower.yml @@ -0,0 +1,339 @@ +- type: entity + id: Cartridge9x19mmHiPower + name: cartridge (9x19mm high-power) + parent: BaseCartridge9x19mm + components: + - type: CartridgeAmmo + proto: Bullet9x19mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge9x19mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge9x19mmFlechette + name: cartridge (9x19mm flechette) + parent: BaseCartridge9x19mm + components: + - type: CartridgeAmmo + proto: Bullet9x19mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge9x19mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge45_ACPHiPower + name: cartridge (45 ACP high-power) + parent: BaseCartridge45_ACP + components: + - type: CartridgeAmmo + proto: Bullet9x19mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge45_ACPHiPowerGraph + node: shell + +- type: entity + id: Cartridge45_ACPFlechette + name: cartridge (45 ACP flechette) + parent: BaseCartridge45_ACP + components: + - type: CartridgeAmmo + proto: Bullet45_ACPFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge45_ACPFlechetteGraph + node: shell + +- type: entity + id: Cartridge46x30mmHiPower + name: cartridge (46x30mm high-power) + parent: BaseCartridge46x30mm + components: + - type: CartridgeAmmo + proto: Bullet46x30mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge46x30mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge46x30mmFlechette + name: cartridge (46x30mm flechette) + parent: BaseCartridge46x30mm + components: + - type: CartridgeAmmo + proto: Bullet46x30mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge46x30mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge45_magnumHiPower + name: cartridge (45 magnum high-power) + parent: BaseCartridge45_magnum + components: + - type: CartridgeAmmo + proto: Bullet45_magnumHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge45_magnumHiPowerGraph + node: shell + +- type: entity + id: Cartridge45_magnumFlechette + name: cartridge (45 magnum flechette) + parent: BaseCartridge45_magnum + components: + - type: CartridgeAmmo + proto: Bullet45_magnumFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge45_magnumFlechetteGraph + node: shell + +- type: entity + id: Cartridge556x45mmHiPower + name: cartridge (556x45mm high-power) + parent: BaseCartridge556x45mm + components: + - type: CartridgeAmmo + proto: Bullet556x45mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge556x45mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge556x45mmFlechette + name: cartridge (556x45mm flechette) + parent: BaseCartridge556x45mm + components: + - type: CartridgeAmmo + proto: Bullet556x45mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge556x45mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge57x28mmHiPower + name: cartridge (57x28mm high-power) + parent: BaseCartridge57x28mm + components: + - type: CartridgeAmmo + proto: Bullet57x28mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge57x28mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge57x28mmFlechette + name: cartridge (57x28mm flechette) + parent: BaseCartridge57x28mm + components: + - type: CartridgeAmmo + proto: Bullet57x28mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge57x28mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x39mmHiPower + name: cartridge (762x39mm high-power) + parent: BaseCartridge762x39mm + components: + - type: CartridgeAmmo + proto: Bullet762x39mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x39mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x39mmFlechette + name: cartridge (762x39mm flechette) + parent: BaseCartridge762x39mm + components: + - type: CartridgeAmmo + proto: Bullet762x39mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x39mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x51mmHiPower + name: cartridge (762x51mm high-power) + parent: BaseCartridge762x51mm + components: + - type: CartridgeAmmo + proto: Bullet762x51mmHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x51mmHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x51mmFlechette + name: cartridge (762x51mm flechette) + parent: BaseCartridge762x51mm + components: + - type: CartridgeAmmo + proto: Bullet762x51mmFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x51mmFlechetteGraph + node: shell + +- type: entity + id: Cartridge762x54mmRHiPower + name: cartridge (762x54mmR high-power) + parent: BaseCartridge762x54mmR + components: + - type: CartridgeAmmo + proto: Bullet762x54mmRHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge762x54mmRHiPowerGraph + node: shell + +- type: entity + id: Cartridge762x54mmRFlechette + name: cartridge (762x54mmR flechette) + parent: BaseCartridge762x54mmR + components: + - type: CartridgeAmmo + proto: Bullet762x54mmRFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge762x54mmRFlechetteGraph + node: shell + +- type: entity + id: Cartridge8x65mmSKRHiPower + name: cartridge (8x65mm SKR high-power) + parent: BaseCartridge8x65mmSKR + components: + - type: CartridgeAmmo + proto: Bullet8x65mmSKRHiPower + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#B22222" + - type: Construction + graph: Cartridge8x65mmSKRHiPowerGraph + node: shell + +- type: entity + id: Cartridge8x65mmSKRFlechette + name: cartridge (8x65mm SKR flechette) + parent: BaseCartridge8x65mmSKR + components: + - type: CartridgeAmmo + proto: Bullet8x65mmSKRFlechette + - type: Sprite + layers: + - state: base + map: [ "enum.AmmoVisualLayers.Base" ] + - state: tip + color: "#808080" + - type: Construction + graph: Cartridge8x65mmSKRFlechetteGraph + node: shell diff --git a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hipower.yml b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hipower.yml index 48d168627cc..77855657258 100644 --- a/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hipower.yml +++ b/Resources/Prototypes/_HL/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/hipower.yml @@ -20,3 +20,211 @@ types: Piercing: 8 ignoreResistances: true + +- type: entity + id: Bullet45_ACPHiPower + name: bullet (45 ACP high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 27 + +- type: entity + id: Bullet45_ACPFlechette + name: bullet (45 ACP flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 9 + ignoreResistances: true + +- type: entity + id: Bullet46x30mmHiPower + name: bullet (46x30mm high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 21 + +- type: entity + id: Bullet46x30mmFlechette + name: bullet (46x30mm flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 7 + ignoreResistances: true + +- type: entity + id: Bullet45_magnumHiPower + name: bullet (45 magnum high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 52 + +- type: entity + id: Bullet45_magnumFlechette + name: bullet (45 magnum flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 17 + ignoreResistances: true + +- type: entity + id: Bullet556x45mmHiPower + name: bullet (556x45mm high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 28 + +- type: entity + id: Bullet556x45mmFlechette + name: bullet (556x45mm flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 9 + ignoreResistances: true + +- type: entity + id: Bullet57x28mmHiPower + name: bullet (57x28mm high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 25 + +- type: entity + id: Bullet57x28mmFlechette + name: bullet (57x28mm flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 8 + ignoreResistances: true + +- type: entity + id: Bullet762x39mmHiPower + name: bullet (762x39mm high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 31 + +- type: entity + id: Bullet762x39mmFlechette + name: bullet (762x39mm flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 10 + ignoreResistances: true + +- type: entity + id: Bullet762x51mmHiPower + name: bullet (762x51mm high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 43 + +- type: entity + id: Bullet762x51mmFlechette + name: bullet (762x51mm flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 14 + ignoreResistances: true + +- type: entity + id: Bullet762x54mmRHiPower + name: bullet (762x54mmR high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 52 + +- type: entity + id: Bullet762x54mmRFlechette + name: bullet (762x54mmR flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 17 + ignoreResistances: true + +- type: entity + id: Bullet8x65mmSKRHiPower + name: bullet (8x65mm SKR high-power) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 52 + +- type: entity + id: Bullet8x65mmSKRFlechette + name: bullet (8x65mm SKR flechette) + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Piercing: 17 + ignoreResistances: true + diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/high_power_ammo.yml b/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/high_power_ammo.yml index 21fa619a894..1b39023baff 100644 --- a/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/high_power_ammo.yml +++ b/Resources/Prototypes/_HL/Recipes/Crafting/Graphs/high_power_ammo.yml @@ -37,3 +37,364 @@ doAfter: 5 - node: shell entity: Cartridge9x19mmFlechette + +- type: constructionGraph + id: Cartridge45_ACPHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing45_ACP + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge45_ACPHiPower + +- type: constructionGraph + id: Cartridge45_ACPFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing45_ACP + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge45_ACPFlechette + +- type: constructionGraph + id: Cartridge46x30mmHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing46x30mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge46x30mmHiPower + +- type: constructionGraph + id: Cartridge46x30mmFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing46x30mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge46x30mmFlechette + +- type: constructionGraph + id: Cartridge45_magnumHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing45_magnum + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge45_magnumHiPower + +- type: constructionGraph + id: Cartridge45_magnumFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing45_magnum + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge45_magnumFlechette + +- type: constructionGraph + id: Cartridge556x45mmHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing556x45mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge556x45mmHiPower + +- type: constructionGraph + id: Cartridge556x45mmFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing556x45mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge556x45mmFlechette + +- type: constructionGraph + id: Cartridge57x28mmHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing57x28mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge57x28mmHiPower + +- type: constructionGraph + id: Cartridge57x28mmFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing57x28mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 1 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 5 + - node: shell + entity: Cartridge57x28mmFlechette + +- type: constructionGraph + id: Cartridge762x39mmHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x39mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 2 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 10 + - node: shell + entity: Cartridge762x39mmHiPower + +- type: constructionGraph + id: Cartridge762x39mmFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x39mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 2 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 10 + - node: shell + entity: Cartridge762x39mmFlechette + +- type: constructionGraph + id: Cartridge762x51mmHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x51mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 2 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 10 + - node: shell + entity: Cartridge762x51mmHiPower + +- type: constructionGraph + id: Cartridge762x51mmFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x51mm + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 2 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 10 + - node: shell + entity: Cartridge762x51mmFlechette + +- type: constructionGraph + id: Cartridge762x54mmRHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x54mmR + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge762x54mmRHiPower + +- type: constructionGraph + id: Cartridge762x54mmRFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing762x54mmR + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge762x54mmRFlechette + +- type: constructionGraph + id: Cartridge8x65mmSKRHiPowerGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing8x65mmSKR + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletTip + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge8x65mmSKRHiPower + +- type: constructionGraph + id: Cartridge8x65mmSKRFlechetteGraph + start: start + graph: + - node: start + edges: + - to: shell + steps: + - material: BulletCasing8x65mmSKR + amount: 1 + doAfter: 0.5 + - material: HiPowerGunpowder + amount: 3 + doAfter: 0.5 + - material: BulletFlechette + amount: 1 + doAfter: 15 + - node: shell + entity: Cartridge8x65mmSKRFlechette + diff --git a/Resources/Prototypes/_HL/Recipes/Crafting/high_power.yml b/Resources/Prototypes/_HL/Recipes/Crafting/high_power.yml index 09dd4b1c1ce..7726bd3aa48 100644 --- a/Resources/Prototypes/_HL/Recipes/Crafting/high_power.yml +++ b/Resources/Prototypes/_HL/Recipes/Crafting/high_power.yml @@ -15,3 +15,166 @@ category: construction-category-weapons description: cartridge-9x19mm-flechette objectType: Item + +- type: construction + id: Cartridge45_ACPHiPower + graph: Cartridge45_ACPHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-45_ACP-hi-power + objectType: Item + +- type: construction + id: Cartridge45_ACPFlechette + graph: Cartridge45_ACPFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-45_ACP-flechette + objectType: Item + +- type: construction + id: Cartridge46x30mmHiPower + graph: Cartridge46x30mmHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-46x30mm-hi-power + objectType: Item + +- type: construction + id: Cartridge46x30mmFlechette + graph: Cartridge46x30mmFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-46x30mm-flechette + objectType: Item + +- type: construction + id: Cartridge45_magnumHiPower + graph: Cartridge45_magnumHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-45_magnum-hi-power + objectType: Item + +- type: construction + id: Cartridge45_magnumFlechette + graph: Cartridge45_magnumFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-45_magnum-flechette + objectType: Item + +- type: construction + id: Cartridge556x45mmHiPower + graph: Cartridge556x45mmHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-556x45mm-hi-power + objectType: Item + +- type: construction + id: Cartridge556x45mmFlechette + graph: Cartridge556x45mmFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-556x45mm-flechette + objectType: Item + +- type: construction + id: Cartridge57x28mmHiPower + graph: Cartridge57x28mmHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-57x28mm-hi-power + objectType: Item + +- type: construction + id: Cartridge57x28mmFlechette + graph: Cartridge57x28mmFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-57x28mm-flechette + objectType: Item + +- type: construction + id: Cartridge762x39mmHiPower + graph: Cartridge762x39mmHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x39mm-hi-power + objectType: Item + +- type: construction + id: Cartridge762x39mmFlechette + graph: Cartridge762x39mmFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x39mm-flechette + objectType: Item + +- type: construction + id: Cartridge762x51mmHiPower + graph: Cartridge762x51mmHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x51mm-hi-power + objectType: Item + +- type: construction + id: Cartridge762x51mmFlechette + graph: Cartridge762x51mmFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x51mm-flechette + objectType: Item + +- type: construction + id: Cartridge762x54mmRHiPower + graph: Cartridge762x54mmRHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x54mmR-hi-power + objectType: Item + +- type: construction + id: Cartridge762x54mmRFlechette + graph: Cartridge762x54mmRFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-762x54mmR-flechette + objectType: Item + +- type: construction + id: Cartridge8x65mmSKRHiPower + graph: Cartridge8x65mmSKRHiPowerGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-8x65mmSKR-hi-power + objectType: Item + +- type: construction + id: Cartridge8x65mmSKRFlechette + graph: Cartridge8x65mmSKRFlechetteGraph + startNode: start + targetNode: shell + category: construction-category-weapons + description: cartridge-8x65mmSKR-flechette + objectType: Item + diff --git a/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml b/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml index f1bddb97880..65d9a111845 100644 --- a/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml +++ b/Resources/Prototypes/_HL/Recipes/Lathes/ammo.yml @@ -11,6 +11,69 @@ completetime: 5 materials: Brass: 10 + +- type: latheRecipe + id: BulletCasing45_ACP + result: MaterialBulletCasing45_ACP + completetime: 5 + materials: + Brass: 10 + +- type: latheRecipe + id: BulletCasing46x30mm + result: MaterialBulletCasing46x30mm + completetime: 5 + materials: + Brass: 10 + +- type: latheRecipe + id: BulletCasing45_magnum + result: MaterialBulletCasing45_magnum + completetime: 5 + materials: + Brass: 30 + +- type: latheRecipe + id: BulletCasing556x45mm + result: MaterialBulletCasing556x45mm + completetime: 5 + materials: + Brass: 10 + +- type: latheRecipe + id: BulletCasing57x28mm + result: MaterialBulletCasing57x28mm + completetime: 5 + materials: + Brass: 10 + +- type: latheRecipe + id: BulletCasing762x39mm + result: MaterialBulletCasing762x39mm + completetime: 5 + materials: + Brass: 20 + +- type: latheRecipe + id: BulletCasing762x51mm + result: MaterialBulletCasing762x51mm + completetime: 5 + materials: + Brass: 20 + +- type: latheRecipe + id: BulletCasing762x54mmR + result: MaterialBulletCasing762x54mmR + completetime: 5 + materials: + Brass: 30 + +- type: latheRecipe + id: BulletCasing8x65mmSKR + result: MaterialBulletCasing8x65mmSKR + completetime: 5 + materials: + Brass: 30 - type: latheRecipe id: BulletFlechette diff --git a/Resources/Prototypes/_HL/Stacks/Materials/Materials.yml b/Resources/Prototypes/_HL/Stacks/Materials/Materials.yml index 18297949d33..df94cc6e423 100644 --- a/Resources/Prototypes/_HL/Stacks/Materials/Materials.yml +++ b/Resources/Prototypes/_HL/Stacks/Materials/Materials.yml @@ -110,6 +110,69 @@ spawn: MaterialBulletCasing9x19mm maxCount: 60 +- type: stack + id: BulletCasing45_ACP + name: stack-bullet-casing-45_ACP + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing45_ACP + maxCount: 60 + +- type: stack + id: BulletCasing46x30mm + name: stack-bullet-casing-46x30mm + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing46x30mm + maxCount: 60 + +- type: stack + id: BulletCasing45_magnum + name: stack-bullet-casing-45_magnum + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing45_magnum + maxCount: 60 + +- type: stack + id: BulletCasing556x45mm + name: stack-bullet-casing-556x45mm + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing556x45mm + maxCount: 60 + +- type: stack + id: BulletCasing57x28mm + name: stack-bullet-casing-57x28mm + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing57x28mm + maxCount: 60 + +- type: stack + id: BulletCasing762x39mm + name: stack-bullet-casing-762x39mm + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing762x39mm + maxCount: 60 + +- type: stack + id: BulletCasing762x51mm + name: stack-bullet-casing-762x51mm + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing762x51mm + maxCount: 60 + +- type: stack + id: BulletCasing762x54mmR + name: stack-bullet-casing-762x54mmR + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing762x54mmR + maxCount: 60 + +- type: stack + id: BulletCasing8x65mmSKR + name: stack-bullet-casing-8x65mmSKR + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Casings/ammo_casing.rsi, state: base-spent } + spawn: MaterialBulletCasing8x65mmSKR + maxCount: 60 + - type: stack id: BulletTip name: stack-bullet-tip diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml index 7f354aa04ef..82521cf8691 100644 --- a/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/Packs/ammo.yml @@ -513,6 +513,15 @@ #Parts - BulletTip - BulletCasing9x19mm + - BulletCasing45_ACP + - BulletCasing46x30mm + - BulletCasing45_magnum + - BulletCasing556x45mm + - BulletCasing57x28mm + - BulletCasing762x39mm + - BulletCasing762x51mm + - BulletCasing762x54mmR + - BulletCasing8x65mmSKR - BulletFlechette # big boxes - AmmoBox46x30mmBig