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

fix Repairs like balclava #37967

Merged
merged 7 commits into from
Feb 12, 2020
Merged
Show file tree
Hide file tree
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
34 changes: 17 additions & 17 deletions data/json/items/armor/hats.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"id": "beret",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "beret",
"description": "A soft cotton hat. Commonly worn by armed forces and existentialists.",
Expand Down Expand Up @@ -59,7 +59,7 @@
},
{
"id": "bowhat",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "bowler hat",
"description": "The only hat for a made man. Look like a real good fella while laughing in the face of your foes!",
Expand Down Expand Up @@ -119,7 +119,7 @@
},
{
"id": "eboshi",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "eboshi",
"description": "A high, black cap with a very narrow top. Traditionally worn by Shinto priests.",
Expand All @@ -128,7 +128,7 @@
"price": 7000,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "bowlhat",
"looks_like": "bowhat",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 60,
Expand Down Expand Up @@ -158,7 +158,7 @@
},
{
"id": "hat_ball",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "baseball cap",
"//": "Head encumbrance stops you from wearing additional headgear. No helmet over a ballcap, sorry. But brimmed gear gets the anti-glare flag!",
Expand All @@ -180,7 +180,7 @@
},
{
"id": "hat_chef",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "toque",
"description": "A traditional chef's hat, standing tall and proud against the vulgarities of the world.",
Expand Down Expand Up @@ -329,7 +329,7 @@
},
{
"id": "hat_newsboy",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "newsboy cap",
"description": "A slouching wool cap with a short front brim, traditionally associated with newspaper delivery boys. Quite warm.",
Expand Down Expand Up @@ -389,7 +389,7 @@
},
{
"id": "kippah",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "kippah",
"name_plural": "kippahs",
Expand All @@ -409,7 +409,7 @@
},
{
"id": "kufi",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "kufi cap",
"name_plural": "kufi caps",
Expand All @@ -430,7 +430,7 @@
},
{
"id": "maid_hat",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "French maid hat",
"description": "A frilly white headpiece.",
Expand All @@ -450,7 +450,7 @@
},
{
"id": "porkpie",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "porkpie hat",
"description": "A flat-topped hat with circular indent and a narrow brim. Most popular in the 40s and 50s, still common among those in the mod scene, hipsters, and people named Heisenberg.",
Expand All @@ -459,7 +459,7 @@
"price": 5500,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "bowlhat",
"looks_like": "bowhat",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 50,
Expand All @@ -471,7 +471,7 @@
},
{
"id": "postman_hat",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "mail carrier hat",
"description": "A traditional mail carrier's cap, with the US postal service logo embroidered on the front above the plastic cap. A symbol of a bygone world.",
Expand Down Expand Up @@ -528,7 +528,7 @@
},
{
"id": "tophat",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "top hat",
"//": "No, you're not wearing anything over your top hat.",
Expand All @@ -538,7 +538,7 @@
"price": 19500,
"material": [ "cotton" ],
"symbol": "[",
"looks_like": "hat_porkpie",
"looks_like": "porkpie",
"color": "dark_gray",
"covers": [ "HEAD" ],
"coverage": 50,
Expand Down Expand Up @@ -570,7 +570,7 @@
},
{
"id": "turban",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "turban",
"description": "Rags worn around the head.",
Expand All @@ -591,7 +591,7 @@
},
{
"id": "hat_golf",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "golf cap",
"//": "Head encumbrance stops you from wearing additional headgear. No helmet over a ballcap, sorry. But brimmed gear gets the anti-glare flag!",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/armor/helmets.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
},
{
"id": "helmet_bike",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"category": "armor",
"name": "bike helmet",
Expand Down Expand Up @@ -266,7 +266,7 @@
},
{
"id": "helmet_football",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"category": "armor",
"name": "football helmet",
Expand Down Expand Up @@ -355,7 +355,7 @@
},
{
"id": "helmet_liner",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "helmet liner",
"description": "This goes inside a helmet to help keep your head warm in cold climates.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/hoods.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": "beekeeping_hood",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "beekeeping hood",
"description": "A beekeeping hood. Keeps the bees out, but lets fresh air in. Rather cumbersome to wear, as it is rather bulky and hinders vision.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/armor/misc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"id": "clown_wig",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "clown wig",
"description": "A colorful and ridiculous wig fit for a clown.",
Expand Down Expand Up @@ -214,7 +214,7 @@
},
{
"id": "veil_wedding",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "wedding veil",
"name_plural": "wedding veils",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/scarfs.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
{
"id": "headscarf",
"repairs_like": "balaclava",
"repairs_like": "balclava",
"type": "ARMOR",
"name": "headscarf",
"description": "A loose cloth worn over the head and around the neck.",
Expand Down