diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json
index 1133fd219fded..de382fb8a5d0b 100644
--- a/data/json/items/ammo.json
+++ b/data/json/items/ammo.json
@@ -1159,5 +1159,24 @@
     "weight": 1,
     "phase": "gas",
     "ammo_type": "nitrox"
+  },
+  {
+    "id": "tinder",
+    "type": "AMMO",
+    "category": "spare_parts",
+    "name": "tinder",
+    "name_plural": "tinder",
+    "description": "Flammable material, finely divided for easy combustion.",
+    "weight": 10,
+    "volume": 1,
+    "price": 0,
+    "bashing": 1,
+    "material": "wood",
+    "flags": [ "NO_SALVAGE" ],
+    "symbol": "=",
+    "color": "brown",
+    "count": 50,
+    "ammo_type": "tinder",
+    "effects": [ "NEVER_MISFIRES" ]
   }
 ]
diff --git a/data/json/items/ammo_types.json b/data/json/items/ammo_types.json
index 0962423648106..40bc129ecfcd8 100644
--- a/data/json/items/ammo_types.json
+++ b/data/json/items/ammo_types.json
@@ -496,5 +496,11 @@
     "id": "nitrox",
     "name": "compressed air",
     "default": "nitrox"
+  },
+  {
+    "id": "tinder",
+    "name": "tinder",
+    "default": "tinder",
+    "type": "ammunition_type"
   }
 ]
diff --git a/data/json/items/tools.json b/data/json/items/tools.json
index 7ff5cb55ef6f7..57aff79b79b55 100644
--- a/data/json/items/tools.json
+++ b/data/json/items/tools.json
@@ -8762,5 +8762,64 @@
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
     "use_action": "HEAT_FOOD",
     "flags": [ "ALLOWS_REMOTE_USE" ]
+  },
+  {
+    "id": "hobo_stove",
+    "type": "TOOL",
+    "name": "hobo stove",
+    "description": "This is a small improvised wood stove, made from a metal can or similar container of the right size.  Useful for defrosting and reheating food, uses simple tinder.",
+    "weight": 1366,
+    "volume": 6,
+    "price": 0,
+    "to_hit": -1,
+    "bashing": 2,
+    "material": "steel",
+    "symbol": ",",
+    "color": "light_gray",
+    "ammo": "tinder",
+    "max_charges": 100,
+    "charges_per_use": 25,
+    "use_action": [
+      {
+        "target": "hobo_stove_on",
+        "msg": "The hobo stove is lit.",
+        "need_fire": 1,
+        "need_fire_msg": "You need a source of fire!",
+        "active": false,
+        "menu_text": "Light",
+        "type": "transform"
+      }
+    ]
+  },
+  {
+    "id": "hobo_stove_on",
+    "type": "TOOL",
+    "name": "hobo stove (lit)",
+    "name_plural": "hobo stoves (lit)",
+    "description": "This is a small improvised wood stove, made from a metal can or similar container of the right size.  Useful for defrosting and reheating food, uses simple tinder.",
+    "weight": 1366,
+    "volume": 6,
+    "price": 0,
+    "to_hit": -1,
+    "bashing": 2,
+    "material": "steel",
+    "symbol": ",",
+    "color": "light_gray",
+    "ammo": "tinder",
+    "max_charges": 100,
+    "charges_per_use": 25,
+    "turns_per_charge": 300,
+    "revert_to": "hobo_stove",
+    "use_action": [
+      { "type": "HOTPLATE", "moves": 60, "msg": "You heat up the food.", "menu_text": "Heat up food" },
+      {
+        "target": "hobo_stove",
+        "msg": "The ember is extinguished.",
+        "active": false,
+        "menu_text": "Extinguish",
+        "type": "transform"
+      }
+    ],
+    "flags": [ "LIGHT_3", "ALLOWS_REMOTE_USE" ]
   }
 ]
diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json
index f20c9659cb586..d1025212aa744 100644
--- a/data/json/recipes/other/tool.json
+++ b/data/json/recipes/other/tool.json
@@ -163,5 +163,19 @@
     "autolearn": true,
     "qualities": [ { "id": "SAW_M_FINE", "level": 1 } ],
     "components": [ [ [ "wire", 4 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "hobo_stove",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "survival",
+    "skills_required": [ "fabrication", 1 ],
+    "difficulty": 2,
+    "time": 5000,
+    "autolearn": true,
+    "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ], [ "cookbook", 2 ] ],
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [ [ [ "can_food_unsealed", 2 ], [ "scrap", 4 ] ] ]
   }
 ]
diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json
index f605f54ad293b..2b4d62cdbcdda 100644
--- a/data/json/recipes/recipe_ammo.json
+++ b/data/json/recipes/recipe_ammo.json
@@ -884,5 +884,32 @@
     "qualities": [ { "id": "CHEM", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "components": [ [ [ "oxy_powder", 100 ] ], [ [ "lye_powder", 100 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "tinder",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_MATERIALS",
+    "skill_used": "survival",
+    "difficulty": 1,
+    "time": 1000,
+    "autolearn": true,
+    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "components": [
+      [
+        [ "stick", 1 ],
+        [ "2x4", 1 ],
+        [ "splinter", 2 ],
+        [ "pine_bough", 1 ],
+        [ "rag", 1 ],
+        [ "paper", 5 ],
+        [ "rolling_paper", 30 ],
+        [ "wrapper", 5 ],
+        [ "withered", 2 ],
+        [ "cattail_stalk", 1 ],
+        [ "birchbark", 1 ],
+        [ "willowbark", 1 ]
+      ]
+    ]
   }
 ]
diff --git a/data/mods/More_Survival_Tools/ammo.json b/data/mods/More_Survival_Tools/ammo.json
index fd6be015ea581..b96b7f03d1f02 100644
--- a/data/mods/More_Survival_Tools/ammo.json
+++ b/data/mods/More_Survival_Tools/ammo.json
@@ -1,26 +1,4 @@
 [
-  {
-    "id": "tinder",
-    "type": "AMMO",
-    "category": "spare_parts",
-    "name": "tinder",
-    "name_plural": "tinder",
-    "description": "Flammable material, finely divided for easy combustion.",
-    "weight": 10,
-    "volume": 1,
-    "price": 0,
-    "bashing": 1,
-    "material": "wood",
-    "flags": [ "NO_SALVAGE" ],
-    "symbol": "=",
-    "color": "brown",
-    "count": 50,
-    "ammo_type": "tinder",
-    "range": 0,
-    "damage": 0,
-    "dispersion": 0,
-    "effects": [ "NEVER_MISFIRES" ]
-  },
   {
     "id": "bearing_lead",
     "type": "AMMO",
diff --git a/data/mods/More_Survival_Tools/ammo_types.json b/data/mods/More_Survival_Tools/ammo_types.json
index 8c9f0eaab9010..8ae90f9f0f205 100644
--- a/data/mods/More_Survival_Tools/ammo_types.json
+++ b/data/mods/More_Survival_Tools/ammo_types.json
@@ -1,10 +1,4 @@
 [
-  {
-    "id": "tinder",
-    "name": "tinder",
-    "default": "tinder",
-    "type": "ammunition_type"
-  },
   {
     "id": "javelin",
     "name": "javelin",
diff --git a/data/mods/More_Survival_Tools/items.json b/data/mods/More_Survival_Tools/items.json
index 3b4669ef1da32..d0c9432607534 100644
--- a/data/mods/More_Survival_Tools/items.json
+++ b/data/mods/More_Survival_Tools/items.json
@@ -1,56 +1,4 @@
 [
-  {
-    "id": "hobo_stove",
-    "type": "TOOL",
-    "name": "hobo stove",
-    "description": "This is a small improvised wood stove, made from a metal can or similar container of the right size.  Useful for cooking, uses simple tinder.",
-    "weight": 1366,
-    "volume": 6,
-    "price": 0,
-    "to_hit": -1,
-    "bashing": 2,
-    "material": "steel",
-    "symbol": ",",
-    "color": "light_gray",
-    "ammo": "tinder",
-    "sub": "hotplate",
-    "max_charges": 50,
-    "charges_per_use": 1,
-    "use_action": [ "HOTPLATE", "HEAT_FOOD" ]
-  },
-  {
-    "id": "hobo_stove_on",
-    "type": "TOOL",
-    "name": "hobo stove (lit)",
-    "name_plural": "hobo stoves (lit)",
-    "//": "Dummied out due to reverting hobo stove behavior, to be consistent with existing items. -Chaosvolt",
-    "description": "This is a small improvised wood stove, made from a metal can or similar container of the right size.  Useful for cooking, uses simple tinder.",
-    "weight": 1366,
-    "volume": 6,
-    "price": 0,
-    "to_hit": -1,
-    "bashing": 2,
-    "material": "steel",
-    "symbol": ",",
-    "color": "light_gray",
-    "ammo": "tinder",
-    "sub": "hotplate",
-    "max_charges": 50,
-    "charges_per_use": 1,
-    "turns_per_charge": 300,
-    "revert_to": "hobo_stove",
-    "qualities": [ [ "COOK", 1 ] ],
-    "use_action": [
-      {
-        "target": "hobo_stove",
-        "msg": "The ember is extinguished.",
-        "active": false,
-        "menu_text": "Extinguish",
-        "type": "transform"
-      }
-    ],
-    "flags": [ "LIGHT_3" ]
-  },
   {
     "id": "flint_steel",
     "type": "TOOL",
diff --git a/data/mods/More_Survival_Tools/recipes.json b/data/mods/More_Survival_Tools/recipes.json
index 663a7ebdd9a2a..43ea5e1c74ba6 100644
--- a/data/mods/More_Survival_Tools/recipes.json
+++ b/data/mods/More_Survival_Tools/recipes.json
@@ -28,47 +28,6 @@
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "scrap", 2 ] ] ]
   },
-  {
-    "type": "recipe",
-    "result": "hobo_stove",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_TOOLS",
-    "skill_used": "survival",
-    "skills_required": [ "fabrication", 1 ],
-    "difficulty": 4,
-    "time": 5000,
-    "autolearn": true,
-    "book_learn": [ [ "mag_survival", 2 ], [ "textbook_survival", 1 ], [ "cookbook", 2 ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "can_drink_unsealed", 2 ], [ "can_food_unsealed", 2 ], [ "scrap", 4 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "tinder",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_MATERIALS",
-    "skill_used": "survival",
-    "difficulty": 1,
-    "time": 1000,
-    "autolearn": true,
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [
-      [
-        [ "stick", 1 ],
-        [ "2x4", 1 ],
-        [ "splinter", 2 ],
-        [ "pine_bough", 1 ],
-        [ "rag", 1 ],
-        [ "paper", 5 ],
-        [ "rolling_paper", 30 ],
-        [ "wrapper", 5 ],
-        [ "withered", 2 ],
-        [ "cattail_stalk", 1 ],
-        [ "birchbark", 1 ],
-        [ "willowbark", 1 ]
-      ]
-    ]
-  },
   {
     "type": "recipe",
     "result": "torch",