Merge pull request #34775 from CleverRaven/revert-34755-add-tele_sigh…

…t-to-itemgroups Revert "add tele_sight to itemgroups"
CleverRaven · Oct 15, 2019 · c7ef9a0 · c7ef9a0
2 parents 29c6db5 + 83c0755
commit c7ef9a0
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 6 deletions.
diff --git a/data/json/itemgroups/gunmod.json b/data/json/itemgroups/gunmod.json
@@ -6,7 +6,6 @@
     "items": [
       [ "brass_catcher", 100 ],
       [ "improve_sights", 60 ],
-      [ "tele_sight", 40 ],
       [ "muzzle_brake", 20 ],
       [ "pistol_grip", 30 ],
       [ "rifle_scope", 30 ],

diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -7346,7 +7346,6 @@
       [ "8mm_fmj", 2 ],
       [ "laser_rifle", 1 ],
       [ "rm103a_pistol", 1 ],
-      [ "tele_sight", 17 ],
       [ "laser_sight", 15 ],
       [ "rail_laser_sight", 10 ],
       [ "8mm_inc", 2 ],
@@ -7715,7 +7714,6 @@
       [ "mininuke", 1 ],
       [ "crack", 8 ],
       [ "crackpipe", 37 ],
-      [ "tele_sight", 17 ],
       [ "laser_sight", 15 ],
       [ "rail_laser_sight", 10 ],
       [ "lsd", 10 ],

diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json
@@ -144,7 +144,6 @@
       [ "rifle_scope", 20 ],
       [ "pistol_scope", 10 ],
       [ "improve_sights", 20 ],
-      [ "tele_sight", 15 ],
       [ "combatsaw_off", 5 ],
       [ "firemachete_off", 5 ],
       [ "shishkebab_off", 5 ],

diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -625,7 +625,6 @@
       [ "howto_traps", 2 ],
       [ "imperial_stout", 2 ],
       [ "improve_sights", 1 ],
-      [ "tele_sight", 1 ],
       [ "india_pale_ale", 2 ],
       [ "inhaler", 5 ],
       [ "iodine", 5 ],

diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
@@ -198,7 +198,6 @@
       [ "arrow_metal", 25 ],
       [ "bolt_steel", 10 ],
       [ "laser_sight", 15 ],
-      [ "tele_sight", 20 ],
       [ "rail_laser_sight", 10 ],
       [ "rifle_scope", 20 ],
       [ "pistol_scope", 10 ],