Merge pull request #38356 from snipercup/Ammo-name-to-object

Ammo name to object

data/json/items/ammo.json

@@ -51,12 +51,12 @@
     "id": "aluminum_foil",
     "category": "spare_parts",
     "price": 648,
-    "name": "aluminum foil",
+    "name": { "str": "aluminum foil" },
     "symbol": "=",
     "color": "light_gray",
     "description": "A thin foil made of aluminum.  Sometimes called 'tin foil' due to being made of tin in the past.",
     "material": "aluminum",
-    "volume": 0,
+    "volume": "10 ml",
     "weight": "4 g",
     "ammo_type": "components",
     "count": 200
@@ -363,7 +363,7 @@
     "type": "AMMO",
     "id": "bb",
     "price": 500,
-    "name": "BB",
+    "name": { "str": "BB" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "pebble",
@@ -539,7 +539,7 @@
     "id": "gunpowder_artillery",
     "copy-from": "gunpowder",
     "price": 3000,
-    "name": "artillery propellant",
+    "name": { "str": "artillery propellant" },
     "description": "Single base smokeless gunpowder intended for use in artillery propelling charges."
   },
   {
@@ -704,7 +704,7 @@
     "type": "AMMO",
     "id": "RPG-7_ammo",
     "price": 10000,
-    "name": "PG-7VL 93mm rocket",
+    "name": { "str": "PG-7VL 93mm rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "93mm single-stage high-explosive ammunition for the RPG-7.",
@@ -723,7 +723,7 @@
     "type": "AMMO",
     "id": "RPG-7_pg7vr",
     "price": 10000,
-    "name": "PG-7VR 64mm/105mm rocket",
+    "name": { "str": "PG-7VR 64mm/105mm rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "64mm/105mm high-explosive tandem ammunition for the RPG-7.",
@@ -742,7 +742,7 @@
     "type": "AMMO",
     "id": "RPG-7_tbg7v",
     "price": 10000,
-    "name": "TBG-7V 105mm rocket",
+    "name": { "str": "TBG-7V 105mm rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "105mm thermobaric ammunition for the RPG-7.",
@@ -761,7 +761,7 @@
     "type": "AMMO",
     "id": "RPG-7_og7v",
     "price": 8000,
-    "name": "OG-7V 40mm rocket",
+    "name": { "str": "OG-7V 40mm rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "40mm high-explosive fragmentation antipersonnel ammunition for the RPG-7.",
@@ -865,7 +865,7 @@
     "id": "ampoule",
     "category": "drugs",
     "price": 50000,
-    "name": "RA21E medical ampoule",
+    "name": { "str": "RA21E medical ampoule" },
     "symbol": "=",
     "color": "cyan",
     "description": "A tiny glass vial filled with advanced fast-healing chemicals which can only be activated by a Rivtech jet injector device.  A label on the side warns against using more than two doses per hour.",
@@ -881,7 +881,7 @@
     "id": "stimpack_ammo",
     "category": "drugs",
     "price": 30000,
-    "name": "RA10K stimulant module",
+    "name": { "str": "RA10K stimulant module" },
     "symbol": "=",
     "color": "cyan",
     "description": "A pressurized multi-chamber glass vial filled with powerful chemical stimulants which can only be activated by a Rivtech stimulant delivery system.",

data/json/items/ammo/12mm.json

@@ -2,7 +2,7 @@
   {
     "id": "12mm",
     "type": "AMMO",
-    "name": "H&K 12mm",
+    "name": { "str": "H&K 12mm" },
     "description": "The Heckler & Koch 12mm projectiles are used in H&K railguns.  It's made of a ferromagnetic metal, probably cobalt.",
     "weight": "11 g",
     "volume": "250 ml",

data/json/items/ammo/5x50.json

@@ -2,7 +2,7 @@
   {
     "id": "5x50dart",
     "type": "AMMO",
-    "name": "RA110 5x50mm flechette",
+    "name": { "str": "RA110 5x50mm flechette" },
     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.",
     "weight": "8 g",
     "volume": "250 ml",
@@ -26,7 +26,7 @@
     "id": "5x50heavy",
     "copy-from": "5x50dart",
     "type": "AMMO",
-    "name": "RA119 5x50mm penetrator",
+    "name": { "str": "RA119 5x50mm penetrator" },
     "description": "Designed to defeat modern body armor, the Rivtech 5x50mm RA119 penetrator round features a biodegradable sabot and a single, fin-stabilized tungsten alloy projectile.",
     "weight": "9 g",
     "price": 1688,

data/json/items/ammo/66mm.json

@@ -4,7 +4,7 @@
     "id": "m235tpa",
     "price": 200000,
     "//": "$500 per.  Cheap!",
-    "name": "M74 rocket",
+    "name": { "str": "M74 rocket" },
     "symbol": "=",
     "color": "dark_gray",
     "description": "66mm incendiary rockets used in the M202 FLASH rocket launcher.  Their warheads are filled with a thickened pyrophoric agent, which burns at 2200 degrees Fahrenheit.",

data/json/items/chemicals_and_resources.json

@@ -2,7 +2,7 @@
   {
     "id": "anesthetic",
     "type": "AMMO",
-    "name": "anesthetic",
+    "name": { "str": "anesthetic" },
     "category": "chems",
     "description": "A variety of powerful hypnotic, analgesic, and stimulative drugs.  It's intended for use in specialized medical equipment, and can't be administered manually.  You can reload an anesthesia kit with it.",
     "weight": "714 mg",

data/json/items/ranged/archery.json

@@ -187,7 +187,7 @@
     "type": "AMMO",
     "id": "arrow_metal",
     "price": 1200,
-    "name": "aluminum broadhead arrow",
+    "name": { "str": "aluminum broadhead arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
@@ -210,7 +210,7 @@
     "type": "AMMO",
     "id": "arrow_metal_bodkin",
     "price": 1200,
-    "name": "aluminum field point arrow",
+    "name": { "str": "aluminum field point arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",
@@ -233,7 +233,7 @@
     "type": "AMMO",
     "id": "arrow_metal_target",
     "price": 1200,
-    "name": "aluminum small game arrow",
+    "name": { "str": "aluminum small game arrow" },
     "symbol": "=",
     "color": "green",
     "looks_like": "arrow_fire_hardened_fletched",

data/json/items/ranged/crossbows.json

@@ -159,7 +159,7 @@
     "type": "AMMO",
     "id": "bolt_steel",
     "price": 1200,
-    "name": "aluminum broadhead bolt",
+    "name": { "str": "aluminum broadhead bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A fletched aluminum crossbow bolt with a bladed tip.  Useful for maximising damage to the target.  Stands a good chance of remaining intact once fired.",
@@ -180,7 +180,7 @@
     "type": "AMMO",
     "id": "bolt_steel_bodkin",
     "price": 1200,
-    "name": "aluminum field point bolt",
+    "name": { "str": "aluminum field point bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A fletched aluminum crossbow bolt with a pointed tip.  Useful for piercing armor.  Stands a good chance of remaining intact once fired.",
@@ -202,7 +202,7 @@
     "type": "AMMO",
     "id": "bolt_steel_target",
     "price": 1200,
-    "name": "aluminum small game bolt",
+    "name": { "str": "aluminum small game bolt" },
     "symbol": "=",
     "color": "green",
     "description": "A fletched aluminum crossbow bolt with a blunt tip.  Useful for hunting small woodland creatures without splattering them all over the ground.  Stands a good chance of remaining intact once fired.",

data/json/items/resources/tailoring.json

@@ -176,7 +176,7 @@
     "id": "sheet_kevlar",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "Kevlar sheet",
+    "name": { "str": "Kevlar sheet" },
     "description": "A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor.  In this form, unlike rigid plates, it can be stitched.",
     "weight": "5 g",
     "volume": "300 ml",
@@ -243,7 +243,7 @@
     "id": "sheet_nomex",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "Nomex sheet",
+    "name": { "str": "Nomex sheet" },
     "description": "A sheet of Nomex synthetic fabric, suitable for making heat-resistant clothing.",
     "weight": "5 g",
     "volume": "300 ml",
@@ -296,7 +296,7 @@
     "id": "thread_kevlar",
     "category": "spare_parts",
     "price": 5000,
-    "name": "Kevlar thread",
+    "name": { "str": "Kevlar thread" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "thread",
@@ -314,7 +314,7 @@
     "id": "thread_nomex",
     "category": "spare_parts",
     "price": 5000,
-    "name": "Nomex thread",
+    "name": { "str": "Nomex thread" },
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "thread",