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

Grammar/Spelling #38006

Merged
merged 7 commits into from
Feb 22, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
Spelling
  • Loading branch information
klorpa committed Jan 19, 2020
commit 062710ef25b949b04514ac1af096b50d7df51278
4 changes: 2 additions & 2 deletions data/json/itemgroups/magazines.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
{
"type": "item_group",
"id": "mags_smg_common",
"//": "Factory specification smg magazines commonly owned by citizens.",
"//": "Factory specification SMG magazines commonly owned by citizens.",
"items": [
[ "360_200_mag", 5 ],
[ "a180mag", 10 ],
Expand All @@ -205,7 +205,7 @@
{
"type": "item_group",
"id": "mags_smg_rare",
"//": "Aftermarket or otherwise uncomon SMG magazines excluding milspec.",
"//": "Aftermarket or otherwise uncommon SMG magazines excluding milspec.",
"items": [
[ "360_400_mag", 5 ],
[ "calicomag", 15 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"healthy": -10,
"addiction_potential": 5,
"calories": 174,
"description": "This looks like a handful of lemon-colored liquid which has taken a set, much like pre-Cataclysm jello. It has a strong but delicious aroma, but is clearly either mutated or of alien origin.",
"description": "This looks like a handful of lemon-colored liquid which has taken a set, much like pre-Cataclysm Jello. It has a strong but delicious aroma, but is clearly either mutated or of alien origin.",
"price": 0,
"material": "fruit",
"volume": 0,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/generic/currency.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"type": "GENERIC",
"id": "FlatCoin",
"name": "FlatCoin",
"description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlayed with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.",
"description": "This is a coin that has been flattened in a novelty coin flattening machine. The machine has been somewhat crudely altered so that the design - which appears to once have been Mickey Mouse - is overlaid with a handwritten emblem of a book. There is some text that faintly reads 'Campus Exchange Token'.",
"price": 5,
"price_postapoc": 320,
"weight": "18 g",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"looks_like": "ar15",
"type": "GUN",
"name": "M110A1",
"description": "A derivative of H&K's G28 with an aluminium upper reciever to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
"description": "A derivative of H&K's G28 with an aluminium upper receiver to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
"weight": "4330 g",
"volume": "2 L",
"price": 320000,
Expand Down
76 changes: 38 additions & 38 deletions data/json/monsters/fish.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,78 +159,78 @@
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "trout" },
"description": "A Trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_brown_trout",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "brown trout" },
"looks_like": "mon_fish_trout",
"description": "A Brown Trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A brown trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_brook_trout",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "brook trout" },
"looks_like": "mon_fish_trout",
"description": "A Brook Trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A brook trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_lake_trout",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "lake trout" },
"looks_like": "mon_fish_trout",
"description": "A Lake trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A lake trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_rainbow_trout",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "rainbow trout" },
"looks_like": "mon_fish_trout",
"description": "A Rainbow Trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A rainbow trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_steelhead_trout",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "steelhead trout" },
"looks_like": "mon_fish_trout",
"description": "A Steelhead Trout. A fish made popular by father-son fishing trips, Except for the part where you have to gut it."
"description": "A steelhead trout. A fish made popular by father-son fishing trips, except for the part where you have to gut it."
},
{
"id": "mon_fish_salmon",
"type": "MONSTER",
"copy-from": "mon_fish_huge",
"name": { "str": "salmon" },
"description": "An Atlantic Salmon. A very fatty, nutritious fish. Tastes great smoked."
"description": "An Atlantic salmon. A very fatty, nutritious fish. Tastes great smoked."
},
{
"id": "mon_fish_kokanee_salmon",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "kokanee salmon" },
"looks_like": "mon_fish_salmon",
"description": "A Kokanee Salmon. A very fatty, nutritious fish. Tastes great smoked."
"description": "A Kokanee salmon. A very fatty, nutritious fish. Tastes great smoked."
},
{
"id": "mon_fish_chinook_salmon",
"type": "MONSTER",
"copy-from": "mon_fish_huge",
"name": { "str": "chinook salmon" },
"looks_like": "mon_fish_salmon",
"description": "A Chinook Salmon. A very fatty, nutritious fish. Tastes great smoked."
"description": "A Chinook salmon. A very fatty, nutritious fish. Tastes great smoked."
},
{
"id": "mon_fish_coho_salmon",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "coho salmon" },
"looks_like": "mon_fish_salmon",
"description": "A Coho Salmon. A very fatty, nutritious fish. Tastes great smoked."
"description": "A Coho salmon. A very fatty, nutritious fish. Tastes great smoked."
},
{
"id": "mon_fish_whitefish",
Expand All @@ -244,146 +244,146 @@
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "largemouth bass", "str_pl": "largemouth bass" },
"description": "A Largemouth Bass. Very popular with sports fishermen."
"description": "A largemouth bass. Very popular with sports fishermen."
},
{
"id": "mon_fish_sbass",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "smallmouth bass", "str_pl": "smallmouth bass" },
"description": "A Smallmouth Bass. Being intolerant to pollution in the water, smallmouth bass are a good indicator of how clean it is."
"description": "A smallmouth bass. Being intolerant to pollution in the water, smallmouth bass are a good indicator of how clean it is."
},
{
"id": "mon_fish_pbass",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "striped bass", "str_pl": "striped bass" },
"description": "A Striped Bass. Mostly a salt water fish, they migrate to fresher water to spawn."
"description": "A striped bass. Mostly a salt water fish, they migrate to fresher water to spawn."
},
{
"id": "mon_fish_white_bass",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "white bass", "str_pl": "white bass" },
"looks_like": "mon_fish_pbass",
"description": "A White Bass. Common to the region, a slab-sided and spiny-rayed little fish."
"description": "A white bass. Common to the region, a slab-sided and spiny-rayed little fish."
},
{
"id": "mon_fish_perch",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "perch", "str_pl": "perches" },
"looks_like": "mon_fish_pickerel",
"description": "A small sprightly Perch. A very bony fish, still got some tasty meat on it though."
"description": "A small sprightly perch. A very bony fish, still got some tasty meat on it though."
},
{
"id": "mon_fish_walleye",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "walleye" },
"looks_like": "mon_fish_pbass",
"description": "A Walleye, a green-brown medium-sized fish with a white belly."
"description": "A walleye, a green-brown medium-sized fish with a white belly."
},
{
"id": "mon_fish_sunfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "sunfish", "str_pl": "sunfish" },
"description": "A Sunfish. A small fish related to bass or bluegill."
"description": "A sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_pumpkinseed",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "pumpkinseed sunfish", "str_pl": "pumpkinseed sunfish" },
"looks_like": "mon_fish_sunfish",
"description": "A Pumpkinseed Sunfish. A small fish related to bass or bluegill."
"description": "A pumpkinseed sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_bluegill",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "bluegill" },
"description": "A Bluegill, an invasive species in Japan. Commonly gutted and cooked whole."
"description": "A bluegill, an invasive species in Japan. Commonly gutted and cooked whole."
},
{
"id": "mon_fish_redbreast",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "redbreast sunfish", "str_pl": "redbreast sunfish" },
"looks_like": "mon_fish_sunfish",
"description": "A Redbreast Sunfish. A small fish related to bass or bluegill."
"description": "A redbreast sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_green_sunfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "green sunfish", "str_pl": "green sunfish" },
"looks_like": "mon_fish_sunfish",
"description": "A Green Sunfish. A small fish related to bass or bluegill."
"description": "A green sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_longear_sunfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "longear sunfish", "str_pl": "longear sunfish" },
"looks_like": "mon_fish_sunfish",
"description": "A Longear Sunfish. A small fish related to bass or bluegill."
"description": "A longear sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_redear_sunfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "redear sunfish", "str_pl": "redear sunfish" },
"looks_like": "mon_fish_sunfish",
"description": "A Redear Sunfish. A small fish related to bass or bluegill."
"description": "A redear sunfish. A small fish related to bass or bluegill."
},
{
"id": "mon_fish_rock_bass",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "rock bass", "str_pl": "rock bass" },
"looks_like": "mon_fish_sunfish",
"description": "A Rock Bass. Related to sunfish, this tiny fish has a camouflage-like patterning and a red eye."
"description": "A rock bass. Related to sunfish, this tiny fish has a camouflage-like patterning and a red eye."
},
{
"id": "mon_fish_calico_bass",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "calico bass", "str_pl": "calico bass" },
"looks_like": "mon_fish_pbass",
"description": "A Calico Bass. A medium-sized fish also known as a 'Crappie'."
"description": "A calico bass. A medium-sized fish also known as a 'Crappie'."
},
{
"id": "mon_fish_warmouth",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "warmouth" },
"looks_like": "mon_fish_sunfish",
"description": "A Warmouth, similar to a rock bass, this small fish is related to the sunfish."
"description": "A warmouth, similar to a rock bass, this small fish is related to the sunfish."
},
{
"id": "mon_fish_bullhead",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "bullhead" },
"description": "A Bullhead, a type of catfish. Delicious battered and fried."
"description": "A bullhead, a type of catfish. Delicious battered and fried."
},
{
"id": "mon_fish_channel_catfish",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "channel catfish", "str_pl": "channel catfish" },
"looks_like": "mon_fish_bullhead",
"description": "A Channel Catfish, they have a forked tail and long whiskers."
"description": "A channel catfish, they have a forked tail and long whiskers."
},
{
"id": "mon_fish_white_catfish",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "white catfish", "str_pl": "white catfish" },
"looks_like": "mon_fish_bullhead",
"description": "A White Catfish, a small whiskered fish with a broad head."
"description": "A white catfish, a small whiskered fish with a broad head."
},
{
"id": "mon_fish_pike",
Expand All @@ -394,14 +394,14 @@
"melee_skill": 3,
"melee_dice_sides": 6,
"melee_cut": 4,
"description": "A Northern Pike. Pike can be a pretty aggressive fish, careful around those teeth."
"description": "A northern pike. Pike can be a pretty aggressive fish, careful around those teeth."
},
{
"id": "mon_fish_pickerel",
"type": "MONSTER",
"copy-from": "mon_fish_tiny",
"name": { "str": "pickerel" },
"description": "A Pickerel. It looks like a pike, but much smaller."
"description": "A pickerel. It looks like a pike, but much smaller."
},
{
"id": "mon_fish_muskellunge",
Expand All @@ -413,45 +413,45 @@
"melee_dice_sides": 6,
"melee_cut": 3,
"looks_like": "mon_fish_pike",
"description": "A Muskellunge. Closely related to pike, it shares the same aggression and sharp teeth."
"description": "A muskellunge. Closely related to pike, it shares the same aggression and sharp teeth."
},
{
"id": "mon_fish_white_sucker",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "white sucker" },
"looks_like": "mon_fish_pbass",
"description": "A White Sucker. It has a streamlined body with a round mouth."
"description": "A white sucker. It has a streamlined body with a round mouth."
},
{
"id": "mon_fish_carp",
"type": "MONSTER",
"copy-from": "mon_fish_medium",
"name": { "str": "carp" },
"description": "A golden-yellow Common Carp. Some people think they don't taste great, but you can't afford to be choosy in the Cataclysm."
"description": "A golden-yellow common carp. Some people think they don't taste great, but you can't afford to be choosy in the Cataclysm."
},
{
"id": "mon_fish_grass_carp",
"type": "MONSTER",
"copy-from": "mon_fish_huge",
"name": { "str": "grass carp" },
"looks_like": "mon_fish_carp",
"description": "A huge Grass Carp. A golden, herbivorous fish."
"description": "A huge grass carp. A golden, herbivorous fish."
},
{
"id": "mon_fish_bowfin",
"type": "MONSTER",
"copy-from": "mon_fish_large",
"name": { "str": "bowfin" },
"description": "A Bowfin. These fish are related to gar but without the huge teeth, skin rending scales, and aggression."
"description": "A bowfin. These fish are related to gar but without the huge teeth, skin rending scales, and aggression."
},
{
"id": "mon_fish_fallfish",
"type": "MONSTER",
"copy-from": "mon_fish_small",
"name": { "str": "fallfish", "str_pl": "fallfish" },
"looks_like": "mon_fish_pbass",
"description": "A Fallfish. These fish are related to gar but without the huge teeth, skin rending scales, and aggression."
"description": "A fallfish. These fish are related to gar but without the huge teeth, skin rending scales, and aggression."
},
{
"id": "mon_fish_lobster",
Expand Down Expand Up @@ -486,7 +486,7 @@
"id": "mon_fish_crayfish",
"type": "MONSTER",
"name": { "str": "crayfish", "str_pl": "crayfish" },
"description": "If you could get ahold of a bunch more of these, a hefty pot of boiling water, and some spicy seasonings…",
"description": "If you could get a hold of a bunch more of these, a hefty pot of boiling water, and some spicy seasonings…",
"default_faction": "fish",
"bodytype": "crab",
"categories": [ "WILDLIFE" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/fliers.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
},
{
"id": "flier_32",
"text": "This is a public alert from the Centers for Disease Control. Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces. An unknown biological contaminant is suspected to be affecting citizens. The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and recieve an up-to-date flu shot if possible. Boiling water is recommended until further notice."
"text": "This is a public alert from the Centers for Disease Control. Its message, repeated in several languages, reads: PUBLIC HEALTH ALERT: Due to recent events, the CDC is issuing a warning to avoid public areas and spaces. An unknown biological contaminant is suspected to be affecting citizens. The CDC would like to remind the public to cover your nose and mouth when sneezing, wash your hands frequently, and receive an up-to-date flu shot if possible. Boiling water is recommended until further notice."
},
{
"id": "flier_33",
Expand Down
Loading