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

Make rubber rounds printable in NFSD Techfab #1474

Merged
Merged
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
Restore rubber rounds to nfsd techfab, r&d server
whatston3 committed Jun 5, 2024
commit 872740da7ada256c502c5ea8bdd16e25ebbf0520
8 changes: 4 additions & 4 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
@@ -802,10 +802,10 @@
- MagazineBoxPistolUranium
- MagazineBoxRifleIncendiary
- MagazineBoxRifleUranium
# - MagazineBoxLightRifleRubber # Frontier - Restore This Later
# - MagazineBoxMagnumRubber # Frontier - Restore This Later
# - MagazineBoxPistolRubber # Frontier - Restore This Later
# - MagazineBoxRifleRubber # Frontier - Restore This Later
- MagazineBoxLightRifleRubber # Frontier
- MagazineBoxMagnumRubber # Frontier
- MagazineBoxPistolRubber # Frontier
- MagazineBoxRifleRubber # Frontier
- MagazineGrenadeEmpty
- MagazineLightRifleIncendiary
- MagazineLightRifleUranium
4 changes: 4 additions & 0 deletions Resources/Prototypes/Research/arsenal.yml
Original file line number Diff line number Diff line change
@@ -66,6 +66,10 @@
- ShellTranquilizer
- BoxBeanbag
- WeaponDisabler
- MagazineBoxLightRifleRubber # Frontier
- MagazineBoxMagnumRubber # Frontier
- MagazineBoxPistolRubber # Frontier
- MagazineBoxRifleRubber # Frontier

- type: technology
id: UraniumMunitions
38 changes: 37 additions & 1 deletion Resources/Prototypes/_NF/Recipes/Lathes/security.yml
Original file line number Diff line number Diff line change
@@ -39,4 +39,40 @@
completetime: 5
materials:
Steel: 50
Plastic: 150
Plastic: 150

- type: latheRecipe
id: MagazineBoxLightRifleRubber
result: MagazineBoxLightRifleRubber
category: Ammo
completetime: 5
materials:
Steel: 300
Plastic: 600

- type: latheRecipe
id: MagazineBoxMagnumRubber
result: MagazineBoxMagnumRubber
category: Ammo
completetime: 5
materials:
Steel: 80
Plastic: 160

- type: latheRecipe
id: MagazineBoxPistolRubber
result: MagazineBoxPistolRubber
category: Ammo
completetime: 5
materials:
Steel: 200
Plastic: 400

- type: latheRecipe
id: MagazineBoxRifleRubber
result: MagazineBoxRifleRubber
category: Ammo
completetime: 5
materials:
Steel: 250
Plastic: 500