Skip to content

Commit

Permalink
Merge pull request CleverRaven#70843 from BrettDong/typo-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
BrettDong authored and Procyonae committed May 17, 2024
1 parent 327aa9f commit 2436ca7
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@
"recurrence": [ "1 days", "7 days" ],
"condition": { "and": [ { "is_season": "summer" }, { "u_has_trait": "LUPINE_FUR" } ] },
"effect": [
{ "u_message": "You've been shedding for a while, and your coat feels noticably lighter.", "type": "good" },
{ "u_message": "You've been shedding for a while, and your coat feels noticeably lighter.", "type": "good" },
{ "u_lose_trait": "LUPINE_FUR" },
{ "u_add_trait": "LUPINE_FUR_SUMMER" }
]
Expand All @@ -589,7 +589,7 @@
"recurrence": [ "1 days", "7 days" ],
"condition": { "and": [ { "is_season": "summer" }, { "u_has_trait": "URSINE_FUR" } ] },
"effect": [
{ "u_message": "You've been shedding for a while, and your coat feels noticably lighter.", "type": "good" },
{ "u_message": "You've been shedding for a while, and your coat feels noticeably lighter.", "type": "good" },
{ "u_lose_trait": "URSINE_FUR" },
{ "u_add_trait": "URSINE_FUR_SUMMER" }
]
Expand Down
2 changes: 1 addition & 1 deletion data/json/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@
"subtype": "hobby",
"id": "sewing_expert",
"name": "Sewing (Expert)",
"description": "Despite modern technology making career tailors obsolete you've spent much of your life hand-making clothing of all sorts, whether for historical purposes or to sell as artisinal goods. Too bad you can't stitch the holes in reality closed.",
"description": "Despite modern technology making career tailors obsolete you've spent much of your life hand-making clothing of all sorts, whether for historical purposes or to sell as artisanal goods. Too bad you can't stitch the holes in reality closed.",
"points": 8,
"proficiencies": [
"prof_closures",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/handloaded_bullets.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"name": { "str_sp": "blunderbuss scrap shot" },
"symbol": "=",
"color": "red",
"description": "A prepared blunderbuss shot comprisded of miscellaneous metal or stone bits.",
"description": "A prepared blunderbuss shot comprised of miscellaneous metal or stone bits.",
"material": [ "paper", "powder" ],
"volume": "100 ml",
"weight": "28 g",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/tool/shelters.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "damaged_shelter_kit",
"type": "TOOL",
"name": { "str": "damaged shelter kit" },
"description": "A dissassembled small shelter made of sticks and skins. It's been damaged and needs to be repaired before you can set it up.",
"description": "A disassembled small shelter made of sticks and skins. It's been damaged and needs to be repaired before you can set it up.",
"weight": "1360 g",
"volume": "7500 ml",
"longest_side": "90 cm",
Expand Down Expand Up @@ -61,7 +61,7 @@
"id": "shelter_kit",
"type": "TOOL",
"name": { "str": "shelter kit" },
"description": "A dissassembled small shelter made of sticks and skins. Activate it to set it up.",
"description": "A disassembled small shelter made of sticks and skins. Activate it to set it up.",
"weight": "1360 g",
"volume": "7500 ml",
"longest_side": "90 cm",
Expand All @@ -86,7 +86,7 @@
"id": "large_shelter_kit",
"type": "TOOL",
"name": { "str": "large shelter kit" },
"description": "A large dissassembled shelter made of sticks and skins. Activate it to set it up.",
"description": "A large disassembled shelter made of sticks and skins. Activate it to set it up.",
"weight": "21 kg",
"volume": "22 L",
"longest_side": "300 cm",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/toy.json
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
},
{
"id": "toy_plush_cloon",
"name": { "str": "commom loon plushie" },
"name": { "str": "common loon plushie" },
"description": "A cuddly common loon plushie with soft, black-and-white cotton fauxfeathers and a pleasing expression. Its head can bob and turn to mimic the loon's distinctive courtship calls.",
"weight": 1
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/e_logs.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
},
{
"id": "local_files_simple_24",
"text": "Peering down from what appears to be a security camera mount, this monochromatic segment of footage is focused on a section of airport taxiway. A solitary, desert-drab plane rests upon the stretch of concrete, its boarding stairs lowered, and its twin engines whining as it idles, the drone of its motors almost eclipsing the distant screams and gunfire occasionally conveyed through the crackling audio. Minutes into the tape, a small group of ragged people burst into view: assorted individuals in civilian garb flanked by a scattering of soldiers, all running headlong towards the aircraft. A small child can be seen at the rear of the group, half carried by a serviceman and lagging behind the main body. Suddenly, a violent flutter of gossamer wings fills the view as a dog-sized insectoid lunges past the camera, the colorful wasp alighting on the child’s back and snapping large mandibles about them. As a sickening, writhing carpet of wasps swarms into view and the group’s front-runners begin to hurry up the aircraft’s steps, a terrible game of tug of war ensues between the soldier and the ever-growing number of frenzied parasitoides, culminating in the man reeling back, showered in spurting blood, and clutching the child’s chewed-off arm. As the screaming child is subsumed beneath a twitching carapace of legs and pulsating ovipositors and the soldier is forced up the stairs, he pulls a pistol and fires wildly into the swarm, the ammunition depleting before he’s dragged into the aircraft. The last thing that the camera records is a spherical object being flung from the plane’s closing door—the item pinging off the taxying aircraft’s wing and rolling into the frenzied crowd. The plane powers out of sight, moments before the footage goes white."
"text": "Peering down from what appears to be a security camera mount, this monochromatic segment of footage is focused on a section of airport taxiway. A solitary, desert-drab plane rests upon the stretch of concrete, its boarding stairs lowered, and its twin engines whining as it idles, the drone of its motors almost eclipsing the distant screams and gunfire occasionally conveyed through the crackling audio. Minutes into the tape, a small group of ragged people burst into view: assorted individuals in civilian garb flanked by a scattering of soldiers, all running headlong towards the aircraft. A small child can be seen at the rear of the group, half carried by a serviceman and lagging behind the main body. Suddenly, a violent flutter of gossamer wings fills the view as a dog-sized insectoid lunges past the camera, the colorful wasp alighting on the child’s back and snapping large mandibles about them. As a sickening, writhing carpet of wasps swarms into view and the group’s front-runners begin to hurry up the aircraft’s steps, a terrible game of tug of war ensues between the soldier and the ever-growing number of frenzied parasitoids, culminating in the man reeling back, showered in spurting blood, and clutching the child’s chewed-off arm. As the screaming child is subsumed beneath a twitching carapace of legs and pulsating ovipositors and the soldier is forced up the stairs, he pulls a pistol and fires wildly into the swarm, the ammunition depleting before he’s dragged into the aircraft. The last thing that the camera records is a spherical object being flung from the plane’s closing door—the item pinging off the taxying aircraft’s wing and rolling into the frenzied crowd. The plane powers out of sight, moments before the footage goes white."
},
{
"id": "local_files_simple_25",
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/fungaloid_anatomy.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"Cutting the creature open makes its smell more noticeable. The smell is strange, but not unpleasant, and has a hint of mushroom.",
"What passes for blood in this creature is a clear fluid, but there isn't a lot of it outside of sacs distributed around the body.",
"What you think are muscles aren't too dissimilar from that of animals, if you're looking at it from a very general perspective and disregard the pale color and rubbery texture.",
"The fibers you find inside the creature are more akin to plant fibers than anything found in animals or terrestial fungii.",
"The fibers you find inside the creature are more akin to plant fibers than anything found in animals or terrestrial fungii.",
"You narrowly dodge a puff of spores when you accidentally cut into the spore sac.",
"The fungaloid has a number of rather primitive looking eyes, but they're distributed all over the body."
]
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/power_leech_anatomy.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"When you cut this plant-creature open the smell of ozone gets stronger, but it's mixed with a sweet smell from the creature itself.",
"The sap of the beast is a slightly bluish color and seems to be less viscous than animal blood.",
"Despite the creature seemingly being a plant/creature hybrid, the muscles are surprisingly similar to animal muscles, although the color is off.",
"You don't find anything resembling bones in the creature. Instead, it seems it's more similar to terrestial invertebrates.",
"You don't find anything resembling bones in the creature. Instead, it seems it's more similar to terrestrial invertebrates.",
"A slight electric discharge gives you a minor shock as you pierce what you assume is an electric organ.",
"You find no external sensory organs in the plant/beast hybrid, but it's quite possible the main means of perception is through electric fields."
]
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/triffid_anatomy.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"You find what you think is a heart, although it doesn't look like any configuration you know of from Earth. In fact, you find four hearts, each seemingly supporting a lateral quarter of the body.",
"A sac connected to the sting is filled with some fluid. Might it perhaps have some useful properties?",
"While the roots of the plant creature contain muscles and veins, they also contain finer networks indicating a use for nutrient uptake when the roots are lodged into the soil.",
"At the top of the creature you find what you assume is a brain, although it seems to employ quadrilateral symmetry and thus is shaped and organized completely differently from that of terrestial versions."
"At the top of the creature you find what you assume is a brain, although it seems to employ quadrilateral symmetry and thus is shaped and organized completely differently from that of terrestrial versions."
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/zombie_anatomy.json
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
"text": [
"The cavities of this creature are filled with lethargic winged creatures hanging off tubes oozing a greyish milky substance.",
"The corpse is inundated with smaller forms, increasing in complexity and size as you near its central cavity where they wait for their release in neat clusters.",
"The inside of this carcass ressembles more an industrial production line than anything vaguely natural.",
"The inside of this carcass resembles more an industrial production line than anything vaguely natural.",
"You find several unfinished creatures inside the main cavity, you have a vague feeling something greater discarded them, founding them wanting.",
"You are almost certain this zombie was pregnant before its undeath, the fetus within the womb having been twisted into the abomination it was carrying."
]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Xedra_Evolved/npc/boann.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{
"type": "talk_topic",
"id": "TALK_BOANN_3",
"dynamic_line": "The same thing that is causing the portal storms made travel between our worlds easier again. We have to engage in fairly strenous decontamination procedures on our way back but we've had those in place for aeons.",
"dynamic_line": "The same thing that is causing the portal storms made travel between our worlds easier again. We have to engage in fairly strenuous decontamination procedures on our way back but we've had those in place for aeons.",
"responses": [
{ "text": "Decontamination? You can leave here and not worry about the risen dead?", "topic": "TALK_BOANN_4" },
{ "text": "How can I join your court? I want to leave here when you do!", "topic": "TALK_BOANN_JOIN" },
Expand Down
2 changes: 1 addition & 1 deletion src/handle_action.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,7 @@ static void haul()
if( hauling && autohaul ) {
if( haul_qty == 0 ) {
status_header =
_( "You are currently not hauling any items, but autohaul is enabled, so any new items encoutered on the ground will be hauled." );
_( "You are currently not hauling any items, but autohaul is enabled, so any new items encountered on the ground will be hauled." );
} else {
status_header = string_format(
_( "You are currently hauling %d items.\nAutohaul is enabled, so any new items encountered on the ground will be hauled." ),
Expand Down
15 changes: 14 additions & 1 deletion tools/spell_checker/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ auroral
ausgegangen
autoclave
autoclaving
autohaul
autoinjector
autoloading
autologous
Expand Down Expand Up @@ -390,6 +391,7 @@ brainer
brandishes
brazing
breacher
breachhead
breadboard
breakrooms
breatharians
Expand Down Expand Up @@ -1194,6 +1196,7 @@ fungaloid
fungaloids
funggnaloid
fungicidal
fungii
funnelcap
fursuit
fusillies
Expand Down Expand Up @@ -1240,6 +1243,7 @@ genemod
genemoded
generalist
generically
geokinesis
geometries
gesticulates
getups
Expand Down Expand Up @@ -1576,6 +1580,7 @@ junglefowl
junipers
k
kabuto
kaleidoscoping
kalimotxo
kampuch
karambit
Expand Down Expand Up @@ -1779,6 +1784,7 @@ macrophenotypic
macuahuitl
maculata
magickal
magicks
magwells
maiasaura
maintainers
Expand Down Expand Up @@ -2132,9 +2138,11 @@ ornately
ornithomimid
ornithomimus
orrery
orthogonally
oryctodromeus
oscillated
osho
osteokinesis
oter
otes
otherland
Expand Down Expand Up @@ -2172,6 +2180,7 @@ overswinging
overtaxing
overtop
ovipositor
ovipositors
ovoviviparous
owlbear
owww
Expand All @@ -2198,6 +2207,7 @@ parabolan
parachuter
parasaurolophus
parasitoid
parasitoids
paratronic
paratrooping
parboiling
Expand Down Expand Up @@ -2388,6 +2398,7 @@ profusive
promptus
propellants
proprietary
proprioception
propyl
prosaurolophus
prosaurulophus
Expand Down Expand Up @@ -2446,6 +2457,7 @@ qianzhousaurus
qt
quadcopter
quadcopters
quadrilateral
quadrupedal
quams
quantification
Expand Down Expand Up @@ -3030,6 +3042,7 @@ tassin
tastemakers
tawa
taxa
taxying
tazed
tazer
tazers
Expand Down Expand Up @@ -3428,9 +3441,9 @@ winglike
wireframe
wirey
wirings
wist
witchdoctor
witchdoctors
wist
wizardy
wk
wolfish
Expand Down

0 comments on commit 2436ca7

Please sign in to comment.