Skip to content

Commit

Permalink
Merge pull request #62529 from BrettDong/typo
Browse files Browse the repository at this point in the history
Misc typo fixes
  • Loading branch information
dseguin authored Dec 3, 2022
2 parents 97bab67 + d141116 commit 3ccd220
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
{
"id": "leather_pride_flag",
"name": { "str": "leather flag" },
"description": "A large black and blue leather flag. A horizontally striped black and blue flag with a white band in the midle and red heart in a corner. The black represents leather; the blue represents devotion, loyalty, and community; the white represents purity and innocence; and the red heart represents love for the community.",
"description": "A large black and blue leather flag. A horizontally striped black and blue flag with a white band in the middle and red heart in a corner. The black represents leather; the blue represents devotion, loyalty, and community; the white represents purity and innocence; and the red heart represents love for the community.",
"weight": 1
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@
"name": { "str_sp": "acetic acid" },
"symbol": "~",
"color": "white",
"description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for postapocalyptic New England?",
"description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for post-apocalyptic New England?",
"volume": "250 ml",
"weight": "300 g",
"bashing": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@
"quench": -12,
"healthy": -1,
"calories": 434,
"description": "A small, microwaveable steak & cheese burrito, like those found at gas stations.",
"description": "A small, microwavable steak & cheese burrito, like those found at gas stations.",
"price": 200,
"price_postapoc": 200,
"material": [ "flesh", "junk", "milk" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/resources/chemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"name": { "str_sp": "calcium chloride" },
"symbol": "=",
"color": "white",
"description": "A white odorless strongly hygroscopic powder with an extremely salty taste. Often used as a de-icing agent or as dessicant.",
"description": "A white odorless strongly hygroscopic powder with an extremely salty taste. Often used as a de-icing agent or as desiccant.",
"container": "bag_canvas",
"material": [ "powder_nonflam" ],
"volume": "250 ml",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"id": "tourniquet_upper",
"type": "ARMOR",
"name": { "str": "tourniquet (arm)", "str_pl": "tourniquets (arm)" },
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"weight": "300 g",
"volume": "300 ml",
"price": 20000,
Expand All @@ -69,7 +69,7 @@
"id": "tourniquet_upper_XL",
"type": "ARMOR",
"name": { "str": "tourniquet (arm XL)", "str_pl": "tourniquets (arm XL)" },
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"copy-from": "tourniquet_upper",
"looks_like": "tourniquet_upper",
"sided": true,
Expand All @@ -80,7 +80,7 @@
"id": "tourniquet_upper_XS",
"type": "ARMOR",
"name": { "str": "tourniquet (arm XS)", "str_pl": "tourniquets (arm XS)" },
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"copy-from": "tourniquet_upper",
"looks_like": "tourniquet_upper",
"covers": [ "arm_l", "arm_r" ],
Expand All @@ -92,7 +92,7 @@
"id": "tourniquet_lower",
"type": "ARMOR",
"name": { "str": "tourniquet (leg)", "str_pl": "tourniquets (leg)" },
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"copy-from": "tourniquet_upper",
"looks_like": "tourniquet_upper",
"sided": true,
Expand All @@ -105,7 +105,7 @@
"id": "tourniquet_lower_XL",
"type": "ARMOR",
"name": { "str": "tourniquet (leg)", "str_pl": "tourniquets (leg)" },
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.",
"copy-from": "tourniquet_upper",
"looks_like": "tourniquet_upper",
"sided": true,
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/mutant_mammal.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
"type": "MONSTER",
"copy-from": "mon_dog_auscattle_pup",
"name": { "str": "translucent puppy", "str_pl": "translucent puppies" },
"description": "This little rascal doesn't cast a shadow, and is near seethrough in the right light. Its condition doesn't appear to cause it any harm, but it does have a hard time chasing its own tail.",
"description": "This little rascal doesn't cast a shadow, and is near see-through in the right light. Its condition doesn't appear to cause it any harm, but it does have a hard time chasing its own tail.",
"upgrades": { "age_grow": 42, "into": "mon_dog_incorporeal" }
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed_soldiers.json
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@
"id": "mon_zombie_sailor",
"type": "MONSTER",
"name": { "str": "zombie mariner" },
"description": "Still dressed in the ragged remains of deep blue naval fatigues, it’s clear that this walking corpse was once a sailor of some description. The US Navy’s insignia is embroidered on the shredded sleave and shoulder of its bloodied jacket, the dead crewman’s battered cap is beaten into the remains of its fractured skull and its inky black eyes are scanning the area around it as dark ooze drips from its limply hanging maw.",
"description": "Still dressed in the ragged remains of deep blue naval fatigues, it’s clear that this walking corpse was once a sailor of some description. The US Navy’s insignia is embroidered on the shredded sleeve and shoulder of its bloodied jacket, the dead crewman’s battered cap is beaten into the remains of its fractured skull and its inky black eyes are scanning the area around it as dark ooze drips from its limply hanging maw.",
"copy-from": "mon_zombie_milbase_personnel",
"looks_like": "mon_zombie_soldier",
"armor_bash": 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"id": "enviroment_conditions_block_2",
"type": "widget",
"style": "layout",
"label": "enviroment block",
"label": "environment block",
"arrange": "minimum_columns",
"width": 56,
"widgets": [ "time_layout", "wether_layout" ]
Expand All @@ -29,7 +29,7 @@
{
"id": "wether_layout",
"type": "widget",
"label": "wether",
"label": "weather",
"style": "layout",
"arrange": "rows",
"width": 28,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MMA/mutations.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"id": "MMA_MARTIAL_ARTS_POKKEN",
"name": { "str": "Pokken Master" },
"points": 2,
"description": "You are well versed in the monsterous Pocket Fist martial art. Train well, because it is your destiny to be a master.",
"description": "You are well versed in the monstrous Pocket Fist martial art. Train well, because it is your destiny to be a master.",
"starting_trait": true,
"initial_ma_styles": [ "style_mma_pokken" ],
"valid": false
Expand Down
2 changes: 1 addition & 1 deletion data/mods/TropiCataclysm/monsters/tropical_fungus.json
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"id": "mon_fungaloid_breather",
"type": "MONSTER",
"name": { "str": "fungal dispersor" },
"description": "A strange fungal creature similar to a moving ballon. It releases a cloud of spores in all directions.",
"description": "A strange fungal creature similar to a moving balloon. It releases a cloud of spores in all directions.",
"default_faction": "fungus",
"species": [ "FUNGUS" ],
"volume": "62500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/innawood/furniture_and_terrain/furniture-flora.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
{
"type": "furniture",
"id": "f_wildsbeet",
"name": "wild sugarbeet",
"description": "Sugarbeet plant, growing wild without human touch.",
"name": "wild sugar beet",
"description": "Sugar beet plant, growing wild without human touch.",
"symbol": "f",
"color": "magenta",
"looks_like": "f_dandelion",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/innawood/npcs/Backgrounds/high_school_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"id": "BGSS_HIGH_SCHOOL_1_STORY2",
"type": "talk_topic",
"dynamic_line": "I guess it got worse, because the teachers decided to tie us up and drink. For hours. And then a bunch of sweaty men with spears came to take us to the camps. They tooks us away in batches and I was in on the of the last batches and they didn't come back for us. The men with spears weren't much older than me… they didn't look like they knew what was going on. I lived nearby. I snuck off.",
"dynamic_line": "I guess it got worse, because the teachers decided to tie us up and drink. For hours. And then a bunch of sweaty men with spears came to take us to the camps. They took us away in batches and I was in on the of the last batches and they didn't come back for us. The men with spears weren't much older than me… they didn't look like they knew what was going on. I lived nearby. I snuck off.",
"responses": [
{ "text": "Did you get home?", "topic": "BGSS_HIGH_SCHOOL_1_STORY3" },
{ "text": "<done_conversation_section>", "topic": "TALK_FRIEND" },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/innawood/npcs/missiondef.json
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
"offer": "There's some important notes on my special stick that I need.",
"accepted": "Thanks! Just get the stick and bring it to me.",
"rejected": "Seriously? It's an easy job…",
"advice": "Don't worry, you'll know the stick when you see it, it is unmistakeable.",
"advice": "Don't worry, you'll know the stick when you see it, it is unmistakable.",
"inquire": "So, do you have my stick yet?",
"success": "Excellent, thank you!",
"success_lie": "What?! You liar!",
Expand Down

0 comments on commit 3ccd220

Please sign in to comment.