diff options
Diffstat (limited to 'revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch')
-rw-r--r-- | revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch b/revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch deleted file mode 100644 index f0e3aa0..0000000 --- a/revert-28_feat-content-semi-plausible-smokeless-gunpowder-reci.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 49e4e2b3257d90ffc66b4e8fa2e7666b1440b751 Mon Sep 17 00:00:00 2001 -From: YeOldeMiller <36291373+YeOldeMiller@users.noreply.github.com> -Date: Thu, 26 Oct 2023 03:22:35 +0300 -Subject: [PATCH 015/318] feat(content): semi-plausible smokeless gunpowder - recipe (#3503) - -* Introduce a semi-plausible smokeless gunpowder recipe - -* style(autofix.ci): automated formatting - -* Define id_suffix for gunpowder recipe, add ether to components - -* Remove obsolete gunpowder recipe from Craftable Gun Pack mod - -* Revert "Define id_suffix for gunpowder recipe" - -* Reapply ether addition for gunpowder recipe - ---------- - -Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> ---- - data/json/recipes/ammo/components.json | 23 ++++++++++++++++++++++ - 2 files changed, 23 insertions(+), 21 deletions(-) - -diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json -index 3a29dfb5156..7610be60b25 100644 ---- a/data/json/recipes/ammo/components.json -+++ b/data/json/recipes/ammo/components.json -@@ -44,6 +44,29 @@ - "tools": [ [ [ "hotplate", 5 ], [ "toolset", 5 ] ] ], - "components": [ [ [ "oxy_powder", 5 ] ], [ [ "lye_powder", 5 ] ], [ [ "charcoal", 1 ], [ "coal_lump", 1 ] ] ] - }, -+ { -+ "type": "recipe", -+ "result": "gunpowder", -+ "category": "CC_AMMO", -+ "subcategory": "CSC_AMMO_COMPONENTS", -+ "skill_used": "cooking", -+ "skills_required": [ "fabrication", 6 ], -+ "difficulty": 8, -+ "time": "2 h 40 m", -+ "charges": 200, -+ "book_learn": [ [ "textbook_anarch", 7 ], [ "adv_chemistry", 8 ], [ "textbook_chemistry", 8 ] ], -+ "batch_time_factors": [ 50, 3 ], -+ "qualities": [ { "id": "CHEM", "level": 3 } ], -+ "tools": [ [ [ "surface_heat", 250, "LIST" ] ], [ [ "pastaextruder", -1 ] ] ], -+ "components": [ -+ [ [ "cotton_ball", 5 ] ], -+ [ [ "chem_nitric_acid", 3 ] ], -+ [ [ "acid", 3 ], [ "chem_sulphuric_acid", 2 ] ], -+ [ [ "ether", 125 ] ], -+ [ [ "water", 9 ], [ "water_clean", 9 ] ], -+ [ [ "edible_tallow_lard", 2, "LIST" ], [ "tallow_tainted", 2 ], [ "cooking_oil", 16 ], [ "cooking_oil2", 16 ] ] -+ ] -+ }, - { - "type": "recipe", - "result": "exploding_arrow_warhead", --- -2.42.0 - |