Merge pull request #37966 from snipercup/Gun-name-to-object-leave-the-s

Gun-name-to-object-leave-the-s

data/json/items/gun/22.json

@@ -246,8 +246,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "SIG Mosquito",
-    "name_plural": "SIG Mosquito",
+    "name": { "str": "SIG Mosquito", "str_pl": "SIG Mosquito" },
     "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": "700 g",
     "volume": "250 ml",

data/json/items/gun/300.json

@@ -26,8 +26,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Weatherby Mark V",
-    "name_plural": "Weatherby Mark V",
+    "name": { "str": "Weatherby Mark V", "str_pl": "Weatherby Mark V" },
     "//": "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": "3730 g",
@@ -50,8 +49,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Winchester Model 70",
-    "name_plural": "Winchester Model 70",
+    "name": { "str": "Winchester Model 70", "str_pl": "Winchester Model 70" },
     "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": "3520 g",
     "volume": "3 L",

data/json/items/gun/308.json

@@ -217,8 +217,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "handmade heavy carbine",
-    "name_plural": "handmade heavy carbines",
+    "name": { "str": "handmade heavy carbine" },
     "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.",
     "description": "A homemade lever-action magazine-fed smoothbore rifle.  While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.",
     "weight": "2311 g",
@@ -257,8 +256,7 @@
     "copy-from": "rifle_manual",
     "looks_like": "ar15",
     "type": "GUN",
-    "name": "Savage 111F",
-    "name_plural": "Savage 111F",
+    "name": { "str": "Savage 111F", "str_pl": "Savage 111F" },
     "description": "A very accurate rifle chambered for the powerful .308 round.  Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.",
     "weight": "2993 g",
     "volume": "3 L",

data/json/items/gun/32.json

@@ -4,8 +4,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "SIG Sauer P230",
-    "name_plural": "SIG Sauer P230",
+    "name": { "str": "SIG Sauer P230", "str_pl": "SIG Sauer P230" },
     "description": "The SIG Sauer P230 is a small, semi-automatic handgun chambered in .32 ACP.  Due to its small dimensions, it was often carried as a backup weapon.",
     "weight": "460 g",
     "volume": "312 ml",
@@ -82,8 +81,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "Walther PPK",
-    "name_plural": "Walther PPK",
+    "name": { "str": "Walther PPK", "str_pl": "Walther PPK" },
     "description": "One of the most famous handguns of the 20th century.  Your name is not Bond, but you might find this little gun still useful.",
     "weight": "540 g",
     "volume": "216 ml",

data/json/items/gun/380.json

@@ -93,8 +93,7 @@
     "copy-from": "pistol_backup",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Taurus Spectrum",
-    "name_plural": "Taurus Spectrum",
+    "name": { "str": "Taurus Spectrum", "str_pl": "Taurus Spectrum" },
     "description": "A .380 subcompact pistol.  Designed for concealed carry and built from high-quality, durable materials.",
     "weight": "283 g",
     "volume": "187 ml",

data/json/items/gun/40.json

@@ -81,8 +81,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "SIG Pro .40",
-    "name_plural": "SIG Pro .40",
+    "name": { "str": "SIG Pro .40", "str_pl": "SIG Pro .40" },
     "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.",
     "weight": "820 g",
     "volume": "500 ml",

data/json/items/gun/454.json

@@ -4,8 +4,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Taurus Raging Bull",
-    "name_plural": "Taurus Raging Bull",
+    "name": { "str": "Taurus Raging Bull", "str_pl": "Taurus Raging Bull" },
     "description": "The Taurus Raging Bull is a 5-shot revolver chambered in .454 Casull.  It has impressive stopping power.",
     "weight": "1790 g",
     "volume": "750 ml",
@@ -36,8 +35,7 @@
     "copy-from": "raging_bull",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Taurus Raging Judge Magnum",
-    "name_plural": "Taurus Raging Judge Magnum",
+    "name": { "str": "Taurus Raging Judge Magnum", "str_pl": "Taurus Raging Judge Magnum" },
     "description": "The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 Casull.  It can fire .410 shotshells and .45 Colt cartridges as well.",
     "weight": "2041 g"
   }

data/json/items/gun/45colt.json

@@ -61,8 +61,7 @@
     "copy-from": "pistol_revolver",
     "looks_like": "sw_619",
     "type": "GUN",
-    "name": "Uberti Cattleman",
-    "name_plural": "Uberti Cattleman",
+    "name": { "str": "Uberti Cattleman", "str_pl": "Uberti Cattleman" },
     "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge.  Made famous by westerns, it is still in demand for Cowboy Action Shooting, reenactors and collectors.  Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.",
     "weight": "1048 g",
     "volume": "324 ml",

data/json/items/gun/762x25.json

@@ -44,8 +44,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "Tokarev TT-33",
-    "name_plural": "Tokarev TT-33",
+    "name": { "str": "Tokarev TT-33", "str_pl": "Tokarev TT-33" },
     "//": "And it's therefore expensive.",
     "description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle.  It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries.",
     "weight": "870 g",

data/json/items/gun/9mm.json

@@ -480,8 +480,7 @@
     "looks_like": "glock_17",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "TEC-9",
-    "name_plural": "TEC-9",
+    "name": { "str": "TEC-9", "str_pl": "TEC-9" },
     "description": "The TEC-9 is a machine pistol made of cheap polymers and machine stamped parts.  Its rise in popularity among criminals is largely due to its intimidating looks and low cost.",
     "weight": "1400 g",
     "volume": "500 ml",
@@ -520,8 +519,7 @@
     "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": "USP 9mm",
-    "name_plural": "USP 9mm",
+    "name": { "str": "USP 9mm", "str_pl": "USP 9mm" },
     "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
     "weight": "770 g",
     "volume": "500 ml",
@@ -545,8 +543,7 @@
     "copy-from": "smg_base",
     "looks_like": "hk_mp5",
     "type": "GUN",
-    "name": "Uzi 9mm",
-    "name_plural": "Uzi 9mm",
+    "name": { "str": "Uzi 9mm", "str_pl": "Uzi 9mm" },
     "//": "SMGs aren't as commercially traded as rifles/handguns/SGs, so no cite for price points.  Total weight of gun 3500 grams.  Current weight of folding stock 200 grams.",
     "description": "The Uzi 9x19mm has enjoyed immense popularity, selling more units than any other submachine gun.  It is widely used as a personal defense weapon, or as a primary weapon by elite frontline forces.",
     "weight": "2700 g",

data/json/items/gun/blunderbuss.json

@@ -4,8 +4,7 @@
     "looks_like": "remington_870",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": "blunderbuss",
-    "name_plural": "blunderbusses",
+    "name": { "str": "blunderbuss", "str_pl": "blunderbusses" },
     "description": "A homemade version of a crude precursor to the shotgun.  Able to fire just about anything you put down the barrel, but it will degrade pretty quick.",
     "weight": "8267 g",
     "volume": "3 L",