More readable gun names

data/json/items/gun/12mm.json

@@ -3,7 +3,7 @@
     "id": "hk_g80",
     "copy-from": "gun_base",
     "type": "GUN",
-    "name": "H&K G80 Railgun",
+    "name": "H&K G80 railgun",
     "description": "Developed by Heckler & Koch in the first quarter of 21st century, the railgun magnetically propels a ferromagnetic projectile using an alternating current.  Powered by UPS.",
     "weight": "3914 g",
     "volume": "2750 ml",

data/json/items/gun/20x66mm.json

@@ -73,7 +73,7 @@
     "id": "rm228",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "RM228 PDW",
+    "name": "RM228 pistol shotgun",
     "description": "Chambering the powerful 20x66mm caseless shotgun cartridge, the Rivtech RM228 PDW was designed for the civilian personal defense market with durability and ease of use as priorities.  While lauded for its small size and light weight, its hefty price tag kept it out of the reach of casual collectors.",
     "weight": "780 g",
     "volume": "750 ml",

data/json/items/gun/22.json

@@ -3,9 +3,8 @@
     "id": "american_180",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "American-180",
-    "name_plural": "American-180",
-    "description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.",
+    "name": "American-180 submachine gun",
+    "description": "A submachine gun developed in the 1960s that fires .22 LR, unusual for an SMG.  Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.",
     "weight": "1840 g",
     "volume": "1250 ml",
     "price": 163000,
@@ -43,8 +42,7 @@
     "id": "marlin_9a",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Marlin 39A",
-    "name_plural": "Marlin 39A",
+    "name": "Marlin 39A lever rifle",
     "description": "The oldest and longest-produced shoulder firearm in the world.  Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil.",
     "weight": "2948 g",
     "volume": "2500 ml",
@@ -83,8 +81,7 @@
     "id": "moss_brownie",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "Mossberg Brownie",
-    "name_plural": "Mossberg Brownie",
+    "name": "Mossberg Brownie pistol",
     "description": "The first gun produced by O.F. Mossberg & Sons.  A small pocket pistol, marketed to trappers during the early 20th century.  Its four barrels can accept .22 Short and .22 LR cartridges.",
     "weight": "130 g",
     "volume": "137ml",
@@ -192,8 +189,7 @@
     "id": "ruger_1022",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Ruger 10/22",
-    "name_plural": "Ruger 10/22",
+    "name": "Ruger 10/22 semi-auto rifle",
     "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters.  Even though it fires the weak .22 round, it's perfectly capable of killing.",
     "weight": "2220 g",
     "volume": "2500 ml",
@@ -232,8 +228,7 @@
     "id": "ruger_lcr_22",
     "copy-from": "ruger_lcr_38",
     "type": "GUN",
-    "name": "Ruger LCR .22",
-    "name_plural": "Ruger LCR .22",
+    "name": "Ruger LCR .22 revolver",
     "ammo": "22",
     "clip_size": 8,
     "magazines": [ [ "22", [ "22_speedloader8" ] ] ]
@@ -242,8 +237,7 @@
     "id": "sig_mosquito",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "SIG Mosquito",
-    "name_plural": "SIG Mosquito",
+    "name": "SIG Mosquito pistol",
     "description": "A popular, small .22 LR pistol.  One of the many polymer frame pistols produced during the latter 20th-early 21st centuries; it has an underbarrel rail.",
     "weight": "640 g",
     "volume": "250 ml",
@@ -280,8 +274,7 @@
     "id": "sw_22",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "S&W 22A",
-    "name_plural": "S&W 22A",
+    "name": "S&W 22A pistol",
     "description": "A popular .22 pistol.",
     "weight": "900 g",
     "volume": "500 ml",
@@ -301,8 +294,8 @@
     "id": "j22",
     "copy-from": "pistol_backup",
     "type": "GUN",
-    "name": "Jennings J-22",
-    "description": "One of the quintessential 'saturday night specials', the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame.  Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.",
+    "name": "Jennings J-22 pistol",
+    "description": "One of the quintessential \"Saturday-night specials\", the Jennings J-22 was very affordably priced with its injection molded zinc slide and frame.  Intended to fill the void left after small pocket pistols were banned from import, these were more commonly used by criminals unfazed by their glaring safety issues.",
     "weight": "340 g",
     "volume": "123ml",
     "price": 7000,
