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.

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

Armor name to object, fix looks_like #38093

Merged
merged 1 commit into from
Feb 17, 2020
Merged
Changes from all commits
Commits
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
Armor name to object, fix looks_like
  • Loading branch information
snipercup committed Feb 17, 2020

Verified

This commit was signed with the committer’s verified signature.
commit 158d5a667fa65633ec3bda0f866deeacc7674c54
3 changes: 1 addition & 2 deletions data/json/items/armor/bandolier.json
Original file line number Diff line number Diff line change
@@ -214,8 +214,7 @@
{
"id": "stone_pouch",
"type": "ARMOR",
"name": "stone pouch",
"name_plural": "stone pouches",
"name": { "str": "stone pouch", "str_pl": "stone pouches" },
"description": "A medium-sized pouch for storing rocks, with straps for attaching it to your belt or other webbing.",
"weight": "90 g",
"volume": "250 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/eyewear.json
Original file line number Diff line number Diff line change
@@ -276,8 +276,7 @@
{
"id": "survivor_goggles",
"type": "ARMOR",
"name": "survivor goggles",
"name_plural": "pairs of survivor goggles",
"name": { "str": "survivor goggles", "str_pl": "pairs of survivor goggles" },
"description": "A custom-built pair of armored goggles with tinted lenses. Comfortable and built to last, they provide excellent protection from environmental dangers.",
"weight": "212 g",
"volume": "250 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/gloves.json
Original file line number Diff line number Diff line change
@@ -310,8 +310,7 @@
"id": "glove_jackson",
"repairs_like": "gloves_light",
"type": "ARMOR",
"name": "white glove",
"name_plural": "white gloves",
"name": { "str": "white glove" },
"description": "A single white glove covered with hundreds of rhinestones.",
"weight": "59 g",
"volume": "250 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
@@ -558,8 +558,7 @@
"repairs_like": "helmet_barbute",
"type": "ARMOR",
"category": "armor",
"name": "pickelhaube",
"name_plural": "pickelhauben",
"name": { "str": "pickelhaube", "str_pl": "pickelhauben" },
"description": "A spiked helmet once worn by German military officers. The spike is very sharp.",
"weight": "980 g",
"volume": "1750 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/holster.json
Original file line number Diff line number Diff line change
@@ -127,8 +127,7 @@
{
"id": "survivor_vest",
"type": "ARMOR",
"name": "survivor harness",
"name_plural": "survivor harnesses",
"name": { "str": "survivor harness", "str_pl": "survivor harnesses" },
"description": "A custom-built light harness covered with pouches and including an integral tactical sling for a small rifle or other such weapon. Durable and carefully crafted to be comfortable to wear. Activate to holster/draw your weapon.",
"weight": "320 g",
"volume": "1250 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/legs_armor.json
Original file line number Diff line number Diff line change
@@ -26,8 +26,7 @@
"repairs_like": "pants_leather",
"type": "ARMOR",
"category": "armor",
"name": "turnout trousers",
"name_plural": "turnout trousers",
"name": { "str": "turnout trousers", "str_pl": "turnout trousers" },
"//": "Fire-resistant outerwear ain't cheap.",
"description": "A heavy pair of protective overalls worn by firefighters. Highly resistant to heat and flame, they provide excellent protection from injury.",
"weight": "2290 g",
11 changes: 4 additions & 7 deletions data/json/items/armor/legs_clothes.json
Original file line number Diff line number Diff line change
@@ -140,8 +140,7 @@
"id": "jeans_red",
"repairs_like": "pants_leather",
"type": "ARMOR",
"name": "red jeans",
"name_plural": "red jeans",
"name": { "str": "red jeans", "str_pl": "red jeans" },
"description": "A pair of tight-fitting candy-apple-red jeans with two deep pockets.",
"weight": "600 g",
"volume": "2 L",
@@ -446,8 +445,7 @@
"id": "pants_ski",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "ski pants",
"name_plural": "ski pants",
"name": { "str": "ski pants", "str_pl": "ski pants" },
"description": "A pair of pants meant for alpine skiing.",
"weight": "450 g",
"volume": "2 L",
@@ -489,16 +487,15 @@
{
"id": "shorts",
"type": "ARMOR",
"name": "shorts",
"name_plural": "shorts",
"name": { "str": "shorts", "str_pl": "shorts" },
"description": "A pair of khaki shorts.",
"weight": "230 g",
"volume": "1 L",
"price": 2000,
"to_hit": 1,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "boxers",
"looks_like": "boxer_shorts",
"color": "brown",
"covers": [ "LEGS" ],
"coverage": 40,
3 changes: 1 addition & 2 deletions data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
@@ -216,8 +216,7 @@
"id": "veil_wedding",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "wedding veil",
"name_plural": "wedding veils",
"name": { "str": "wedding veil" },
"description": "A lacy white wedding veil.",
"weight": "78 g",
"volume": "750 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/sheath.json
Original file line number Diff line number Diff line change
@@ -135,8 +135,7 @@
{
"id": "sheath",
"type": "ARMOR",
"name": "sheath",
"name_plural": "sheathes",
"name": { "str": "sheath", "str_pl": "sheathes" },
"description": "A leather sheath for holding knives and other small blades. It is easy to use without much practice. Activate to sheathe/draw a weapon.",
"weight": "200 g",
"volume": "500 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/storage.json
Original file line number Diff line number Diff line change
@@ -330,8 +330,7 @@
{
"id": "dump_pouch",
"type": "ARMOR",
"name": "tactical dump pouch",
"name_plural": "tactical dump pouches",
"name": { "str": "tactical dump pouch", "str_pl": "tactical dump pouches" },
"description": "An expandable pouch secured with straps. Provides a bit of extra storage with minimal encumbrance.",
"weight": "288 g",
"volume": "500 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
@@ -151,8 +151,7 @@
"id": "cuirass_scrap",
"type": "ARMOR",
"category": "armor",
"name": "scrap cuirass",
"name_plural": "scrap cuirasses",
"name": { "str": "scrap cuirass", "str_pl": "scrap cuirasses" },
"description": "A cuirass made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.",
"weight": "3366 g",
"volume": "5750 ml",
3 changes: 1 addition & 2 deletions data/json/items/armor/undergarment.json
Original file line number Diff line number Diff line change
@@ -498,8 +498,7 @@
"id": "tights",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "tights",
"name_plural": "tights",
"name": { "str": "tights", "str_pl": "tights" },
"description": "A snug cloth garment which clings tightly to the legs and feet to protect them from the cold.",
"weight": "114 g",
"volume": "250 ml",