Merge pull request #38589 from kevingranade/obsolete-aux-flamethrower

Obsolete railmount flamer
CleverRaven · Mar 6, 2020 · 4aa2221 · 4aa2221
2 parents 481e0cc + c28a0c5
commit 4aa2221
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 42 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json b/data/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
@@ -50,7 +50,6 @@
     "//": "Military specification gunmods found only at military sites.",
     "items": [
       [ "acog_scope", 100 ],
-      [ "aux_flamer", 20 ],
       [ "holo_sight", 100 ],
       [ "m203", 30 ],
       [ "m320_mod", 10 ],

diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json
@@ -1,23 +1,4 @@
 [
-  {
-    "id": "aux_flamer",
-    "type": "GUNMOD",
-    "name": { "str": "aux flamethrower" },
-    "description": "This custom-built miniature flamethrower is made to be attached to almost any sort of firearm, greatly expanding its lethality.",
-    "weight": "1820 g",
-    "volume": "1 L",
-    "price": 85000,
-    "material": [ "steel" ],
-    "symbol": ":",
-    "color": "light_red",
-    "location": "underbarrel",
-    "mod_targets": [ "rifle", "shotgun", "smg", "crossbow", "launcher" ],
-    "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 300, "durability": 10 },
-    "magazine_well": 1,
-    "magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ],
-    "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
-    "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ]
-  },
   {
     "id": "bipod",
     "type": "GUNMOD",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -1704,5 +1704,29 @@
     "environmental_protection": 5,
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
+  },
+  {
+    "id": "aux_flamer",
+    "type": "GUNMOD",
+    "name": { "str": "aux flamethrower" },
+    "description": "This custom-built miniature flamethrower is made to be attached to almost any sort of firearm, greatly expanding its lethality.",
+    "weight": "1820 g",
+    "volume": "1 L",
+    "price": 85000,
+    "material": [ "steel" ],
+    "symbol": ":",
+    "color": "light_red",
+    "location": "underbarrel",
+    "mod_targets": [ "rifle", "shotgun", "smg", "crossbow", "launcher" ],
+    "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 300, "durability": 10 },
+    "magazine_well": 1,
+    "magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ],
+    "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ],
+    "flags": [ "FIRE_100", "PUMP_RAIL_COMPATIBLE", "NON-FOULING" ]
+  },
+  {
+    "type": "recipe",
+    "result": "aux_flamer",
+    "obsolete": true
   }
 ]
diff --git a/data/json/recipes/recipe_weapon.json b/data/json/recipes/recipe_weapon.json
@@ -1180,28 +1180,6 @@
     "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [ [ [ "pipe", 2 ] ], [ [ "duct_tape", 75 ] ], [ [ "nail", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "aux_flamer",
-    "category": "CC_WEAPON",
-    "subcategory": "CSC_WEAPON_MODS",
-    "skill_used": "mechanics",
-    "skills_required": [ "fabrication", 3 ],
-    "difficulty": 6,
-    "time": "18 m",
-    "reversible": true,
-    "decomp_learn": 5,
-    "autolearn": true,
-    "book_learn": [ [ "book_icef", 4 ] ],
-    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ],
-    "components": [
-      [ [ "duct_tape", 50 ] ],
-      [ [ "pilot_light", 1 ] ],
-      [ [ "pipe", 1 ] ],
-      [ [ "hose", 2 ] ],
-      [ [ "metal_tank_little", 1 ] ]
-    ]
-  },
   {
     "type": "recipe",
     "result": "combatsaw_off",