Skip to content

Commit

Permalink
Adds Missing Lathe Recipes (#1472)
Browse files Browse the repository at this point in the history
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

N1984 exists, but you can't print more ammo reliably. You can refill
them, sure, but the moment you lose a magazine, it's gone forever.

This adds the magazines and adds the unique mags to the research.

Edit: Turns out there's like a lot missing in the lathe, so I decided to
just add the missing ones I found.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

Nothing here

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added missing lathe recipes
  • Loading branch information
BlueHNT authored Jan 10, 2025
1 parent 4907639 commit 86296da
Show file tree
Hide file tree
Showing 5 changed files with 180 additions and 24 deletions.
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
- 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

- 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
- SpeedLoaderMagnumUranium
- MagazineBoxPistolUranium
Expand Down

0 comments on commit 86296da

Please sign in to comment.