Start obsoleting microreactor CBMs

data/json/bionics.json

@@ -18,16 +18,6 @@
     "react_cost": 10,
     "time": 1
   },
-  {
-    "id": "bio_advreactor",
-    "type": "bionic",
-    "name": "Advanced Microreactor System",
-    "description": "This stripped down mini-reactor is more efficient and safer than the base model due to integrated radiation cleansers.  There is no way to shut it down once active, but you can toggle additional fuel intake.",
-    "occupied_bodyparts": [ [ "TORSO", 55 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "included_bionics": [ "bio_plutdump" ],
-    "upgraded_bionic": "bio_reactor"
-  },
   {
     "id": "bio_alarm",
     "type": "bionic",
@@ -693,25 +683,6 @@
     "occupied_bodyparts": [ [ "HEAD", 2 ] ],
     "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
   },
-  {
-    "id": "bio_plut_filter",
-    "type": "bionic",
-    "name": "Plutonium Filter",
-    "description": "This set of tanks and filters allows you to extract plutonium from radioactive slurry.",
-    "occupied_bodyparts": [ [ "TORSO", 10 ] ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "act_cost": 1,
-    "react_cost": 1,
-    "time": 12
-  },
-  {
-    "id": "bio_plutdump",
-    "type": "bionic",
-    "name": "Plutonium Purger",
-    "included": true,
-    "description": "Triggers an emergency reactor fuel purge that ejects all fuel from your reactor.",
-    "act_cost": 1
-  },
   {
     "id": "bio_pokedeye",
     "type": "bionic",
@@ -814,15 +785,6 @@
     "fake_item": "fake_razor",
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
-  {
-    "id": "bio_reactor",
-    "type": "bionic",
-    "name": "Microreactor System",
-    "description": "This stripped down mini-reactor generates impressive amounts of bionic power.  There is no way to shut it down, but you can toggle additional fuel intake.  Irradiates your body when active.",
-    "occupied_bodyparts": [ [ "TORSO", 55 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
-    "included_bionics": [ "bio_plutdump" ]
-  },
   {
     "id": "bio_recycler",
     "type": "bionic",

data/json/items/bionics.json

@@ -50,15 +50,6 @@
     "weight": 1000,
     "difficulty": 7
   },
-  {
-    "id": "bio_advreactor",
-    "copy-from": "bionic_general_npc_usable",
-    "type": "BIONIC_ITEM",
-    "name": "Advanced Microreactor CBM",
-    "description": "This module upgrades a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.",
-    "price": 900000,
-    "difficulty": 13
-  },
   {
     "id": "bio_alarm",
     "copy-from": "bionic_general",
@@ -594,16 +585,6 @@
     "weight": 300,
     "difficulty": 4
   },
-  {
-    "id": "bio_plut_filter",
-    "copy-from": "bionic_general_npc_usable",
-    "type": "BIONIC_ITEM",
-    "name": "Plutonium Filter CBM",
-    "description": "A system of tanks and filters that are connected to a microreactor to extract plutonium from radioactive slurry.",
-    "price": 60000,
-    "weight": 1000,
-    "difficulty": 6
-  },
   {
     "id": "bio_power_armor_interface",
     "copy-from": "bionic_general",
@@ -694,26 +675,6 @@
     "weight": 5,
     "difficulty": 4
   },
-  {
-    "id": "bio_reactor",
-    "copy-from": "bionic_general_npc_usable",
-    "type": "BIONIC_ITEM",
-    "name": "Internal Microreactor CBM",
-    "description": "This stripped down mini-reactor will generate impressive amounts of bionic power, but may not be the safest thing to install.  Once active, it cannot be shut down and will slowly contaminate the user's body with radiation.",
-    "price": 900000,
-    "difficulty": 11
-  },
-  {
-    "id": "bio_reactor_upgrade",
-    "bionic_id": "bio_advreactor",
-    "copy-from": "bionic_general_npc_usable",
-    "type": "BIONIC_ITEM",
-    "name": "Microreactor Upgrade CBM",
-    "description": "A kit for upgrading a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.",
-    "price": 250000,
-    "difficulty": 11,
-    "is_upgrade": true
-  },
   {
     "id": "bio_recycler",
     "copy-from": "bionic_general_npc_usable",

data/json/items/obsolete.json

@@ -391,5 +391,45 @@
     "durability": 6,
     "relative": { "reload": 2 },
     "magazines": [ [ "flammable", [ "aux_pressurized_tank", "pressurized_tank" ] ] ]
-  }
+  },
+  {
+    "id": "bio_advreactor",
+    "copy-from": "bionic_general_npc_usable",
+    "type": "BIONIC_ITEM",
+    "name": "Advanced Microreactor CBM",
+    "description": "This module upgrades a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.",
+    "price": 900000,
+    "difficulty": 13
+  },
+  {
+    "id": "bio_plut_filter",
+    "copy-from": "bionic_general_npc_usable",
+    "type": "BIONIC_ITEM",
+    "name": "Plutonium Filter CBM",
+    "description": "A system of tanks and filters that are connected to a microreactor to extract plutonium from radioactive slurry.",
+    "price": 60000,
+    "weight": 1000,
+    "difficulty": 6
+  },
+  {
+    "id": "bio_reactor",
+    "copy-from": "bionic_general_npc_usable",
+    "type": "BIONIC_ITEM",
+    "name": "Internal Microreactor CBM",
+    "description": "This stripped down mini-reactor will generate impressive amounts of bionic power, but may not be the safest thing to install.  Once active, it cannot be shut down and will slowly contaminate the user's body with radiation.",
+    "price": 900000,
+    "difficulty": 11
+  },
+  {
+    "id": "bio_reactor_upgrade",
+    "bionic_id": "bio_advreactor",
+    "copy-from": "bionic_general_npc_usable",
+    "type": "BIONIC_ITEM",
+    "name": "Microreactor Upgrade CBM",
+    "description": "A kit for upgrading a pre-installed microreactor with enhanced maximum yield and limited automatic radiation scrubbing capabilities.",
+    "price": 250000,
+    "difficulty": 11,
+    "is_upgrade": true
+  },
+
 ]

data/json/npcs/TALK_ALLY_TUTORIAL.json

@@ -111,7 +111,7 @@
   {
     "id": "TALK_ALLY_TUTORIAL_CBMS",
     "type": "talk_topic",
-    "dynamic_line": "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n  Find a programmable surgical installer or autodoc, position me on the couch, and activate it, and you can install a suitable CBM to me - or if I think I'll do a better job, I'll do.  I'll take over installing CBMs into you if I'm better at it.\n  I can use almost all passive bionics and some active bionics.  If I have any active bionics, I'll try to use them sensibly, but if we're in danger, I'm going to activate anything that might give me an edge.  I'll use any weapon bionics if they're better than the weapons you gave me, but if you think I should reserve my bionic energy for my defensive and healing bionics, you can tell me how much to reserve.  I'll try to keep my bionic energy topped off, but if we're running low on supplies, you can tell me to stop recharging when I'm not full.\n  I'll tell you if I'm low on bionic energy and can't recharge, and what fuel I need.\n  Sothere are some internal atomic reactor bionics - I can use those, but I can only recharge them with plutonium slurry.  That stuff is radioactive, so do us both a favor and don't give me an internal reactor unless you really like glowing in the dark.",
+    "dynamic_line": "Bionics are augmentation packages, right?  They come in these installable Compact Bionic Modules or CBMs, and I can use some CBMs - if you examine a CBM, it will tell you if I can use it.\n  Find a programmable surgical installer or autodoc, position me on the couch, and activate it, and you can install a suitable CBM to me - or if I think I'll do a better job, I'll do.  I'll take over installing CBMs into you if I'm better at it.\n  I can use almost all passive bionics and some active bionics.  If I have any active bionics, I'll try to use them sensibly, but if we're in danger, I'm going to activate anything that might give me an edge.  I'll use any weapon bionics if they're better than the weapons you gave me, but if you think I should reserve my bionic energy for my defensive and healing bionics, you can tell me how much to reserve.  I'll try to keep my bionic energy topped off, but if we're running low on supplies, you can tell me to stop recharging when I'm not full.\n  I'll tell you if I'm low on bionic energy and can't recharge, and what fuel I need.",
     "responses": [ { "text": "Tell me how I give you fuel for your bionics.", "topic": "TALK_ALLY_TUTORIAL_MULE" } ]
   },
   {

data/json/obsolete.json

@@ -1,4 +1,42 @@
 [
+  {
+    "id": "bio_advreactor",
+    "type": "bionic",
+    "name": "Advanced Microreactor System",
+    "description": "This stripped down mini-reactor is more efficient and safer than the base model due to integrated radiation cleansers.  There is no way to shut it down once active, but you can toggle additional fuel intake.",
+    "occupied_bodyparts": [ [ "TORSO", 55 ] ],
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "included_bionics": [ "bio_plutdump" ],
+    "upgraded_bionic": "bio_reactor"
+  },
+  {
+    "id": "bio_plut_filter",
+    "type": "bionic",
+    "name": "Plutonium Filter",
+    "description": "This set of tanks and filters allows you to extract plutonium from radioactive slurry.",
+    "occupied_bodyparts": [ [ "TORSO", 10 ] ],
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "act_cost": 1,
+    "react_cost": 1,
+    "time": 12
+  },
+  {
+    "id": "bio_plutdump",
+    "type": "bionic",
+    "name": "Plutonium Purger",
+    "included": true,
+    "description": "Triggers an emergency reactor fuel purge that ejects all fuel from your reactor.",
+    "act_cost": 1
+  },
+  {
+    "id": "bio_reactor",
+    "type": "bionic",
+    "name": "Microreactor System",
+    "description": "This stripped down mini-reactor generates impressive amounts of bionic power.  There is no way to shut it down, but you can toggle additional fuel intake.  Irradiates your body when active.",
+    "occupied_bodyparts": [ [ "TORSO", 55 ] ],
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
+    "included_bionics": [ "bio_plutdump" ]
+  },
   {
     "id": "bio_furnace",
     "type": "bionic",

data/json/recipes/recipe_ammo.json

@@ -20,32 +20,6 @@
       [ [ "chem_rocket_fuel", 1750 ] ]
     ]
   },
-  {
-    "type": "recipe",
-    "result": "plut_slurry_dense",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_OTHER",
-    "skill_used": "fabrication",
-    "skills_required": [ "electronics", 7 ],
-    "difficulty": 8,
-    "time": "95 m",
-    "book_learn": [ [ "recipe_lab_elec", 10 ] ],
-    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "plut_cell", 1 ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ]
-  },
-  {
-    "type": "recipe",
-    "result": "plut_slurry",
-    "category": "CC_AMMO",
-    "subcategory": "CSC_AMMO_OTHER",
-    "skill_used": "fabrication",
-    "skills_required": [ "electronics", 7 ],
-    "difficulty": 8,
-    "time": "95 m",
-    "book_learn": [ [ "recipe_lab_elec", 10 ] ],
-    "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "HAMMER", "level": 2 } ],
-    "components": [ [ [ "plut_slurry_dense", 5 ] ], [ [ "water", 5 ], [ "water_clean", 5 ] ] ]
-  },
   {
     "type": "recipe",
     "result": "pebble",

data/json/recipes/recipe_obsolete.json

@@ -1810,5 +1810,35 @@
     "type": "recipe",
     "result": "years_old_newspaperuncraft",
     "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "bio_reactoruncraft",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "bio_plut_filteruncraft",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "bio_reactor_upgradeuncraft",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "bio_advreactoruncraft",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "plut_slurry_dense",
+    "obsolete": true
+  },
+  {
+    "type": "recipe",
+    "result": "plut_slurry",
+    "obsolete": true
   }
 ]

data/json/uncraft/cbm/cbm.json

@@ -45,48 +45,6 @@
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "components": [ [ [ "power_supply", 2 ] ], [ [ "amplifier", 2 ] ], [ [ "burnt_out_bionic", 1 ] ] ]
   },
-  {
-    "type": "uncraft",
-    "result": "bio_reactor",
-    "skill_used": "electronics",
-    "difficulty": 10,
-    "time": "500 s",
-    "using": [ [ "soldering_standard", 120 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "minireactor", 1 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "burnt_out_bionic", 1 ] ] ]
-  },
-  {
-    "type": "uncraft",
-    "result": "bio_plut_filter",
-    "skill_used": "electronics",
-    "difficulty": 10,
-    "time": "500 s",
-    "using": [ [ "soldering_standard", 80 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "tools": [ [ [ "laptop", -1 ], [ "control_laptop", -1 ] ] ],
-    "components": [ [ [ "bio_blood_filter", 1 ] ], [ [ "metal_tank_little", 1 ] ], [ [ "burnt_out_bionic", 1 ] ], [ [ "RAM", 1 ] ] ]
-  },
-  {
-    "type": "uncraft",
-    "result": "bio_reactor_upgrade",
-    "skill_used": "electronics",
-    "difficulty": 10,
-    "time": "500 s",
-    "using": [ [ "soldering_standard", 120 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "tools": [ [ [ "laptop", -1 ], [ "control_laptop", -1 ] ] ],
-    "components": [ [ [ "bio_radscrubber", 1 ] ], [ [ "bio_geiger", 1 ] ], [ [ "RAM", 1 ] ] ]
-  },
-  {
-    "type": "uncraft",
-    "result": "bio_advreactor",
-    "skill_used": "electronics",
-    "difficulty": 10,
-    "time": "50 s",
-    "using": [ [ "soldering_standard", 10 ] ],
-    "qualities": [ { "id": "SCREW", "level": 1 } ],
-    "components": [ [ [ "bio_reactor", 1 ] ], [ [ "bio_reactor_upgrade", 1 ] ] ]
-  },
   {
     "type": "uncraft",
     "result": "bio_ups",