Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Armor name to object #37743

Merged
merged 1 commit into from
Feb 6, 2020
Merged

Armor name to object #37743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions data/json/items/armor/coats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
"id": "cassock",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "cassock",
"name_plural": "cassocks",
"name": { "str": "cassock" },
"description": "A piece of clerical clothing, usually worn by Christian priests.",
"weight": "1200 g",
"volume": "5 L",
Expand Down Expand Up @@ -385,8 +384,7 @@
"id": "jacket_army",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "army jacket",
"name_plural": "army jacket",
"name": { "str": "army jacket", "str_pl": "army jacket" },
"description": "A tough jacket with lots of pockets. Favored by the military.",
"weight": "780 g",
"volume": "3 L",
Expand Down Expand Up @@ -729,8 +727,7 @@
"id": "kittel",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "kittel",
"name_plural": "kittels",
"name": { "str": "kittel", "str_pl": "kittels" },
"description": "A white, knee-length cotton robe, traditionally worn by Jews on special occasions.",
"weight": "1000 g",
"volume": "4 L",
Expand Down Expand Up @@ -774,8 +771,7 @@
"id": "robe",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "robe",
"name_plural": "robes",
"name": { "str": "robe" },
"description": "A loose-fitting outer garment with sleeves, and a mysterious amount of well-hidden pockets.",
"weight": "1000 g",
"volume": "5 L",
Expand Down Expand Up @@ -1054,8 +1050,7 @@
"id": "thawb",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "thawb",
"name_plural": "thawb",
"name": { "str": "thawb", "str_pl": "thawb" },
"description": "A long, loose-fitting robe with wide sleeves, a traditional Arab garment.",
"weight": "1200 g",
"volume": "4500 ml",
Expand Down Expand Up @@ -1262,8 +1257,7 @@
"id": "winter_jacket_army",
"repairs_like": "miner_hat",
"type": "ARMOR",
"name": "army winter jacket",
"name_plural": "army winter jackets",
"name": { "str": "army winter jacket", "str_pl": "army winter jackets" },
"description": "A tough hooded jacket with lots of pockets, thickly padded for warmth. Favored by the military.",
"weight": "1000 g",
"volume": "3 L",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/armor/torso_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
{
"id": "armor_lamellar",
"type": "ARMOR",
"name": "lamellar cuirass",
"name_plural": "lamellar cuirasses",
"name": { "str": "lamellar cuirass", "str_pl": "lamellar cuirasses" },
"description": "A cuirass made of multiple pieces of tough leather, laced together for durable yet flexible protection.",
"weight": "2108 g",
"volume": "9250 ml",
Expand Down Expand Up @@ -179,8 +178,7 @@
"id": "fencing_jacket",
"repairs_like": "armor_larmor",
"type": "ARMOR",
"name": "fencing jacket",
"name_plural": "fencing jackets",
"name": { "str": "fencing jacket" },
"description": "A padded jacket with the zipper on the back used by fencers to prevent accidents. It doesn't have any storage room, but it is very comfortable.",
"weight": "800 g",
"volume": "2500 ml",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/armor/torso_clothes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@
{
"id": "dress_wedding",
"type": "ARMOR",
"name": "wedding dress",
"name_plural": "wedding dresses",
"name": { "str": "wedding dress", "str_pl": "wedding dresses" },
"description": "A beautiful white wedding dress. What good will it be now?",
"weight": "9333 g",
"volume": "18 L",
Expand Down Expand Up @@ -379,8 +378,7 @@
"id": "maid_dress",
"repairs_like": "trenchcoat",
"type": "ARMOR",
"name": "French maid clothes",
"name_plural": "French maid clothes",
"name": { "str": "French maid clothes", "str_pl": "French maid clothes" },
"description": "The French maid dress, blue with a frilly white apron.",
"weight": "100 g",
"volume": "250 ml",
Expand Down Expand Up @@ -480,8 +478,7 @@
{
"id": "sundress",
"type": "ARMOR",
"name": "sundress",
"name_plural": "sundresses",
"name": { "str": "sundress", "str_pl": "sundresses" },
"description": "A light and breezy cotton dress. Though cool and comfortable to wear, it lacks any storage space.",
"weight": "60 g",
"volume": "1 L",
Expand Down