From 4ebccb13dd3f7a22f94cdac47a85a9e43e752aa8 Mon Sep 17 00:00:00 2001 From: Whatstone <166147148+whatston3@users.noreply.github.com> Date: Fri, 7 Jun 2024 06:58:39 -0400 Subject: [PATCH] Restore rubber rounds to nfsd techfab, r&d server (#1474) --- .../Entities/Structures/Machines/lathe.yml | 8 ++-- Resources/Prototypes/Research/arsenal.yml | 4 ++ .../_NF/Recipes/Lathes/security.yml | 38 ++++++++++++++++++- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 2b56322f037..39feffaec33 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -803,10 +803,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 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 5aed3aa6aaa..0acd9a7d122 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -66,6 +66,10 @@ - ShellTranquilizer - BoxBeanbag - WeaponDisabler + - MagazineBoxLightRifleRubber # Frontier + - MagazineBoxMagnumRubber # Frontier + - MagazineBoxPistolRubber # Frontier + - MagazineBoxRifleRubber # Frontier - type: technology id: UraniumMunitions diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index b521e8e0c60..b35556fc5ed 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -39,4 +39,40 @@ completetime: 5 materials: Steel: 50 - Plastic: 150 \ No newline at end of file + 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