Skip to content

Commit

Permalink
Merge pull request #38615 from snipercup/Armor-name-to-object
Browse files Browse the repository at this point in the history
Armor name to object
  • Loading branch information
ZhilkinSerg authored Mar 7, 2020
2 parents dccc2bf + a228f84 commit 6907ad7
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions data/json/items/armor/ammo_pouch.json
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@
{
"id": "quiver_large",
"type": "ARMOR",
"name": "large quiver",
"name": { "str": "large quiver" },
"description": "A large leather quiver trimmed with metal, worn on the back, that can hold 60 arrows. Historically used by horse archers, rather than foot archers, but neither of THEM had to fight zombies. Activate to store arrows.",
"weight": "920 g",
"volume": "1500 ml",
Expand All @@ -503,7 +503,7 @@
{
"id": "quiver_large_birchbark",
"type": "ARMOR",
"name": "large birchbark quiver",
"name": { "str": "large birchbark quiver" },
"description": "A large quiver woven from strips of birchbark, worn on the back, that can hold 60 arrows. Activate to store arrows.",
"weight": "1380 g",
"volume": "1500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/ballistic_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"repairs_like": "survivor_suit",
"type": "ARMOR",
"category": "armor",
"name": "lamellar kevlar vest",
"name": { "str": "lamellar kevlar vest" },
"description": "A lamellar kevlar vest, there are intricately cut voids usually filled with stitched in ceramic disks, you could repair the stitching if needed",
"weight": "2060 g",
"volume": "4 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/belts.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{
"abstract": "judo_belt_abstract",
"type": "ARMOR",
"name": "judo belt template",
"name": { "str": "judo belt template" },
"description": "This is a template for judo belts. If found in a game, it is a bug.",
"weight": "200 g",
"volume": "250 ml",
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"id": "coat_lab",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "lab coat",
"name": { "str": "lab coat" },
"description": "A long white coat with several large pockets. Comes with a very nice pocket protector.",
"weight": "580 g",
"volume": "2250 ml",
Expand Down Expand Up @@ -469,7 +469,7 @@
"id": "jacket_jean",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "jean jacket",
"name": { "str": "jean jacket" },
"description": "A jacket made from denim. Provides decent protection from cuts.",
"weight": "800 g",
"volume": "3250 ml",
Expand Down Expand Up @@ -585,7 +585,7 @@
"id": "judo_gi",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "judo gi",
"name": { "str": "judo gi" },
"description": "Plain white judo gi. Thick and a little stiff, it gives minor protection from cuts and punches.",
"weight": "1000 g",
"volume": "1500 ml",
Expand All @@ -605,7 +605,7 @@
"id": "karate_gi",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "karate gi",
"name": { "str": "karate gi" },
"description": "Plain white karate gi. Loose and flowing, it offers little protection, and little encumbrance.",
"weight": "400 g",
"volume": "1500 ml",
Expand All @@ -624,7 +624,7 @@
"id": "kariginu",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "kariginu",
"name": { "str": "kariginu" },
"description": "A traditional, ankle-length Shinto robe with several layers and very wide sleeves.",
"weight": "1400 g",
"volume": "5500 ml",
Expand All @@ -646,7 +646,7 @@
"id": "keikogi",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "keikogi",
"name": { "str": "keikogi" },
"description": "Plain white keikogi for use in martial arts.",
"weight": "250 g",
"volume": "750 ml",
Expand All @@ -664,7 +664,7 @@
{
"id": "kimono",
"type": "ARMOR",
"name": "kimono",
"name": { "str": "kimono" },
"description": "A traditional, ankle-length Japanese robe, wrapped around the body with a sash.",
"weight": "1200 g",
"volume": "5 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/hats.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
{
"id": "hat_knit",
"type": "ARMOR",
"name": "knit hat",
"name": { "str": "knit hat" },
"description": "A snug-fitting wool hat. Very warm.",
"weight": "120 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
"id": "helmet_kabuto",
"type": "ARMOR",
"category": "armor",
"name": "kabuto",
"name": { "str": "kabuto" },
"//": "Leaving this at $500 as it's either antique/priceless or player-made/Bartered, leastwise on the initial search.",
"description": "A medieval Japanese helmet with a scowling facemask that provides excellent protection to the entire head and face.",
"weight": "1625 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
{
"id": "kilt",
"type": "ARMOR",
"name": "kilt",
"name": { "str": "kilt" },
"description": "No true Scotsman would leave home without his kilt.",
"weight": "1814 g",
"volume": "1500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/scarfs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "cowl_wool",
"type": "ARMOR",
"name": "knit cowl",
"name": { "str": "knit cowl" },
"description": "A snuggly woolen cowl. It's one of those stylish and bulky cowls you see in fashion magazines.",
"weight": "272 g",
"volume": "2 L",
Expand Down Expand Up @@ -43,7 +43,7 @@
{
"id": "keffiyeh",
"type": "ARMOR",
"name": "keffiyeh",
"name": { "str": "keffiyeh" },
"description": "A type of headdress traditionally used in the Middle East. It can be used in different ways to protect the head and mouth from the elements.",
"weight": "152 g",
"volume": "1250 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
{
"id": "backpack_tactical_large",
"type": "ARMOR",
"name": "large tactical backpack",
"name": { "str": "large tactical backpack" },
"description": "A large tactical multi-compartment backpack that has great lower back support.",
"weight": "2291 g",
"volume": "15 L",
Expand All @@ -128,7 +128,7 @@
{
"id": "basket_laundry",
"type": "ARMOR",
"name": "laundry basket",
"name": { "str": "laundry basket" },
"description": "A plastic basket meant for storing and hauling clothing.",
"weight": "680 g",
"volume": "25 L",
Expand Down Expand Up @@ -457,7 +457,7 @@
{
"id": "jerrypack",
"type": "ARMOR",
"name": "jerrypack",
"name": { "str": "jerrypack" },
"description": "A jerrycan modified to be worn in a similar manner to a backpack.",
"weight": "1763 g",
"volume": "10 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/suits_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
{
"id": "jumpsuit",
"type": "ARMOR",
"name": "jumpsuit",
"name": { "str": "jumpsuit" },
"description": "A thin, short-sleeved jumpsuit; similar to those worn by prisoners. Provides decent storage and is not very encumbering.",
"weight": "610 g",
"volume": "3500 ml",
Expand Down

0 comments on commit 6907ad7

Please sign in to comment.