Random cleanups part 1

data/json/emit.json

@@ -147,13 +147,6 @@
     "chance": 1,
     "qty": 25
   },
-  {
-    "id": "emit_acid_splash",
-    "type": "emit",
-    "//": "Small amount of strong acid - stacks, but weak on its own",
-    "field": "fd_acid",
-    "intensity": 3
-  },
   {
     "id": "emit_acid_drop",
     "type": "emit",
@@ -248,14 +241,6 @@
     "intensity": 3,
     "qty": 100
   },
-  {
-    "id": "emit_hot_air4_blast",
-    "type": "emit",
-    "field": "fd_hot_air4",
-    "//": "Makes the surrounding area extremely, uncomfortably hot.",
-    "intensity": 3,
-    "qty": 300
-  },
   {
     "id": "emit_heater_vehicle",
     "type": "emit",
@@ -272,34 +257,6 @@
     "qty": 3,
     "chance": 100
   },
-  {
-    "id": "emit_hot_air1_cbm",
-    "type": "emit",
-    "field": "fd_hot_air1",
-    "intensity": 3,
-    "qty": 1
-  },
-  {
-    "id": "emit_hot_air2_cbm",
-    "type": "emit",
-    "field": "fd_hot_air2",
-    "intensity": 3,
-    "qty": 1
-  },
-  {
-    "id": "emit_hot_air3_cbm",
-    "type": "emit",
-    "field": "fd_hot_air3",
-    "intensity": 3,
-    "qty": 1
-  },
-  {
-    "id": "emit_hot_air4_cbm",
-    "type": "emit",
-    "field": "fd_hot_air4",
-    "intensity": 3,
-    "qty": 1
-  },
   {
     "id": "emit_hot_air_migo_seep",
     "type": "emit",

data/json/enchantments.json

@@ -49,15 +49,6 @@
     "condition": "ALWAYS",
     "values": [ { "value": "FOOTSTEP_NOISE", "multiply": 3 } ]
   },
-  {
-    "id": "ench_climate_control_cold",
-    "type": "enchantment",
-    "name": { "str": "Warm Climate Control" },
-    "description": "You are wearing equipment that helps handle harsh climates.",
-    "has": "WORN",
-    "condition": "ALWAYS",
-    "values": [ { "value": "CLIMATE_CONTROL_CHILL", "add": 50 } ]
-  },
   {
     "id": "ench_climate_control_warm",
     "type": "enchantment",

data/json/furniture_and_terrain/furniture-emitters.json

@@ -70,24 +70,6 @@
     "color": "red",
     "emissions": [ "emit_hot_air2_blast" ]
   },
-  {
-    "type": "furniture",
-    "id": "f_vent_smoke_plume",
-    "description": "A metal vent.  You can see smoke seeping from it.",
-    "copy-from": "f_vent_cold_air2_stream",
-    "symbol": "~",
-    "color": "white",
-    "emissions": [ "emit_smoke_plume" ]
-  },
-  {
-    "type": "furniture",
-    "id": "f_vent_smoke_stream",
-    "description": "A metal vent.  You can see smoke streaming out of it.",
-    "copy-from": "f_vent_cold_air2_stream",
-    "symbol": "~",
-    "color": "white",
-    "emissions": [ "emit_smoke_stream" ]
-  },
   {
     "type": "furniture",
     "id": "f_vent_toxic_leak",
@@ -115,15 +97,6 @@
     "color": "green",
     "emissions": [ "emit_rad_leak" ]
   },