@@ -321,7 +314,7 @@
     "id": "walther_p22",
     "copy-from": "pistol_base",
     "type": "GUN",
-    "name": "Walther P22",
+    "name": "Walther P22 pistol",
     "description": "The Walther P22 is a blowback operated semi-automatic pistol. It is about half the size of most Walthers. It is made mostly with plastic, with the slide and key components being made of die-cast zinc alloy",
     "weight": "480 g",
     "volume": "263 ml",

data/json/items/gun/223.json

@@ -3,7 +3,7 @@
     "id": "acr",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "Remington ACR",
+    "name": "Remington ACR carbine",
     "description": "This carbine was developed for military use in the early 21st century.  It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
     "weight": "3495 g",
     "volume": "2 L",
@@ -27,9 +27,9 @@
     "id": "ar15",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": "AR-15",
+    "name": "AR-15 semi-auto rifle",
     "//": "This is assumed to be the standard model matching the (currently not in-game) M16.",
-    "description": "This ubiquitous rifle is the forefather of M16 rifle series.  It is lightweight and accurate, but will malfunction if not properly maintained.  This one is a semi automatic civilian version.",
+    "description": "This ubiquitous rifle is the forefather of M16 rifle series.  It is lightweight and accurate, but will malfunction if not properly maintained.  This one is a semi-automatic civilian version.",
     "weight": "2815 g",
     "volume": "2 L",
     "price": 125000,
@@ -48,7 +48,7 @@
     "id": "h&k416a5",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "HK416 A5",
+    "name": "HK416 A5 assault rifle",
     "//": "*Current* milspec gear is now ridiculously overpriced, as seen with the M2010 IRL.",
     "description": "Designed to replace the M4A1, the Heckler and Koch 416A5 features most of the former's strengths, while being considerably more durable.",
     "weight": "1920 g",
@@ -71,7 +71,7 @@
     "id": "hk_g36",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "H&K G36",
+    "name": "H&K G36 assault rifle",
     "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
     "weight": "3270 g",
     "volume": "2500 ml",
@@ -92,10 +92,9 @@
     "id": "l_bak_223",
     "copy-from": "pistol_revolver",
     "type": "GUN",
-    "name": "L2037 Backup",
-    "name_plural": "L2037 Backups",
+    "name": "L2037 Backup revolver",
     "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.",
-    "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products it doesn't accept third-party modifications.",
+    "description": "The logical extension of Leadworks' autorevolver series, this massive \"sidearm\" fires 5.56 NATO to share ammo with a soldier's rifle.  The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum.  Similar to other Leadworks products, it doesn't accept third-party modifications.",
     "weight": "2370 g",
     "volume": "750 ml",
     "price": 267000,
@@ -120,7 +119,7 @@
     "id": "l_base_223",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "L523 platform",
+    "name": "L523 platform rifle",
     "//": "Current milspec, so Expensive.",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The base mechanism could--theoretically--be used on its own, but such use is inadvisable and will void your warranty.  There's no real place to incorporate aftermarket modifications on this barren proto-weapon.",
     "weight": "2500 g",
@@ -143,7 +142,7 @@
     "id": "l_car_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-CAR carbine",
+    "name": "L523 carbine",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The carbine model incorporates Leadworks' proprietary gyro-stabilization technology and includes a red-dot sight and an integral laser sight.  Additionally it comes with underslung shotgun for close range encounters.  Like the rest of the family, doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
@@ -165,7 +164,7 @@
     "id": "l_dsr_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-DSR rifle",
+    "name": "L523 designated-shootist rifle",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The designated-shootist rifle incorporates a specially-designed extended barrel with integral bipod and foregrip, along with an integral 8x optic, and trades selective-fire for the Leadworks gyro-stabilization system.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 580000,
     "durability": 9,
@@ -189,7 +188,7 @@
     "id": "l_lmg_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-LMG",
+    "name": "L523 light machine gun",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The rather ambitious light machine gun variant incorporates ACOG scope, a heavy-duty barrel, foregrip, bipod and as well as the Leadworks gyro system.  Unlike the other configurations, the L523 LMG can be loaded with ammo belts.",
     "price": 620000,
     "durability": 9,
