Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds Missing Lathe Recipes #1472

Merged
merged 6 commits into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -805,6 +805,8 @@
- MagazinePistolSubMachineGunEmpty
- MagazinePistolSubMachineGunTopMounted
- MagazinePistolSubMachineGunTopMountedEmpty
- MagazineMagnum
- MagazineMagnumEmpty
- MagazineRifle
BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
- MagazineRifleEmpty
- MagazineShotgun
Expand Down Expand Up @@ -868,10 +870,19 @@
- MagazineBoxPistolRubber
- MagazineBoxRifleRubber
- MagazineGrenadeEmpty
- MagazineLightRifleRubber
- MagazineLightRifleIncendiary
- MagazineLightRifleUranium
- MagazinePistolRubber
- MagazinePistolIncendiary
- MagazinePistolUranium
- MagazinePistolSubMachineGunRubber
- MagazinePistolSubMachineGunIncendiary
- MagazinePistolSubMachineGunUranium
- MagazineMagnumRubber
- MagazineMagnumIncendiary
- MagazineMagnumUranium
- MagazineRifleRubber
- MagazineRifleIncendiary
- MagazineRifleUranium
- MagazineShotgunBeanbag
Expand All @@ -887,6 +898,7 @@
- ShuttleGunSvalinnMachineGunCircuitboard
- Signaller
- SignalTrigger
- SpeedLoaderMagnumRubber
- SpeedLoaderMagnumIncendiary
- SpeedLoaderMagnumUranium
- TelescopicShield
Expand Down
154 changes: 130 additions & 24 deletions Resources/Prototypes/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -403,7 +457,6 @@
materials:
Steel: 205


- type: latheRecipe
id: MagazineLightRifleUranium
result: MagazineLightRifleUranium
Expand All @@ -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

BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
- type: latheRecipe
id: MagazineBoxRifle
result: MagazineBoxRifle
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
- BoxShotgunIncendiary
- MagazineRifleIncendiary
- MagazinePistolIncendiary
- MagazinePistolSubMachineGunIncendiary
- MagazineMagnumIncendiary
- MagazineLightRifleIncendiary
- SpeedLoaderMagnumIncendiary
- MagazineShotgunIncendiary
Expand Down Expand Up @@ -68,6 +70,12 @@
- CartridgeMagnumRubber
- CartridgeLightRifleRubber
- CartridgeRifleRubber
- MagazineRifleRubber
- MagazinePistolRubber
- MagazinePistolSubMachineGunRubber
- MagazineMagnumRubber
- MagazineLightRifleRubber
- SpeedLoaderMagnumRubber
- MagazineBoxPistolRubber
- MagazineBoxMagnumRubber
- MagazineBoxLightRifleRubber
Expand All @@ -88,6 +96,8 @@
recipeUnlocks:
- MagazineRifleUranium
- MagazinePistolUranium
- MagazinePistolSubMachineGunUranium
- MagazineMagnumUranium
- MagazineLightRifleUranium
BlueHNT marked this conversation as resolved.
Show resolved Hide resolved
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
Expand Down
Loading