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

Spelling and text consistency fixes #72910

Merged
merged 2 commits into from
Apr 10, 2024
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
6 changes: 3 additions & 3 deletions data/json/construction_group.json
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@
{
"type": "construction_group",
"id": "dig_downstair",
"name": "Dig Downstair"
"name": "Dig Downstairs"
},
{
"type": "construction_group",
Expand Down Expand Up @@ -1107,7 +1107,7 @@
{
"type": "construction_group",
"id": "mine_downstair",
"name": "Mine Downstair"
"name": "Mine Downstairs"
},
{
"type": "construction_group",
Expand All @@ -1117,7 +1117,7 @@
{
"type": "construction_group",
"id": "mine_upstair",
"name": "Mine Upstair"
"name": "Mine Upstairs"
},
{
"type": "construction_group",
Expand Down
2 changes: 1 addition & 1 deletion data/json/effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -1353,7 +1353,7 @@
"name": [ "Elf-A Mutation", "Elf-A Transformation", "Elf-A Metamorphosis" ],
"desc": [
"You consumed Elf-A primer.",
"You must look after this world, if noone else will.",
"You must look after this world, if no one else will.",
"You see stars. You see so many stars."
],
"max_intensity": 3,
Expand Down
2 changes: 1 addition & 1 deletion data/json/effects_on_condition/example_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
"if": { "not": { "u_has_var": "test", "type": "eoc_sample", "context": "if_else", "value": "yes" } },
"then": [
{ "u_add_var": "test", "type": "eoc_sample", "context": "if_else", "value": "yes" },
{ "u_message": "Vriable added." }
{ "u_message": "Variable added." }
]
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2066,7 +2066,7 @@
{ "mapgen_update": "turn_off_LIXA", "target_var": { "global_val": "LIXA_surface_2a" } },
{ "mapgen_update": "turn_off_LIXA", "target_var": { "global_val": "LIXA_surface_2b" } },
{
"u_message": "There is a soft sound, like a champaigne cork popping in an empty concert hall. The world is as it was again. The LIXA device still hums quietly as it finishes powering down.",
"u_message": "There is a soft sound, like a champagne cork popping in an empty concert hall. The world is as it was again. The LIXA device still hums quietly as it finishes powering down.",
"popup": true
},
{ "u_teleport": { "global_val": "LIXA_return_tp" }, "force": true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
"type": "furniture",
"id": "f_lixa_whiteboard",
"name": "whiteboard",
"description": "A wide space of whiteboard, for writing on with washable markers. No one has washed it in a long time, though; it is covered in dense scrawls of equations and waveform diagarams.",
"description": "A wide space of whiteboard, for writing on with washable markers. No one has washed it in a long time, though; it is covered in dense scrawls of equations and waveform diagrams.",
"symbol": "6",
"color": "blue",
"looks_like": "f_bulletin",
Expand Down
4 changes: 2 additions & 2 deletions data/json/furniture_and_terrain/furniture-flora.json
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@
{
"type": "furniture",
"id": "f_black_eyed_susan",
"name": "black eyed susan",
"name": "black eyed Susan",
"description": "A mildly poisonous yellow flower with a dark ball in the middle. Sometimes known as an ox-eye daisy.",
"looks_like": "f_dandelion",
"symbol": "f",
Expand Down Expand Up @@ -527,7 +527,7 @@
"type": "furniture",
"id": "f_wild_rice",
"name": "wild rice",
"description": "Also called Indian rice, Northern wild rice, or manoomin in Ojibwe, is a species of rice that has been harvested and used by Native American tribes of the northeast for hundreds of years. It's similar to other types of wild rice, offering a fibre-rich and healthy basis of a meal.",
"description": "Also called Indian rice, Northern wild rice, or manoomin in Ojibwe, is a species of rice that has been harvested and used by Native American tribes of the northeast for hundreds of years. It's similar to other types of wild rice, offering a fiber-rich and healthy basis of a meal.",
"symbol": "f",
"looks_like": "f_cattails",
"color": [ "brown_green", "green", "green", "brown" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-industrial.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"id": "f_compact_ASRG_containment",
"name": "Compact Advanced Sterling Radioisotope Generator",
"looks_like": "t_plut_generator",
"description": "This hefty lump of steel and lead is the housing unit for a stirling generator powered by plutonium-238, originally designed by NASA and repurposed by the military. It is plastered with warning signs. It's really heavy owing to the thick armor plating, but you could take this down and use it for your own purposes if you wanted.",
"description": "This hefty lump of steel and lead is the housing unit for a Stirling generator powered by plutonium-238, originally designed by NASA and repurposed by the military. It is plastered with warning signs. It's really heavy owing to the thick armor plating, but you could take this down and use it for your own purposes if you wanted.",
"symbol": "0",
"color": "green_white",
"move_cost_mod": -1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"id": "f_scutch_breaker",
"name": "stationary scutcher",
"looks_like": "f_rack",
"description": "A bulky, simple-hinged wooden device to break up the hard parts of fibre plants, with nail combs on the back for separating them out.",
"description": "A bulky, simple-hinged wooden device to break up the hard parts of fiber plants, with nail combs on the back for separating them out.",
"symbol": "=",
"bgcolor": "brown",
"move_cost_mod": 2,
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/terrain-flora.json
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@
"type": "terrain",
"id": "t_tree_coffee",
"name": "coffee tree",
"description": "This is 'gymnocladus dioicus', or the kentucky coffee tree, which produces roastable coffee pods and brewable leaves in the fall. If you examined the branches more closely, you could probably find a few mature ones.",
"description": "This is 'Gymnocladus dioicus', or the Kentucky coffee tree, which produces roastable coffee pods and brewable leaves in the fall. If you examined the branches more closely, you could probably find a few mature ones.",
"symbol": "7",
"color": [ "light_green", "light_green", "light_green_green", "brown" ],
"//": "barren in winter, fruits in autumn",
Expand Down Expand Up @@ -866,7 +866,7 @@
"type": "terrain",
"id": "t_tree_coffee_harvested",
"name": "coffee tree",
"description": "This is 'gymnocladus dioicus', or the kentucky coffee tree, which produces roastable coffee pods and brewable leaves in the fall. Looks like all the ripe pods have been picked.",
"description": "This is 'Gymnocladus dioicus', or the Kentucky coffee tree, which produces roastable coffee pods and brewable leaves in the fall. Looks like all the ripe pods have been picked.",
"symbol": "7",
"color": [ "light_green", "light_green", "light_green", "brown" ],
"//": "barren in winter, no fruits anymore",
Expand Down Expand Up @@ -2879,7 +2879,7 @@
"type": "terrain",
"id": "t_fungus_colony",
"name": "mushroom colony",
"description": "A large pile of organic matter which has molded over with fungus. The caps of many mundane mushrooms spring from the top, you can even recognise some. The fungi growing here don't seem edible, though.",
"description": "A large pile of organic matter which has molded over with fungus. The caps of many mundane mushrooms spring from the top, you can even recognize some. The fungi growing here don't seem edible, though.",
"symbol": "#",
"color": "dark_gray",
"move_cost": 2,
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain-walls.json
Original file line number Diff line number Diff line change
Expand Up @@ -1297,7 +1297,7 @@
"alias": [ "t_strconcr_h_brown", "t_strconc_v_brown" ],
"name": "reinforced brown concrete wall",
"looks_like": "t_wall_brown",
"description": "Reinfoced concrete wall painted brown.",
"description": "Reinforced concrete wall painted brown.",
"symbol": "LINE_OXOX",
"color": "brown",
"move_cost": 0,
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/terrain_vitrified.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
{
"type": "terrain",
"id": "t_vitrified_chickenwire_fence",
"name": "black fibreglass fence",
"name": "black fiberglass fence",
"description": "A network of delicate glass threads strung between thicker posts. The wind blowing across them produces a faint, eerie whine.",
"symbol": "LINE_OXOX",
"color": "dark_gray",
Expand Down
2 changes: 1 addition & 1 deletion data/json/item_spell_effects.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"id": "debug_kill_spell",
"type": "SPELL",
"name": "Debug Kill Creature",
"description": "Deal damage equal to 100% of monster's hp.",
"description": "Deal damage equal to 100% of monster's HP.",
"valid_targets": [ "self", "ally", "hostile", "ground" ],
"min_damage": 100,
"max_damage": 100,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name": { "str_sp": "battery" },
"symbol": "=",
"color": "yellow",
"description": "Some free-floating battery charge. It can be reloaded into rechargable battery cells, but can never be unloaded.",
"description": "Some free-floating battery charge. It can be reloaded into rechargeable battery cells, but can never be unloaded.",
"flags": [ "TRADER_AVOID", "ZERO_WEIGHT" ],
"material": [ "battery" ],
"effects": [ "COOKOFF" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/exodii.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
{
"abstract": "273x110abstract",
"type": "AMMO",
"name": "base exodii shotshell",
"name": "base Exodii shotshell",
"weight": "226 g",
"volume": "284 ml",
"longest_side": "119 mm",
Expand Down Expand Up @@ -121,7 +121,7 @@
{
"abstract": "273x44abstract",
"type": "AMMO",
"name": "base exodii grenade",
"name": "base Exodii grenade",
"weight": "195 g",
"volume": "176 ml",
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"type": "AMMO",
"name": { "str": "explosive slug" },
"//": "$30/shot thanks to tight regulation, one way or another.",
"description": "A shotgun shell shooting a small explosive. Banned in several states. While an explosive from a shotgun sounds impressive, its practical applications are limited at best. The loss in mass in order to accommodate an explosive give it much less impact force compared to traditional ammunition. The relatively small size of the slug can only accommodate a limited amount of explosives, resulting in a fairly underwelming explosion. These traits make it a utility tool for damaging barriers and disrupting other explosive devices, rather than something for anti-personnel use.",
"description": "A shotgun shell shooting a small explosive. Banned in several states. While an explosive from a shotgun sounds impressive, its practical applications are limited at best. The loss in mass in order to accommodate an explosive give it much less impact force compared to traditional ammunition. The relatively small size of the slug can only accommodate a limited amount of explosives, resulting in a fairly underwhelming explosion. These traits make it a utility tool for damaging barriers and disrupting other explosive devices, rather than something for anti-personnel use.",
"ascii_picture": "shot_he",
"price": 3000,
"price_postapoc": 1600,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -1695,7 +1695,7 @@
},
{
"id": "chelsea_boots",
"name": { "str": "pair of chelsea boots", "str_pl": "pairs of chelsea boots" },
"name": { "str": "pair of Chelsea boots", "str_pl": "pairs of Chelsea boots" },
"description": "A pair of knee-length, laceless boots formed from calfskin with an elastic side panel that's designed to stretch away to facilitate simple donning and doffing, these stylish stompers are a time-old gift from Victorian-age England. Intended for you to fashionably saunter down roadways rather than sprint for your life, this style of boot became a style staple within London during the 1960s, where they were synonymous with the mod crowd.",
"weight": 10
}
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
{
"id": "intersex_pride_flag",
"name": { "str": "intersex flag" },
"description": "A large yellow, and purple intersex flag. It displays a purple circle on a yellow field. Yellow and purple were chosen as colours as they were viewed as free from gender associations and were historically used to represent intersex people. The circle is described as \"unbroken and unornamented, symbolizing wholeness and completeness, and our potentialities\".",
"description": "A large yellow, and purple intersex flag. It displays a purple circle on a yellow field. Yellow and purple were chosen as colors as they were viewed as free from gender associations and were historically used to represent intersex people. The circle is described as \"unbroken and unornamented, symbolizing wholeness and completeness, and our potentialities\".",
"weight": 2
},
{
Expand Down Expand Up @@ -140,7 +140,7 @@
{
"id": "bear_pride_flag",
"name": { "str": "bear flag" },
"description": "A large black and orange international bear brotherhood flag. The flag displays seven horizontal stripes of colors ranging from black to brown representing the colours of different bear species, you can see a black bear paw in the upper right corner."
"description": "A large black and orange international bear brotherhood flag. The flag displays seven horizontal stripes of colors ranging from black to brown representing the colors of different bear species, you can see a black bear paw in the upper right corner."
}
]
},
Expand Down Expand Up @@ -1039,7 +1039,7 @@
{
"id": "macedonian_flag",
"name": { "str": "Macedonian flag" },
"description": "A flag that features a stylised yellow sun on a red field, with eight broadening rays extending from the center to the edge of the field.",
"description": "A flag that features a stylized yellow sun on a red field, with eight broadening rays extending from the center to the edge of the field.",
"weight": 10,
"append": true
},
Expand Down Expand Up @@ -1122,7 +1122,7 @@
},
{
"id": "portugese_flag",
"name": { "str": "Portugese flag" },
"name": { "str": "Portuguese flag" },
"description": "A flag that features a vertically striped bicolor of green and red, with the lesser coat of arms of centered over the color boundary.",
"weight": 10,
"append": true
Expand Down Expand Up @@ -1291,7 +1291,7 @@
{
"id": "spanish_flag",
"name": { "str": "Spanish flag" },
"description": "A flag that has a horizontal triband flag of red, yellow and red charged with the spanish coat of arms off centered toward the hoist.",
"description": "A flag that has a horizontal triband flag of red, yellow and red charged with the Spanish coat of arms off centered toward the hoist.",
"weight": 10,
"append": true
},
Expand Down Expand Up @@ -1319,7 +1319,7 @@
{
"id": "swedish_flag",
"name": { "str": "Swedish flag" },
"description": "A flag that features a blue field charged with a yellow nordic cross that extends to the edges, the vertical part of the cross is shifted to the hoist side.",
"description": "A flag that features a blue field charged with a yellow Nordic cross that extends to the edges, the vertical part of the cross is shifted to the hoist side.",
"weight": 10,
"append": true
},
Expand Down Expand Up @@ -2030,7 +2030,7 @@
"symbol": "[",
"color": "yellow",
"name": { "str": "rain poncho" },
"description": "A lightweigh plastic rain poncho with a hood. It folds into a very compact form when not in use.",
"description": "A lightweight plastic rain poncho with a hood. It folds into a very compact form when not in use.",
"price": 5000,
"price_postapoc": 50,
"material": [ "vinyl" ],
Expand Down
Loading
Loading