Skip to content

Commit

Permalink
Merge pull request CleverRaven#56840 from Faalagorn/patch-11
Browse files Browse the repository at this point in the history
Add missing Halloween plurals
  • Loading branch information
Rivet-the-Zombie authored Apr 21, 2022
2 parents 1023422 + e71917b commit bd20f38
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"id": "bee_dress",
"repairs_like": "dress",
"type": "ARMOR",
"name": { "str_sp": "bee dress" },
"name": { "str": "bee dress", "str_pl": "bee dresses" },
"description": "A short black and yellow dress, reminiscent of a bee. It includes bee wings, a hood, and a pair of antenna.",
"weight": "739 g",
"volume": "4000 ml",
Expand Down Expand Up @@ -169,7 +169,7 @@
"id": "cheerleader_top",
"repairs_like": "tank_top",
"type": "ARMOR",
"name": { "str_sp": "cheerleader top" },
"name": { "str": "cheerleader tank top" },
"description": "A red cheerleader tank top. It has the words \"Cheers\" printed on its front.",
"weight": "120 g",
"volume": "250 ml",
Expand All @@ -188,7 +188,7 @@
"id": "cheerleader_top_short",
"repairs_like": "tank_top",
"type": "ARMOR",
"name": { "str_sp": "short cheerleader top" },
"name": { "str": "short cheerleader tank top" },
"description": "A red and short cheerleader tank top. It has the words \"Cheers\" printed on its front.",
"weight": "100 g",
"volume": "250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/landscaping.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"type": "GENERIC",
"symbol": "/",
"color": "light_gray",
"name": { "str_sp": "scythe" },
"name": { "str": "scythe" },
"description": "This is a dull, cheaply-made replica of an old-fashioned farming tool used to cut tall grass.",
"proportional": { "bashing": 1.8, "cutting": 0.064 },
"delete": { "flags": [ "DURABLE_MELEE" ] },
Expand All @@ -151,7 +151,7 @@
"repairs_like": "makeshift_scythe_war",
"symbol": "/",
"color": "light_gray",
"name": { "str_sp": "grim reaper's scythe" },
"name": { "str": "grim reaper's scythe" },
"description": "This is a long and crooked tool used to reap souls, with a skull engraved in its blade. Let the harvest begin.",
"weight": "2721 g",
"volume": "3550 ml",
Expand Down

0 comments on commit bd20f38

Please sign in to comment.