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

Fixed pluralization of acorn meal/bologna/bone meal/cornmeal/detergent/herring/oatmeal/yeast #37375

Merged
merged 2 commits into from
Jan 25, 2020
Merged

Fixed pluralization of acorn meal/bologna/bone meal/cornmeal/detergent/herring/oatmeal/yeast #37375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf9404
Fixed pluralization of bone/acorn/corn/oatmeal and yeast.
jkraybill Jan 25, 2020
80d12d9
used new plural form, and added bologna and detergent plurals
jkraybill Jan 25, 2020
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
2 changes: 1 addition & 1 deletion data/json/items/chemicals_and_resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@
"id": "detergent",
"category": "chems",
"price": 1000,
"name": "detergent",
"name": { "str": "detergent", "str_pl": "detergent" },
"symbol": "=",
"color": "white",
"description": "A popular pre-Cataclysm washing powder.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
{
"type": "COMESTIBLE",
"id": "bologna",
"name": "bologna",
"name": { "str": "bologna", "str_pl": "bologna" },
"conditional_names": [
{ "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "brat %s", "str_pl": "brat %s" } },
{ "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "bleak %s", "str_pl": "bleak %s" } }
Expand Down Expand Up @@ -660,7 +660,7 @@
{
"type": "COMESTIBLE",
"id": "can_herring",
"name": "pickled herring",
"name": { "str": "pickled herring", "str_pl": "pickled herring" },
"weight": "232 g",
"color": "white",
"spoils_in": "4 days",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/nuts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
{
"type": "COMESTIBLE",
"id": "acorns_cooked",
"name": { "str": "cooked acorn meal" },
"name": { "str": "cooked acorn meal", "str_pl": "cooked acorn meal" },
"weight": "22 g",
"color": "brown",
"spoils_in": "30 days",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/comestibles/other.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
{
"type": "COMESTIBLE",
"id": "yeast",
"name": "yeast",
"name": { "str": "yeast", "str_pl": "yeast" },
"weight": "11 g",
"color": "white",
"container": "bag_plastic",
Expand All @@ -172,7 +172,7 @@
{
"type": "COMESTIBLE",
"id": "meal_bone",
"name": "bone meal",
"name": { "str": "bone meal", "str_pl": "bone meal" },
"weight": "112 g",
"color": "white",
"comestible_type": "FOOD",
Expand All @@ -188,7 +188,7 @@
{
"type": "COMESTIBLE",
"id": "meal_bone_tainted",
"name": "tainted bone meal",
"name": { "str": "tainted bone meal", "str_pl": "tainted bone meal" },
"weight": "112 g",
"color": "white",
"use_action": "POISON",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/veggy_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
{
"type": "COMESTIBLE",
"id": "cornmeal",
"name": "cornmeal",
"name": { "str": "cornmeal", "str_pl": "cornmeal" },
"weight": "19 g",
"color": "yellow",
"spoils_in": "360 days",
Expand Down
5 changes: 3 additions & 2 deletions data/json/items/comestibles/wheat.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
{
"type": "COMESTIBLE",
"id": "oatmeal",
"name": "oatmeal",
"name": { "str": "oatmeal", "str_pl": "oatmeal" },
"weight": "25 g",
"color": "light_gray",
"spoils_in": "360 days",
Expand Down Expand Up @@ -208,7 +208,7 @@
{
"type": "COMESTIBLE",
"id": "oatmeal_cooked",
"name": "cooked oatmeal",
"name": { "str": "cooked oatmeal", "str_pl": "cooked oatmeal" },
"weight": "247 g",
"color": "light_gray",
"spoils_in": "10 days",
Expand All @@ -228,6 +228,7 @@
"type": "COMESTIBLE",
"id": "oatmeal_deluxe",
"name": "deluxe cooked oatmeal",
"name_plural": "deluxe cooked oatmeal",
"weight": "164 g",
"color": "light_gray",
"spoils_in": "10 days",
Expand Down