Merge pull request #36331 from anothersimulacrum/item-g

Replace weight ints with strings in data/json/items

data/json/items/ammo/shotpaper.json

@@ -24,7 +24,7 @@
     "type": "AMMO",
     "name": "buckshot paper cartridge",
     "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of 00 buckshot.",
-    "weight": 26,
+    "weight": "26 g",
     "volume": "250 ml",
     "material": [ "paper", "powder", "lead" ],
     "color": "white",

data/json/items/armor.json

@@ -2340,7 +2340,7 @@
     "symbol": "[",
     "looks_like": "backpack",
     "color": "red",
-    "weight": 411,
+    "weight": "411 g",
     "volume": "2 L",
     "//": "REI Co-op 22-liter daypack costs $54.95, so ballpark to $55",
     "price": 5500,
@@ -7844,7 +7844,7 @@
     "type": "ARMOR",
     "name": "ski jacket",
     "description": "An insulated, breathable hoodie made for alpine skiing.  Very warm, and with sizable pockets.",
-    "weight": 1105,
+    "weight": "1105 g",
     "volume": "5 L",
     "price": 18000,
     "material": [ "cotton", "plastic" ],

data/json/items/bionics.json

@@ -748,7 +748,7 @@
     "looks_like": "bio_int_enhancer",
     "description": "A small gasoline fuel cell able to convert gasoline to bionic power.  It's connected to a diffuse network of bio-plastic bladders able to hold up to 500 ml of gasoline.",
     "price": 450000,
-    "weight": 600,
+    "weight": "600 g",
     "difficulty": 7
   },
   {

data/json/items/book/cooking.json

@@ -399,7 +399,7 @@
     "name": "CRC-Merck handbook, 4th edition",
     "name_plural": "copies of the CRC-Merck handbook, 4th edition",
     "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines.  If poring over tables of chemical and physical data is your thing, this is the book for you.",
-    "weight": 5790,
+    "weight": "5790 g",
     "volume": "1750 ml",
     "price": 9000,
     "price_postapoc": 30000,

data/json/items/book/fabrication.json

@@ -490,7 +490,7 @@
     "name": "Machinery's Handbook",
     "name_plural": "copies of Machinery's Handbook",
     "description": "This classic reference work contains extensive, dense chapters and tables on materials, metrology, toolmaking, gears, threading and more.  This recent edition includes extensive data on what was the latest techniques in additive manufacturing.  If you need to know how best complete a certain machining operation, the answer lies somewhere in these pages.",
-    "weight": 454,
+    "weight": "454 g",
     "volume": "500 ml",
     "price": 8000,
     "price_postapoc": 50000,

data/json/items/book/firstaid.json

@@ -119,7 +119,7 @@
     "name": "Physicians' Desk Reference",
     "name_plural": "copies of the Physicians' Desk Reference",
     "description": "This hefty volume contains all the legally mandated information relevant to physicians for writing prescriptions, generously supported by the efforts and contributions of major pharmaceutical companies.  For the most part, it provides information identical to what is available on that of medication packaging inserts, and cannot match the completeness of digital pharmaceutical references like Medisoft.  At least it doesn't need power to be used.",
-    "weight": 2268,
+    "weight": "2268 g",
     "volume": "500 ml",
     "price": 10000,
     "price_postapoc": 190000,
@@ -137,7 +137,7 @@
     "name": "Merck Veterinary Manual",
     "name_plural": "copies of The Merck Veterinary Manual",
     "description": "This expansive text covers 'all domestic species and diseases in veterinary medicine worldwide'.  Should you need information regarding zoonotic diseases, off-label use of medication for animals, common dysfunctions and diseases of animals, or any other veterinary reference info, this is your book.  There are some interesting new chapters on animal cloning in this edition.",
-    "weight": 5790,
+    "weight": "5790 g",
     "volume": "500 ml",
     "price": 8000,
     "price_postapoc": 50000,

data/json/items/book/survival.json

@@ -160,7 +160,7 @@
     "name": "Natural Remedies of New England",
     "name_plural": "copies of Natural Remedies of New England",
     "description": "A leather bound manuscript, it features native herbal remedies with hand colored illustrations of each plant.",
-    "weight": 400,
+    "weight": "400 g",
     "volume": "1250 ml",
     "price": 50000,
     "price_postapoc": 50000,

data/json/items/chemicals_and_resources.json

@@ -612,7 +612,7 @@
     "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ],
     "description": "Hydrochloric acid, also known as muriatic acid.  It is a strong acid that has a distinctive smell, important and frequently used ever since its discovery.  It still has a vast multitude of uses.",
     "volume": "250 ml",
-    "weight": 460,
+    "weight": "460 g",
     "bashing": 1,
     "ammo_type": "components",
     "phase": "liquid",

data/json/items/comestibles/bread.json

@@ -4,7 +4,7 @@
     "type": "COMESTIBLE",
     "name": "donut holes",
     "name_plural": "donut holes",
-    "weight": 226,
+    "weight": "226 g",
     "color": "yellow",
     "spoils_in": "10 days",
     "comestible_type": "FOOD",

data/json/items/containers.json

@@ -1184,7 +1184,7 @@
     "category": "container",
     "name": { "str": "survival kit box", "str_pl": "survival kit boxes" },
     "description": "An aluminum box that used to contain a small survival kit.  Can hold 1 liter of liquid.",
-    "weight": 200,
+    "weight": "200 g",
     "volume": "1 L",
     "price": 0,
     "material": "aluminum",

data/json/items/generic.json

@@ -3058,7 +3058,7 @@
     "category": "tools",
     "name": "survival kit",
     "description": "A small box filled with tools and items to help you survive in case of an emergency.  Disassemble to get its content.",
-    "weight": 1612,
+    "weight": "1612 g",
     "volume": "1 L",
     "price": 5000,
     "material": "aluminum",

data/json/items/generic/bathroom_house.json

@@ -8,7 +8,7 @@
     "color": "blue",
     "price": 200,
     "price_postapoc": 0,
-    "weight": 100,
+    "weight": "100 g",
     "volume": "50 ml",
     "material": "plastic",
     "bashing": 1,
@@ -32,7 +32,7 @@
     "price": 800,
     "price_postapoc": 1200,
     "//": "the end of the world doesn't mean everyone is okay with having ZZ Top beards.  disposable razors are a hot commodity.  The razor also loses the Cutting 1 quality.  Don't ask how we confirmed this.",
-    "weight": 110,
+    "weight": "110 g",
     "material": [ "plastic", "steel" ],
     "cutting": 2
   },
