Skip to content

Commit

Permalink
Merge pull request CleverRaven#77830 from ampersand55/for_for
Browse files Browse the repository at this point in the history
Fix double preposition typos
  • Loading branch information
Night-Pryanik authored Nov 14, 2024
2 parents 156cf13 + 7831f4c commit 65b3721
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion data/json/flags.json
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@
{
"id": "PRESERVE_SPAWN_OMT",
"type": "json_flag",
"//": "This item will store the OMT it spawned in in the 'spawn_location_omt' var"
"//": "This item will store the OMT it spawned in the 'spawn_location_omt' var"
},
{
"id": "PROVIDES_TECHNIQUES",
Expand Down
2 changes: 1 addition & 1 deletion data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@
{
"type": "item_group",
"id": "ammo_launcher_grenade_adapter",
"//": "Adapters for for firing multiples of civilian legal ammo from a greneade launcher",
"//": "Adapters for firing multiples of civilian legal ammo from a greneade launcher",
"subtype": "distribution",
"entries": [ { "item": "40x46mm_hornets_nest_22lr", "prob": 50 }, { "item": "40x46mm_hornets_nest_410", "prob": 50 } ]
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/book/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -1304,8 +1304,8 @@
{
"id": "book_judaica_softcover_1",
"name": {
"str": "A Short History of the Jewish People: From Legendary Times to to Modern Statehood",
"str_pl": "copies of A Short History of the Jewish People: From Legendary Times to to Modern Statehood"
"str": "A Short History of the Jewish People: From Legendary Times to Modern Statehood",
"str_pl": "copies of A Short History of the Jewish People: From Legendary Times to Modern Statehood"
},
"description": "A survey-level study of Jewish history, from Biblical times through to the 1990s. At only 250 pages long, it is by necessity very brief on any individual topic."
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/fluff.json
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@
"type": "GENERIC",
"category": "other",
"name": { "str_sp": "Snakes and Ladders" },
"description": "A board game for two or more players, regarded before the Cataclysm as as a worldwide classic. The objective of the game is to navigate one's game piece to the goal on the board, helped by climbing ladders but hindered by sliding down snakes.",
"description": "A board game for two or more players, regarded before the Cataclysm as a worldwide classic. The objective of the game is to navigate one's game piece to the goal on the board, helped by climbing ladders but hindered by sliding down snakes.",
"weight": "300 g",
"volume": "1800 ml",
"price": "25 cent",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/flintlock.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
"durability": 6,
"blackpowder_tolerance": 96,
"clip_size": 1,
"//": "Sources place muzzle loader firing rate at at up to 4 / minute for elite professionals. Nominal 30s will be cut down to 15s at skill 10.",
"//": "Sources place muzzle loader firing rate at up to 4 / minute for elite professionals. Nominal 30s will be cut down to 15s at skill 10.",
"reload": 3000,
"valid_mod_locations": [
[ "sling", 1 ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/mapgen/nested/house_nested.json
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@
{
"type": "mapgen",
"method": "json",
"//": "bookcases and chair for for studies, workrooms, hobby rooms, etc",
"//": "bookcases and chair for studies, workrooms, hobby rooms, etc",
"nested_mapgen_id": "bonus_room_3x3_1",
"object": {
"mapgensize": [ 3, 3 ],
Expand All @@ -1961,7 +1961,7 @@
{
"type": "mapgen",
"method": "json",
"//": "bookcases and chair for for studies, workrooms, hobby rooms, etc",
"//": "bookcases and chair for studies, workrooms, hobby rooms, etc",
"nested_mapgen_id": "bonus_room_3x3_1A",
"object": {
"mapgensize": [ 3, 3 ],
Expand Down
8 changes: 4 additions & 4 deletions data/json/vehicleparts/modular_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"id": "veh_tools_kitchen",
"copy-from": "veh_tools_abstract",
"name": { "str": "mounted kitchen" },
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for for fuel tank connections.",
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for fuel tank connections.",
"looks_like": "kitchen_unit"
},
{
"type": "GENERIC",
"id": "veh_tools_workshop",
"copy-from": "veh_tools_abstract",
"name": { "str": "mounted workshop" },
"description": "A table rig with drawers and fixtures for storing tools, wiring for high power electric connectors and valves for for fuel tank connections.",
"description": "A table rig with drawers and fixtures for storing tools, wiring for high power electric connectors and valves for fuel tank connections.",
"looks_like": "welding_rig"
},
{
Expand Down Expand Up @@ -148,7 +148,7 @@
"type": "vehicle_part",
"id": "veh_tools_kitchen",
"copy-from": "veh_tools_part_abstract",
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for for fuel tank connections.",
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for fuel tank connections.",
"item": "veh_tools_kitchen",
"looks_like": "kitchen_unit",
"pseudo_tools": [ { "id": "water_faucet" } ],
Expand Down Expand Up @@ -177,7 +177,7 @@
"type": "vehicle_part",
"id": "veh_tools_workshop",
"copy-from": "veh_tools_part_abstract",
"description": "A table rig with drawers and fixtures for storing tools, wiring for high power electric connectors and valves for for fuel tank connections.",
"description": "A table rig with drawers and fixtures for storing tools, wiring for high power electric connectors and valves for fuel tank connections.",
"looks_like": "welding_rig",
"item": "veh_tools_workshop",
"//": "allow tools here that require high power draw but no fume hood",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/mutations/esper.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"id": "AFS_ELECTROKINETIC",
"name": "Electrokinetic",
"points": 0,
"description": "The ability to to control electricity with your mind.",
"description": "The ability to control electricity with your mind.",
"types": [ "ESPER" ],
"starting_trait": false,
"purifiable": false,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/vehicles/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
"id": "veh_tools_kitchen",
"type": "vehicle_part",
"copy-from": "veh_tools_kitchen",
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for for fuel tank connections.",
"description": "A table rig with a faucet for water tank access, fume hood, drawers and fixtures for storing tools, low power electric connectors and valves for fuel tank connections.",
"item": "veh_tools_kitchen",
"looks_like": "kitchen_unit",
"extend": { "allowed_tools": [ "afs_atompot" ] }
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Magiclysm/items/spell_scrolls.json
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,7 @@
"id": "spell_scroll_kelvinist_anti_cold",
"//": "Kelvinist spell",
"name": { "str": "Scroll of Cloak of Warmth", "str_pl": "Scrolls of Cloak of Warmth" },
"description": "Winter-be-gone through the power of of modern magic.",
"description": "Winter-be-gone through the power of modern magic.",
"use_action": { "type": "learn_spell", "spells": [ "kelvinist_anti_cold" ] }
},
{
Expand All @@ -1462,7 +1462,7 @@
"id": "spell_scroll_kelvinist_anti_heat",
"//": "Kelvinist spell",
"name": { "str": "Scroll of Cloak of Chill", "str_pl": "Scrolls of Cloak of Chill" },
"description": "Summer-be-gone through the power of of modern magic.",
"description": "Summer-be-gone through the power of modern magic.",
"use_action": { "type": "learn_spell", "spells": [ "kelvinist_anti_heat" ] }
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"id": "t_tree_small_alien_2",
"name": "alien tree",
"looks_like": "t_bamboo_tall",
"description": "A tall, thin alien plant. From a distance it seems more like a column than a tree, but when you get closer you can see that it's made up of a series of of broad, serrated leaves all folded so closely together that they form a single stalk.",
"description": "A tall, thin alien plant. From a distance it seems more like a column than a tree, but when you get closer you can see that it's made up of a series of broad, serrated leaves all folded so closely together that they form a single stalk.",
"symbol": "7",
"color": "dark_gray",
"move_cost": 0,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MindOverMatter/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"subtype": "hobby",
"id": "mid_electrokinetic",
"name": "Arising Electrokinetic",
"description": "Something happened during the storms that raged during the Cataclysm, and now you can do things that would have once seemed impossible. You an hurl lightning bolts from your hands, like some kind of superhero, and your smartphone still has a full charge even though you haven't plugged it in in weeks. Some kind of huge wasp attacked you in the woods and there was a crackle like thunder and it fell to the ground twitching. You didn't stop to check if it would move again.",
"description": "Something happened during the storms that raged during the Cataclysm, and now you can do things that would have once seemed impossible. You an hurl lightning bolts from your hands, like some kind of superhero, and your smartphone still has a full charge even though you haven't plugged it in weeks. Some kind of huge wasp attacked you in the woods and there was a crackle like thunder and it fell to the ground twitching. You didn't stop to check if it would move again.",
"points": 7,
"traits": [ "ELECTROKINETIC", "ELECTRO_SHIELD" ],
"skills": [ { "level": 6, "name": "metaphysics" } ],
Expand Down
6 changes: 3 additions & 3 deletions data/mods/MindOverMatter/snippets/snippets_new.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
{
"name": "testing report I2-8129",
"id": "lab_file_clairsentience_02",
"text": "Subject O21 was placed blindfolded in a completely dark room with a deck of shuffled playing cards, instructed to remove the blindfold, and asked to sort them in standard order: clubs, diamonds, hearts, spades, each in numerical order. Task was completed in 6:03 with 18/52 cards in the proper order and minor to major ordering errors in all other cards. Subject was then asked to to drink from the coffee cup in the room. Cup was placed on a shelf above the door to prevent movement around the room from discovering it, but task was completed in 1:14, with the only difficulty being subject's height (158 cm) making it harder to reach the shelf. Subject was then asked to cross the room to the table, pick up the paper, and read the sequence of numbers written on it. Subject was unable to do so, only correctly reciting the first two digits.\n\nExperiment does uphold the thesis that successful NOBLE HORIZON mathematicians perceive their surroundings through means other than light. As O21 was unable to read the document, their sense is not \"sight\" as such. Further experimentation to determine its limits is necessary."
"text": "Subject O21 was placed blindfolded in a completely dark room with a deck of shuffled playing cards, instructed to remove the blindfold, and asked to sort them in standard order: clubs, diamonds, hearts, spades, each in numerical order. Task was completed in 6:03 with 18/52 cards in the proper order and minor to major ordering errors in all other cards. Subject was then asked to drink from the coffee cup in the room. Cup was placed on a shelf above the door to prevent movement around the room from discovering it, but task was completed in 1:14, with the only difficulty being subject's height (158 cm) making it harder to reach the shelf. Subject was then asked to cross the room to the table, pick up the paper, and read the sequence of numbers written on it. Subject was unable to do so, only correctly reciting the first two digits.\n\nExperiment does uphold the thesis that successful NOBLE HORIZON mathematicians perceive their surroundings through means other than light. As O21 was unable to read the document, their sense is not \"sight\" as such. Further experimentation to determine its limits is necessary."
},
{
"name": "COLD BELOW progress report",
Expand Down Expand Up @@ -257,7 +257,7 @@
"name": "testing report I4-7707",
"id": "lab_file_telekinesis_04",
"weight": 1000,
"text": "Dr. Richardson,\nPer request, we assessed the ability of three JUNIPER GOLD mathematicians to affect very small masses. Subjects were ordered to look into a microscope at water flora, then at bacterial samples, and then at images from electron microscopes. While it makes intuitive sense that larger masses would require more effort and control to manipulate through telekinesis, its actual behavior does not always follow logical constraints--see the way that barriers react to external forces. In this experiment, we found that manipulating water flora was possible but bacterial samples and electron microscopes both failed. Our initial hypothesis was that direct observation was required, but the bacterial test provided that is not sufficient to explain JUNIPER GOLD's limitations. It is currently unclear if this is a psychological limitation or something inherent to to JUNIPER GOLD. Further testing with a wider variety of mathematicians is required.\nMadeline Robbins\nResearcher"
"text": "Dr. Richardson,\nPer request, we assessed the ability of three JUNIPER GOLD mathematicians to affect very small masses. Subjects were ordered to look into a microscope at water flora, then at bacterial samples, and then at images from electron microscopes. While it makes intuitive sense that larger masses would require more effort and control to manipulate through telekinesis, its actual behavior does not always follow logical constraints--see the way that barriers react to external forces. In this experiment, we found that manipulating water flora was possible but bacterial samples and electron microscopes both failed. Our initial hypothesis was that direct observation was required, but the bacterial test provided that is not sufficient to explain JUNIPER GOLD's limitations. It is currently unclear if this is a psychological limitation or something inherent to JUNIPER GOLD. Further testing with a wider variety of mathematicians is required.\nMadeline Robbins\nResearcher"
},
{
"name": "Big or small, which is it?",
Expand Down Expand Up @@ -375,7 +375,7 @@
"//": "This is a refernce to Panaceus testing",
"id": "lab_file_vitakinesis_02",
"weight": 1000,
"text": "Application of matrix technology and XE037 samples together with cutting-edge medical advances blah blah you know the drill. Anyway, we sourced the samples, we synthesized the compound, we did the tests. It's magic. I know that sounds dumb but it's literally magic. Animal testing showed complete remission of every cancer they developed. \"Alright, Eric,\" you say, \"that's fine but cancer testing in animals is b̵u̵l̵l̵s̵h̵i̵t̵\"clinically irrelevant due to to high real-world failure rates in humans\". Sure, yes, you're right. But we sourced some enthusiastic voluntolds from XEDRA-12's stock and a couple of them had cancer they were planning on testing XE037 interactions with. Well they aren't going to anymore because XV471 cleaned them right up. Totally healthy. Zero cancer.\n\nSubject B84 had cystic fibrosis and it's gone. GONE. Perfectly normal lungs. Now what's that other than magic?\n\nYou want to get more funding for this, just authorize selling XV471 to some sick Russian oligarch for like $10 billion. He gets cured and the money keeps flowing. And honestly it needs to be that expensive with how much this stuff costs to produce. We get the materials and process them and nine times out of ten it's just a sugar pill for no damn reason I can find. But that tenth time, wow.\n\nShred this after you read it. I don't need the director lecturing me about professionalism again."
"text": "Application of matrix technology and XE037 samples together with cutting-edge medical advances blah blah you know the drill. Anyway, we sourced the samples, we synthesized the compound, we did the tests. It's magic. I know that sounds dumb but it's literally magic. Animal testing showed complete remission of every cancer they developed. \"Alright, Eric,\" you say, \"that's fine but cancer testing in animals is b̵u̵l̵l̵s̵h̵i̵t̵\"clinically irrelevant due to high real-world failure rates in humans\". Sure, yes, you're right. But we sourced some enthusiastic voluntolds from XEDRA-12's stock and a couple of them had cancer they were planning on testing XE037 interactions with. Well they aren't going to anymore because XV471 cleaned them right up. Totally healthy. Zero cancer.\n\nSubject B84 had cystic fibrosis and it's gone. GONE. Perfectly normal lungs. Now what's that other than magic?\n\nYou want to get more funding for this, just authorize selling XV471 to some sick Russian oligarch for like $10 billion. He gets cured and the money keeps flowing. And honestly it needs to be that expensive with how much this stuff costs to produce. We get the materials and process them and nine times out of ten it's just a sugar pill for no damn reason I can find. But that tenth time, wow.\n\nShred this after you read it. I don't need the director lecturing me about professionalism again."
},
{
"name": "Treatment time until complete recovery",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/items/clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
{
"id": "syndicalist_states_tshirt",
"name": { "str": "CSA t-shirt" },
"description": "A short-sleeved cotton shirt with a globe at the bottom with a C above the globe with an S to the left and A to the right. The background is like a flag with with the top left being the corner of a black triangle and the bottom right is a red triangle. They meet in the middle with the globe.",
"description": "A short-sleeved cotton shirt with a globe at the bottom with a C above the globe with an S to the left and A to the right. The background is like a flag with the top left being the corner of a black triangle and the bottom right is a red triangle. They meet in the middle with the globe.",
"weight": 1
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"points": 3,
"visibility": 0,
"ugliness": 0,
"description": "Upon gaining this ability the Ierde gains the ability to, while underground, rest and recover energy as though sleeping. Activate to to begin the vigil.",
"description": "Upon gaining this ability the Ierde gains the ability to, while underground, rest and recover energy as though sleeping. Activate to begin the vigil.",
"prereqs": [ "IERDE_EYES" ],
"category": [ "IERDE" ],
"activated_is_setup": false,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/spells/lilin_spell_eocs.json
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@
"then": { "math": [ "u_hp('leg_r')", "+=", "25 * min( (u_vitamin('lilin_ruach_vitamin') / 4000),1)" ] }
}
],
"false_effect": { "u_message": "You don't have enough ruach to to heal yourself!", "type": "bad" }
"false_effect": { "u_message": "You don't have enough ruach to heal yourself!", "type": "bad" }
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
{
"result": [ "t_triffid_wood_wall" ],
"valid_terrain": [ "t_triffid_bark_wall" ],
"message": "The wooden wall shudders as as the bark peels off in sheets, eventually becoming a solid expanse of bare wood."
"message": "The wooden wall shudders as the bark peels off in sheets, eventually becoming a solid expanse of bare wood."
},
{
"result": [ "t_triffid_bark_wall" ],
Expand Down
1 change: 1 addition & 0 deletions tools/spell_checker/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,7 @@ Bulgarian
Bullard
bullpup
bullseye
bullshit
Buluotuo
Bulwer
Bundahis
Expand Down

0 comments on commit 65b3721

Please sign in to comment.