-  {
-    "type": "furniture",
-    "id": "f_vent_rad_cloud",
-    "description": "A metal vent.",
-    "copy-from": "f_vent_cold_air2_stream",
-    "symbol": "~",
-    "color": "green",
-    "emissions": [ "emit_rad_cloud" ]
-  },
   {
     "type": "furniture",
     "id": "f_fog_breather",

data/json/furniture_and_terrain/furniture-industrial.json

@@ -1,48 +1,4 @@
 [
-  {
-    "type": "furniture",
-    "id": "f_robotic_assembler",
-    "name": "robotic assembler",
-    "looks_like": "f_robotic_arm",
-    "description": "A durable and versatile robotic arm with a tool fitted to the end, for working on an assembly line.  Despite its specialized purpose being all but lost now, it could provide a plethora of useful parts if disassembled.",
-    "symbol": "3",
-    "color": "magenta_cyan",
-    "move_cost_mod": -1,
-    "coverage": 35,
-    "required_str": -1,
-    "bash": {
-      "str_min": 40,
-      "str_max": 150,
-      "sound_fail": "clang!",
-      "items": [
-        { "item": "processor", "count": [ 1, 2 ] },
-        { "item": "RAM", "count": [ 4, 8 ] },
-        { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
-        { "item": "e_scrap", "count": [ 5, 8 ] },
-        { "item": "circuit", "count": [ 3, 5 ] },
-        { "item": "power_supply", "count": [ 1, 2 ] },
-        { "item": "amplifier", "count": [ 1, 2 ] },
-        { "item": "plastic_chunk", "count": [ 10, 12 ] },
-        { "item": "scrap", "count": [ 6, 8 ] }
-      ]
-    },
-    "deconstruct": {
-      "items": [
-        { "item": "processor", "count": [ 2, 4 ] },
-        { "item": "RAM", "count": [ 8, 16 ] },
-        { "item": "cable", "charges": [ 8, 12 ] },
-        { "item": "small_lcd_screen", "count": [ 2, 4 ] },
-        { "item": "e_scrap", "count": [ 10, 16 ] },
-        { "item": "circuit", "count": [ 6, 10 ] },
-        { "item": "power_supply", "count": [ 2, 4 ] },
-        { "item": "amplifier", "count": [ 2, 4 ] },
-        { "item": "plastic_chunk", "count": [ 10, 12 ] },
-        { "item": "scrap", "count": [ 6, 8 ] },
-        { "item": "motor_small", "count": [ 0, 1 ] }
-      ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_chemical_mixer",

data/json/furniture_and_terrain/furniture-tools.json

@@ -145,54 +145,6 @@
       ]
     }
   },
-  {
-    "type": "furniture",
-    "id": "f_console_table",
-    "name": "computer console",
-    "looks_like": "t_console",
-    "description": "A standalone computer terminal, the screen glowing with dim artificial light.  If examined closely, you can read what's on the screen and perform any allowed functions.  It might even be possible to hack it, given the skills.",
-    "symbol": "6",
-    "color": "blue",
-    "move_cost_mod": -1,
-    "coverage": 50,
-    "required_str": -1,
-    "light_emitted": 10,
-    "flags": [ "TRANSPARENT", "CONSOLE", "NOITEM", "INDOORS", "SHORT", "PERMEABLE" ],
-    "deconstruct": {
-      "furn_set": "f_table",
-      "items": [
-        { "item": "processor", "count": [ 1, 2 ] },
-        { "item": "RAM", "count": [ 4, 8 ] },
-        { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "large_lcd_screen", "count": 1 },
-        { "item": "e_scrap", "count": [ 10, 16 ] },
-        { "item": "circuit", "count": [ 6, 10 ] },
-        { "item": "power_supply", "count": [ 2, 4 ] },
-        { "item": "amplifier", "count": [ 2, 4 ] },
-        { "item": "plastic_chunk", "count": [ 10, 12 ] },
-        { "item": "scrap", "count": [ 6, 8 ] }
-      ]
-    },
-    "bash": {
-      "str_min": 8,
-      "str_max": 150,
-      "sound": "crunch!",
-      "sound_fail": "whack!",
-      "furn_set": "f_console_broken_table",
-      "items": [
-        { "item": "processor", "prob": 25 },
-        { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
-        { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "large_lcd_screen", "prob": 25 },
-        { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
-        { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
-        { "item": "power_supply", "prob": 25 },
-        { "item": "amplifier", "prob": 25 },
-        { "item": "plastic_chunk", "count": [ 4, 10 ], "prob": 50 },
-        { "item": "scrap", "count": [ 2, 6 ], "prob": 50 }
-      ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_forge",

data/json/furniture_and_terrain/furniture_vitrified.json

@@ -522,27 +522,6 @@
     "examine_action": "workbench",
     "workbench": { "multiplier": 1.1, "mass": 2000, "volume": "75L" }
   },
-  {
-    "type": "furniture",
-    "id": "f_vitrified_rack_coat",
-    "name": "black glass coat rack",
-    "description": "A tall glass pole with a set of hooks, on which rigid, shapeless masses are draped.",
-    "symbol": "Y",
-    "color": "dark_gray",
-    "move_cost_mod": -1,
-    "coverage": 30,
-    "required_str": 4,
-    "flags": [ "TRANSPARENT", "BLOCKSDOOR", "MOUNTABLE" ],
-    "deconstruct": { "items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ] },
-    "max_volume": "30 L",
-    "bash": {
-      "str_min": 6,
-      "str_max": 30,
-      "sound": "glass shattering!",
-      "sound_fail": "clink.",
-      "items": [ { "item": "black_glass_shard", "count": [ 40, 80 ] } ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_vitrified_planter",

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -1468,27 +1468,6 @@
     },
     "flags": [ "TRANSPARENT", "FLAMMABLE", "THIN_OBSTACLE", "INDOORS", "MOUNTABLE", "EASY_DECONSTRUCT" ]
   },
-  {
-    "type": "furniture",
-    "id": "f_standing_pressure_tank",
-    "name": "standing propane tank",
-    "description": "A huge metal tank that can be used to safely store large amounts of propane.",
-    "symbol": "O",
-    "color": "light_gray",
-    "move_cost_mod": -1,
-    "coverage": 90,
-    "required_str": -1,
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ],
-    "examine_action": "gaspump",
-    "deconstruct": { "items": [ { "item": "large_propane_tank", "count": 3 } ] },
-    "bash": {
-      "str_min": 10,
-      "str_max": 20,
-      "sound": "metal screeching!",
-      "sound_fail": "clang!",
-      "items": [ { "item": "scrap", "count": [ 8, 32 ] } ]
-    }
-  },
   {
     "type": "terrain",
     "id": "t_brick_oven_base",

data/json/itemgroups/tools.json

@@ -51,7 +51,9 @@
       { "group": "tools_toolbox", "prob": 20 },
       { "group": "tools_workshop", "prob": 5 },
       [ "recharge_station", 10 ],
-      { "item": "angle_grinder", "prob": 30, "charges": [ 0, 500 ] }
+      { "item": "angle_grinder", "prob": 30, "charges": [ 0, 500 ] },
+      { "item": "grinder_cutoff_disc", "prob": 15 },
+      { "item": "grinder_metal_grinding_disc", "prob": 15 }
     ]
   },
   {
@@ -365,6 +367,7 @@
       { "item": "tinyweldtank", "prob": 60, "count": [ 1, 3 ] },
       { "item": "polisher", "prob": 70, "charges": [ 0, 100 ] },
       { "item": "angle_grinder", "prob": 5, "charges": [ 0, 500 ] },
+      { "item": "grinder_cutoff_disc", "prob": 2 },
       { "item": "welder", "prob": 10, "charges": [ 0, 500 ] },
       { "item": "small_propane_tank", "prob": 10, "count": [ 1, 5 ], "charges": [ 1000, 3000 ] },
       { "item": "medium_propane_tank", "prob": 20, "count": [ 1, 3 ], "charges": [ 5000, 15000 ] },
@@ -848,6 +851,8 @@
       { "item": "corded_powerdrill", "prob": 30 },
       { "item": "circsaw_off", "prob": 10, "charges": [ 0, 500 ] },
       { "item": "angle_grinder", "prob": 20, "charges": [ 0, 500 ] },
+      { "item": "grinder_cutoff_disc", "prob": 10 },
+      { "item": "grinder_metal_grinding_disc", "prob": 10 },
       { "item": "masonrysaw_off", "prob": 50, "charges": [ 0, 450 ] },
       { "item": "electric_masonrysaw_off", "prob": 50, "charges": [ 0, 495 ] }
     ]

data/json/items/generic.json

@@ -231,15 +231,6 @@
     "weight": "10 g",
     "volume": "50 ml"
   },
-  {
-    "type": "GENERIC",
-    "id": "nre_zero_reading_printout",
-    "copy-from": "small_printout_portal_storm_data",
-    "name": { "str": "NRE zero reading" },
-    "description": "A long near uniform sequence of evenly spaced zeroes plotted in thermal paper.  The monotony is rarely broken by small numbered series.",
-    "weight": "10 g",
-    "volume": "50 ml"
-  },
   {
     "type": "GENERIC",
     "id": "fp_loyalty_card",

data/json/items/gunmod/rail.json

@@ -28,14 +28,6 @@
     "flags": [ "NON_FOULING" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "bolt": 1 } } ]
   },
-  {
-    "id": "gun_crossbow_mod",
-    "copy-from": "gun_crossbow",
-    "type": "GUNMOD",
-    "name": { "str": "modified rail-mounted crossbow" },
-    "description": "A kit to attach a pair of crossbow arms and a firing rail to the barrel of a long firearm.  It allows crossbow bolts to be fired.  This one was modified and customized to mount on pretty much any weapon other than pistols and SMGs, if you so want.",
-    "mod_targets": [ "rifle", "shotgun", "launcher", "crossbow" ]
-  },
   {
     "id": "offset_sights",
     "copy-from": "improve_sights",

data/json/items/resources/tailoring.json

@@ -85,7 +85,7 @@
     "id": "scrap_lycra",
     "copy-from": "scrap_cotton",
     "type": "GENERIC",
-    "name": { "str_sp": "Lycra scraps" },
+    "name": { "str_sp": "lycra scraps" },
     "description": "A handful of oddly-shaped smallish bits of Lycra, waste material from tailoring projects.  Not useful for much and usually disposed of.",
     "price": 0,
     "volume": "4 ml",

data/json/mapgen/vitrification/vitrified_farm.json

@@ -471,7 +471,8 @@
           "f_glassedbody_7",
           "f_glassedbody_8",
           "f_glassedbody_9",
-          "f_glassedbody_10"
+          "f_glassedbody_10",
+          "f_glassedbody_11"
         ]
       }
     }