@@ -87,7 +87,7 @@
     "description": "A soft plastic cylinder you can wrap a lock of your hair around to curl it.",
     "copy-from": "base_toiletries",
     "symbol": ",",
-    "weight": 20,
+    "weight": "20 g",
     "volume": "25 ml",
     "container": "box_small"
   },
@@ -126,7 +126,7 @@
     "color": "red",
     "price": 800,
     "price_postapoc": 50,
-    "weight": 590,
+    "weight": "590 g",
     "volume": "2100 ml",
     "//": "the volume is pretty bulky, but this is an old fashioned model.",
     "material": [ "wood", "plastic" ],
@@ -142,7 +142,7 @@
     "color": "black",
     "price": 1590,
     "price_postapoc": 10,
-    "weight": 680,
+    "weight": "680 g",
     "volume": "2400 ml",
     "material": "plastic",
     "bashing": 2,
@@ -158,8 +158,8 @@
     "container": "box_medium",
     "price": 89,
     "price_postapoc": 180,
-    "weight": 227,
     "volume": "250 ml",
+    "weight": "227 g",
     "material": "paper",
     "to_hit": -2,
     "snippet_category": [
@@ -188,8 +188,8 @@
     "color": "black",
     "price": 2100,
     "price_postapoc": 0,
-    "weight": 680,
     "volume": "500 ml",
+    "weight": "680 g",
     "material": [ "plastic", "steel" ],
     "bashing": 3,
     "to_hit": -1
@@ -203,8 +203,8 @@
     "color": "magenta",
     "price": 2500,
     "price_postapoc": 0,
-    "weight": 590,
     "volume": "250 ml",
+    "weight": "590 g",
     "material": [ "ceramic", "steel" ],
     "bashing": 3,
     "to_hit": 1
@@ -218,8 +218,8 @@
     "color": "white",
     "price": 1700,
     "price_postapoc": 0,
-    "weight": 160,
     "volume": "500 ml",
+    "weight": "160 g",
     "material": [ "steel", "plastic" ],
     "bashing": 3,
     "to_hit": 1

data/json/items/generic/dining_kitchen.json

@@ -809,7 +809,7 @@
     "description": "A stainless steel mesh colander, for washing rice, vegetables or straining liquid off from noodles or other foods.",
     "type": "GENERIC",
     "volume": "500 ml",
-    "weight": 318,
+    "weight": "318 g",
     "symbol": ")",
     "price": 600,
     "price_postapoc": 5
@@ -820,7 +820,7 @@
     "description": "A stainless steel mesh screen for preventing flying oil from getting all over your nice counters (or you) when frying.",
     "type": "GENERIC",
     "volume": "500 ml",
-    "weight": 357,
+    "weight": "357 g",
     "symbol": ")",
     "price": 600,
     "price_postapoc": 5

data/json/items/gun/44paper.json

@@ -26,7 +26,7 @@
     "type": "GUN",
     "name": "LeMat revolver",
     "description": "A Pietta reproduction of the civil war era LeMat revolver, a rare and unusual cap & ball .44-caliber revolver.  While its original non-standard .42 or .35 caliber curbed its usefulness for the CSA army, this reproduction is offered in more prevalent .44 caliber.  Despite modern quality materials, the design is still rather delicate.",
-    "weight": 1295,
+    "weight": "1295 g",
     "volume": "851 ml",
     "price": 120000,
     "bashing": 4,

data/json/items/gun/45.json

@@ -108,7 +108,7 @@
     "type": "GUN",
     "name": "M45A1",
     "description": "The M45A1 supplanted earlier M45 MEUSOC pistols in use by Force Recon elements of Marine Expeditionary Units.  Where the original M45 pistols were gutted M1911A1's hand-fitted by USMC armorers, the updated M45A1's are hardly different from any other commercial 1911 design save for their dual recoil springs.  Most were replaced in 2016 with Glock 19's due to logistics issues.",
-    "weight": 1105,
+    "weight": "1105 g",
     "price": 169900,
     "color": "brown_yellow",
     "dispersion": 420,
@@ -313,7 +313,7 @@
     "type": "GUN",
     "name": "MK 23 MOD 0",
     "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\".  Its cumbersome nature, the introduction of the derivative HK USP series and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories.  Like the USP, the Mk 23 is a remarkably reliable gun; someone could probably take out a nuclear equipped walking tank with this in their holster.",
-    "weight": 1200,
+    "weight": "1200 g",
     "volume": "1607 ml",
     "default_mods": [ "suppressor", "laser_sight" ],
     "flags": [ "WATERPROOF_GUN", "NEVER_JAMS" ]

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

@@ -64,7 +64,7 @@
     "name": "Uberti Cattleman",
     "name_plural": "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,
+    "weight": "1048 g",
     "volume": "500 ml",
     "price": 47900,
     "to_hit": -1,

data/json/items/obsolete.json

@@ -431,7 +431,7 @@
     "reload_noise_volume": 10,
     "name": "homemade laser pistol",
     "description": "This laser pistol was based on the V29 laser pistol designed in the mid-21st century.  While little more than duct tape and electronics, it runs on a standard UPS.",
-    "weight": 540,
+    "weight": "540 g",
     "volume": "2 L",
     "price": 500000,
     "to_hit": -2,

data/json/items/resources/fasteners.json

@@ -81,7 +81,7 @@
     "category": "spare_parts",
     "name": "short plastic zipper",
     "description": "A short zipper made from plastic, usually found on footwear or clothing pockets.",
-    "weight": 4,
+    "weight": "4 g",
     "volume": "4 ml",
     "price": 100,
     "material": [ "plastic", "cotton" ],

data/json/items/resources/metal.json

@@ -148,7 +148,7 @@
     "name": "zinc",
     "name_plural": "zinc",
     "description": "A slightly brittle metal.  Apart from being an essential mineral that the body needs, it reacts readily with acids, alkalis and other non-metals.  It can be crushed to make zinc powder, used in the production of batteries, among other things.",
-    "weight": 7,
+    "weight": "7 g",
     "volume": "50ml",
     "price": 3000,
     "price_postapoc": 75,

data/json/items/tool/handloading.json

@@ -4,7 +4,7 @@
     "type": "TOOL",
     "name": "hand press",
     "description": "This is a small hand press for hand loading firearm ammunition.  It comes with everything you need to start hand loading your own munitions.",
-    "weight": 6350,
+    "weight": "6350 g",
     "volume": "500 ml",
     "price": 10000,
     "to_hit": -2,
@@ -18,7 +18,7 @@
     "type": "TOOL",
     "name": "makeshift shotshell 'press'",
     "description": "This is a collection of items improvised for field reloading of shotshells.  A plank with a hole cut in the center, a medium sized nail, and a whittled dowel are used to seat wads, decap primers, and reprime (carefully!) hulls.  Powder and shot are measured with a cut down fired shotshell.  The opposite side of the plank has been shaped to allow for roll crimping of the plastic hulls.  There's no provision for resizing, so reloaded hulls will fire best in the firearm they were fired from.",
-    "weight": 348,
+    "weight": "348 g",
     "volume": "250 ml",
     "price": 600,
     "to_hit": -2,
@@ -33,7 +33,7 @@
     "type": "TOOL",
     "name": "kinetic bullet puller",
     "description": "This is a tool used for properly disassembling firearm ammunition.",
-    "weight": 489,
+    "weight": "489 g",
     "volume": "250 ml",
     "price": 1000,
     "bashing": 5,

data/json/items/tool_armor.json

@@ -65,7 +65,7 @@
     "type": "ARMOR",
     "name": "welding mask",
     "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding.  It also serves as somewhat good armor, but makes it hard to see.  Activate it to push it up your head.",
-    "weight": 1000,
+    "weight": "1 kg",
     "volume": "4 L",
     "price": 1400,
     "to_hit": -3,
@@ -86,7 +86,7 @@
     "type": "ARMOR",
     "name": "crude welding mask",
     "description": "A crude welding mask made from shaped steel.  It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding.  Activate it to push it up your head.",
-    "weight": 4000,
+    "weight": "4 kg",
     "volume": "4 L",
     "price": 1000,
     "to_hit": -3,
@@ -113,7 +113,7 @@
     "name": "crude welding mask (raised)",
     "name_plural": "crude welding masks (raised)",
     "description": "A crude welding mask made from shaped steel.  It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding.  Activate it to lower it over your face.",
-    "weight": 4000,
+    "weight": "4 kg",
     "volume": "4 L",
     "price": 1000,
     "to_hit": -3,
@@ -138,7 +138,7 @@
     "name": "welding mask (raised)",
     "name_plural": "welding masks (raised)",
     "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding.  It also serves as somewhat good armor, but makes it hard to see.  Activate it to lower it over your face.",
-    "weight": 1000,
+    "weight": "1 kg",
     "volume": "4 L",
     "price": 1400,
     "to_hit": -3,

data/json/items/tools.json

@@ -883,8 +883,8 @@
     "category": "tools",
     "name": "sieve",
     "description": "This is no mere strainer for noodles; it's a sieve used to separate particles of certain sizes.  You could use this to do a really good job sifting flour, remove dust and soil from grain, or perhaps conduct gradiation tests for any civil engineers you might know.  This one has been constructed from steel mesh.",
-    "weight": 318,
     "volume": "500 ml",
+    "weight": "318 g",
     "price": 700,
     "bashing": 2,
     "material": [ "steel" ],
@@ -897,7 +897,7 @@
     "category": "tools",
     "name": "wicker sieve",
     "description": "This is a primitive sieve constructed from woven strips of plant material.  Early sieves like this were used to sift grain, though the openings on this one are too small for that.",
-    "weight": 50,
+    "weight": "50 g",
     "volume": "500 ml",
     "price": 300,
     "bashing": 1,

data/json/items/vehicle/battery.json

@@ -50,7 +50,7 @@
     "name": "large storage battery",
     "name_plural": "large storage batteries",
     "description": "A huge storage battery containing many lithium ion cells.  Holds a tremendous amount of energy.  Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.",
-    "weight": 400000,
+    "weight": "400 kg",
     "volume": "50 L",
     "price": 400000,
     "price_postapoc": 50000,