Fix riot turret oversights

data/json/items/ammo/40x46mm.json

@@ -107,17 +107,6 @@
     "recoil": 1000,
     "casing": "40x46mm_m118_casing"
   },
-  {
-    "id": "40x46mm_sponge",
-    "copy-from": "40x46mm_grenade",
-    "type": "AMMO",
-    "name": "40x46mm sponge",
-    "description": "A 40mm sponge round that delivers strong impact on target, causing pain and disorientation.  May still injure or kill.",
-    "price": 5000,
-    "price_postapoc": 10000,
-    "damage": 5,
-    "extend": { "effects": [ "BEANBAG" ] }
-  },
   {
     "id": "40x46mm_slug_m199",
     "copy-from": "40x46mm_grenade",

data/json/items/corpses/inactive_bots.json

@@ -273,7 +273,7 @@
     "id": "bot_turret_riot",
     "type": "TOOL",
     "name": "inactive riot control turret",
-    "description": "This is an inactive riot control turret.  Using this item involves loading the unit with the factory-loaded beanbag rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself.  If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.",
+    "description": "This is an inactive riot control turret.  Using this item involves loading the unit with the 40x46mm M1006 sponge rounds in your inventory (if you wish to divide your ammunition, set aside whatever beanbag rounds you do NOT want to give the turret) turning it on, and placing it on the ground, where it will attach itself.  If programmed successfully the turret will then identify you as a friendly, and attack all enemies with its riot control gun.",
     "weight": "125000 g",
     "volume": "60 L",
     "price": 200500,

data/json/items/gun/40x46mm.json

@@ -155,7 +155,7 @@
     "looks_like": "m203",
     "type": "GUN",
     "name": "M203 array",
-    "description": "Six M203 grenade launchers for use on an automated 40mm turret.",
+    "description": "An array of six M203 grenade launchers for use on the TALON UGV platform.",
     "weight": "8200 g",
     "volume": "4 L",
     "price": 250000,
@@ -169,7 +169,7 @@
     "durability": 10,
     "reload": 400,
     "modes": [ [ "DEFAULT", "semi-auto", 1, "NPC_AVOID" ] ],
-    "clip_size": 16,
+    "clip_size": 6,
     "flags": [ "MOUNTED_GUN" ]
   }
 ]

data/json/monsters/turrets.json

@@ -230,7 +230,7 @@
     "id": "mon_turret_riot",
     "type": "MONSTER",
     "name": "riot control platform",
-    "description": "These six-wheeled riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs.  They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'.  In the days before the cataclysm, massive stockrooms of the things were put into circulation.  On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.",
+    "description": "These TALON-derived riot control platforms were widely publicized a few years before the cataclysm as a new semi-autonomous device that could fire less-lethal rounds with far more accuracy than a human, ensuring safer hits against a target's limbs.  They were quickly adopted by prisons and inner city police forces, where they demonstrated that 'less lethal' is not the same as 'non-lethal'.  In the days before the cataclysm, massive stockrooms of the things were put into circulation.  On the bright side, although it shoots autonomously, it requires a human operator to relocate, so it's not so mobile anymore.",
     "default_faction": "cop_bot",
     "looks_like": "mon_turret",
     "species": [ "ROBOT" ],
@@ -250,15 +250,15 @@
     "vision_day": 50,
     "vision_night": 3,
     "revert_to_itype": "bot_turret_riot",
-    "starting_ammo": { "40x46mm_sponge": 100 },
+    "starting_ammo": { "40x46mm_m1006": 6 },
     "special_attacks": [
       {
         "//": "For later: needs the ability to preferentially target legs and arms",
         "type": "gun",
         "cooldown": 1,
         "move_cost": 150,
         "gun_type": "pseudo_m203",
-        "ammo_type": "40x46mm_sponge",
+        "ammo_type": "40x46mm_m1006",
         "fake_skills": [ [ "gun", 8 ], [ "rifle", 8 ] ],
         "fake_dex": 12,
         "ranges": [ [ 0, 30, "DEFAULT" ] ],

data/json/recipes/recipe_deconstruction.json

@@ -825,7 +825,7 @@
       [ [ "targeting_module", 1 ] ],
       [ [ "identification_module", 1 ] ],
       [ [ "sensor_module", 1 ] ],
-      [ [ "m203", 16 ] ],
+      [ [ "m203", 6 ] ],
       [ [ "small_storage_battery", 1 ] ],
       [ [ "power_supply", 3 ] ],
       [ [ "antenna", 1 ] ],

src/map_extras.cpp

@@ -103,9 +103,7 @@ static const mtype_id mon_marloss_zealot_f( "mon_marloss_zealot_f" );
 static const mtype_id mon_marloss_zealot_m( "mon_marloss_zealot_m" );
 static const mtype_id mon_zombie_smoker( "mon_zombie_smoker" );
 static const mtype_id mon_zombie_scientist( "mon_zombie_scientist" );
-static const mtype_id mon_chickenbot( "mon_chickenbot" );
 static const mtype_id mon_dispatch( "mon_dispatch" );
-static const mtype_id mon_tankbot( "mon_tankbot" );
 static const mtype_id mon_turret_bmg( "mon_turret_bmg" );
 static const mtype_id mon_turret_rifle( "mon_turret_rifle" );
 static const mtype_id mon_turret_riot( "mon_turret_riot" );