@@ -212,7 +211,7 @@
     "id": "l_mbr_223",
     "copy-from": "l_base_223",
     "type": "GUN",
-    "name": "L523-MBR rifle",
+    "name": "L523 battle rifle",
     "description": "Leadworks LLC's bullpup L523 platform utilizes the ubiquitous 5.56 round in multiple applications, and is designed to part-swap quickly, safely, and effectively from one to the next.  The battle rifle's (proprietary) combination optic & red-dot sights provide quick and accurate targeting, with Leadworks gyro-stabilization system and foregrip available for greater control.  Additionally it comes with grenade launcher module for dealing with hard targets.  Like the rest of the family, though, it doesn't accept third-party modifications.",
     "price": 520000,
     "durability": 9,
@@ -232,7 +231,7 @@
     "id": "m249",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "M249",
+    "name": "M249 machine gun",
     "description": "The M249 is a mountable machine gun used by the US military and SWAT teams.  Quite inaccurate and difficult to control, the M249 is designed to fire many rounds very quickly.",
     "weight": "6400 g",
     "volume": "3 L",
@@ -268,8 +267,8 @@
     "id": "m27iar",
     "copy-from": "h&k416a5",
     "type": "GUN",
-    "name": "M27 IAR",
-    "description": "A H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
+    "name": "M27 auto rifle",
+    "description": "The M27 Infantry Automatic Rifle (IAR), a H&K416 carbine outfitted with a heavier barrel to enable higher amounts of suppressive fire while retaining a good degree of mobility.",
     "weight": "3495 g",
     "burst": 13,
     "magazines": [ [ "223", [ "stanag30", "stanag50", "survivor223mag" ] ] ],
@@ -279,7 +278,7 @@
     "id": "m4a1",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "M4A1",
+    "name": "M4A1 carbine",
     "description": "A popular carbine, long used by the US military.  Though accurate, small, and lightweight, it is infamous for its unreliability when not properly maintained.",
     "weight": "2520 g",
     "volume": "1750 ml",
@@ -301,7 +300,7 @@
     "id": "m16a4",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": "M16A4",
+    "name": "M16A4 assault rifle",
     "description": "The M16 is a very common assault rifle descended from the AR-15, used by militaries across the world for over 50 years.  It is a gas operated, rotating bolt rifle known for its accuracy and controllable recoil.",
     "weight": "2890 g",
     "volume": "1750 ml",
@@ -360,7 +359,7 @@
     "id": "ruger_mini",
     "copy-from": "rifle_semi",
     "type": "GUN",
-    "name": "Ruger Mini-14",
+    "name": "Ruger Mini-14 carbine",
     "description": "A small, lightweight semi-auto carbine designed for civilian and police use.  Its superb accuracy and low recoil makes it more suitable than full-auto rifles for some situations.",
     "weight": "2800 g",
     "volume": "2 L",
@@ -396,8 +395,8 @@
     "id": "scar_l",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "FN SCAR-L",
-    "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The 'L' in its name stands for light, as it uses the lightweight .223 round.",
+    "name": "FN SCAR-L assault rifle",
+    "description": "A highly accurate and modular assault rifle specially designed for the United States Special Operations Command.  The \"L\" in its name stands for light, as it uses the lightweight .223 round.",
     "weight": "2960 g",
     "volume": "2250 ml",
     "price": 280000,
@@ -418,7 +417,7 @@
     "id": "sig552",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "SIG 552",
+    "name": "SIG 552 assault rifle",
     "description": "A compact selective fire automatic rifle designed for the Swiss military.  It features a three-round burst mode and an integrated folding stock.",
     "weight": "3200 g",
     "volume": "1750 ml",
@@ -438,7 +437,7 @@
     "id": "steyr_aug",
     "copy-from": "rifle_auto",
     "type": "GUN",
-    "name": "Steyr AUG",
+    "name": "Steyr AUG assault rifle",
     "description": "The Steyr AUG is an Austrian assault rifle that uses a bullpup design.  It is used in the armed forces and police forces of many nations, and enjoys low recoil and high accuracy.",
     "weight": "3184 g",
     "volume": "1500 ml",

data/json/items/gun/270win.json

@@ -3,7 +3,8 @@
     "id": "remington700_270",
     "copy-from": "rifle_manual",
     "type": "GUN",
-    "name": "Remington 700",
+    "name": "Remington 700 rifle: .270",
+    "name_plural": "Remington 700 rifles: .270",
     "description": "A classic bolt action rifle chambered for .270 Winchester, very polular among hunters.  This is a CDL SF model with a forged, fluted, 416 stainless steel barrel threaded into the receiver and a recessed bolt face.  It has checkered walnut furniture and a recoil pad to reduce perceived recoil.",
     "weight": "4080 g",
     "volume": "3 L",

data/json/items/gun/300.json

@@ -3,8 +3,7 @@
     "id": "m2010",
     "copy-from": "rifle_base",
     "type": "GUN",
-    "name": "M2010 ESR",
-    "name_plural": "M2010 ESR",
+    "name": "M2010 Enhanced Sniper Rifle",
     "//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.",
     "description": "A bolt-action, box-magazine-fed, sniper rifle chambered in the powerful .300 Winchester Magnum round.  The M2010 had completely replaced the M24 rifle series by 2017.",
     "weight": "4002 g",
@@ -25,8 +24,7 @@
     "id": "weatherby_5",
     "copy-from": "rifle_manual",
     "type": "GUN",
-    "name": "Weatherby Mark V",
-    "name_plural": "Weatherby Mark V",
+    "name": "Weatherby Mark V rifle",
     "//": "MSRP, believe it or not.",
     "description": "The Weatherby Mark V is one of the finest bolt action rifles.  Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges.  These rifles were presented to celebrities as part of a marketing campaign.",
     "weight": "4200 g",
@@ -48,8 +46,7 @@
     "id": "win70",
     "copy-from": "rifle_manual",
     "type": "GUN",
-    "name": "Winchester Model 70",
-    "name_plural": "Winchester Model 70",
+    "name": "Winchester Model 70 rifle",
     "description": "The Winchester Model 70 is a bolt action sporting rifle.  It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.",
     "weight": "4100 g",
     "volume": "3 L",

data/json/items/gun/3006.json

@@ -3,8 +3,7 @@
     "id": "browning_blr",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Browning BLR",
-    "name_plural": "Browning BLR",
+    "name": "Browning BLR rifle",
     "description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round.  Notable for using a detachable magazine instead of a traditional tube.",
     "weight": "3135 g",
     "volume": "3 L",
@@ -43,7 +42,7 @@
     "id": "garand",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "M1 Garand",
+    "name": "M1 Garand battle rifle",
     "description": "A semi-automatic .30-06 battle rifle, developed to replace the M1903 Springfield.  It didn't completely supplant the older bolt-action until after World War II.",
     "weight": "4280 g",
     "volume": "2500 ml",
@@ -80,7 +79,7 @@
     "id": "m1903",
     "copy-from": "rifle_manual",
     "type": "GUN",
-    "name": "M1903 Springfield",
+    "name": "M1903 Springfield rifle",
     "description": "A powerful military rifle chambered in .30-06, developed to replace the US Army's older Krag rifle.  Served as the main American rifle in World War I, was used alongside the M1 Garand in World War II, and was used as a sniper rifle as late as the Vietnam War.",
     "weight": "4080 g",
     "volume": "3 L",
@@ -154,8 +153,8 @@
     "id": "remington_700",
     "copy-from": "rifle_manual",
     "type": "GUN",
-    "name": "Remington 700",
-    "name_plural": "Remington 700",
+    "name": "Remington 700 rifle: .30-06",
+    "name_plural": "Remington 700 rifles: .30-06",
     "description": "A very popular and durable hunting or sniping rifle.  Popular among SWAT and US Marine snipers.  Highly damaging, but perhaps not as accurate as the competing Browning BLR.",
     "weight": "4080 g",
     "volume": "3 L",
@@ -215,7 +214,7 @@
     "id": "survivor_special_700",
     "copy-from": "remington_700",
     "type": "GUN",
-    "name": "Special 700",
+    "name": "makeshift rifle",
     "description": "A rusty receiver, a R700 pattern barrel and half a broken crutch; all held together in the shape of a rifle with nothing more than glue, duct tape, and generous amounts of faith.",
     "price": 100000,
     "clip_size": 1,