diff --git a/data/json/snippets/e_logs.json b/data/json/snippets/e_logs.json index ef61d936c5034..09f57bd166cb0 100644 --- a/data/json/snippets/e_logs.json +++ b/data/json/snippets/e_logs.json @@ -202,7 +202,7 @@ }, { "id": "local_files_simple_50", - "text": "This appears to be a locally saved livestream archive, with the feed filming a decrepit backstreet. An older, bespectacled man and a middle-aged Latina woman stand huddled in a line against the wall, their legs lashed to each other and their hands bound to the front. Beaming like a ray of sunshine, a man dressed in tactical gear prances before them, a baseball bat resting conspicuously upon his shoulder as he greets the camera. \"Hey guys,\" he says, \"this is Andre Diliman, and we’re going to be putting our detective hats on and figuring out who’s to blame for all the shit going on, and we’re going to do that, with the help of these beautiful people right here, so please, introduce yourselves.\"\n\nExchanging resigned glances, the two captives lower their heads as the woman mutters, \"I’m Dr Martha Sharma.\"\n\n\"And I’m Dr Conrad Sharma,\" her compatriot glumly adds.\n\n\"And both you fuckers work at Jameson Biotech,\" the spokesman concludes in a sing-song cadence as he saunters before the couple. \"We’re going to start easy. The CDC has been saying that something’s messing with people's brains: making them act all aggressive. Now, my question to you is simple: What did y’all cook up in those labs of yours?\"\n\nLifting her head and making eye contact with her questioner, the woman shakes her head incredulously. \"You, fucking idiot.\"\n\nNodding understandingly, the man turns away from the couple. \"I see we might need some harder persuasion, that's not too surprising. Alexander, Tomas, and Mary, bring in the kid… and the wire!\"\n\nAmidst a flurry of horrified protests from the captives, a gaunt man appears from off-frame, a goofy grin creasing his unshaven face as he lugs a squalling baby in his arms. A second man and a woman follow him into view… uncoiling a length of barbed wire. Wrapping the rusted steel about the infant’s midsection, heedless of the pained wails emanating as the barbs scrape its skin, the duo stand apart, gripping opposite ends of the makeshift garrotte. \"Ok guys,\" the ringleader gleefully instructs, \"on my mark, we’ll give the little shit a light squeezing. If the good doctors don’t want to talk after that… then I want it rendered into mincemeat! 3, 2, 1…\"\n\nSpouts of blood spurt in all directions as bullet-riddled bodies collapse to the ground, the camera toppling rearwards as a bark of automatic gunfire echoes through the audio, accompanied by the approaching, hurried stomps of soldiers' boots." + "text": "This appears to be a locally saved livestream archive, with the feed filming a decrepit backstreet. An older, bespectacled man and a middle-aged Latina woman stand huddled in a line against the wall, their legs lashed to each other and their hands bound to the front. Beaming like a ray of sunshine, a man dressed in tactical gear prances before them, a baseball bat resting conspicuously upon his shoulder as he greets the camera. \"Hey guys,\" he says, \"this is Andre Diliman, and we’re going to be putting our detective hats on and figuring out who’s to blame for all the shit going on, and we’re going to do that, with the help of these beautiful people right here, so please, introduce yourselves.\"\n\nExchanging resigned glances, the two captives lower their heads as the woman mutters, \"I’m Dr Martha Sharma.\"\n\n\"And I’m Dr Conrad Sharma,\" her compatriot glumly adds.\n\n\"And both you fuckers work at Jameson Biotech,\" the spokesman concludes in a sing-song cadence as he saunters before the couple. \"We’re going to start easy. The CDC has been saying that something’s messing with people's brains: making them act all aggressive. Now, my question to you is simple: What did y’all cook up in those labs of yours?\"\n\nLifting her head and making eye contact with her questioner, the woman shakes her head incredulously. \"You fucking idiot.\"\n\nNodding understandingly, the man turns away from the couple. \"I see we might need some harder persuasion, that's not too surprising. Alexander, Tomas, and Mary, bring in the kid… and the wire!\"\n\nAmidst a flurry of horrified protests from the captives, a gaunt man appears from off-frame, a goofy grin creasing his unshaven face as he lugs a squalling baby in his arms. A second man and a woman follow him into view… uncoiling a length of barbed wire. Wrapping the rusted steel about the infant’s midsection, heedless of the pained wails emanating as the barbs scrape its skin, the duo stand apart, gripping opposite ends of the makeshift garrotte. \"Ok guys,\" the ringleader gleefully instructs, \"on my mark, we’ll give the little shit a light squeezing. If the good doctors don’t want to talk after that… then I want it rendered into mincemeat! 3, 2, 1…\"\n\nSpouts of blood spurt in all directions as bullet-riddled bodies collapse to the ground, the camera toppling rearwards as a bark of automatic gunfire echoes through the audio, accompanied by the approaching, hurried stomps of soldiers' boots." } ] } diff --git a/data/json/snippets/lab.json b/data/json/snippets/lab.json index d31e5fb0fa44d..9f76fd4a2db72 100644 --- a/data/json/snippets/lab.json +++ b/data/json/snippets/lab.json @@ -404,7 +404,7 @@ "Despite a wide variety of treatments, we have been completely unsuccessful in removing XE037 from human subjects. Every individual displayed revivification post termination. Interestingly, XE037 seems to be completely inert prior to termination.", "We have finally found success in S37BEP, our emergency investigation into the destruction of XE037 in living subjects. 8 of 10 of the subjects showed no revivification, despite confirmed dosages of XE037.", "PE062, our \"cure\" for XE037 contamination, has neared perfection. Sadly, the production of PE062 is a costly and time-consuming process. What is more, the substance shows no effect on postmortem subjects whatsoever; a substance which renders XE037 inert after it has activated would be immensely useful in the case of an outbreak.", - "Our cloning department has failed to produce results. In vats containing stem cell treatments, XE037, and control vats, the subjects simply disintegrated. This suggests that XE037, while compatible with subprime lifeforms, shows only destructive effects on prime plane lifeforms.", + "Our cloning department has failed to produce results. In vats containing stem cell treatments and XE037, the subjects simply disintegrated. This suggests that XE037, while compatible with subprime lifeforms, shows only destructive effects on prime plane lifeforms.", "We've established a new research team specifically to look into reverse engineering the properties of sample CC-09-R1. See notes prior to [REDACTED: See XEDRA-SILOPROTOCOL or speak to an administrator for assistance]. They managed to steal Gloria Barnhoff away from Veridian Dynamics, it's a real coup.", "Dr. Barnhoff already has an idea for how we could recreate some of the self-organizing properties of CC-09-R1. Trouble is, it's pure silliness: it uses a molecular lattice of californium and a particle accelerator to basically 3D print certain types of molecules. We had a good laugh, but she just stared at us.", "Admin approved Barnhoff's request. According to my math, the californium she requested alone is worth hundreds of millions of dollars. We're going to start work on a prototype fabricator tomorrow.", diff --git a/data/json/talk_vitrified.json b/data/json/talk_vitrified.json index 2182a8641b5c2..29734b61fbd6e 100644 --- a/data/json/talk_vitrified.json +++ b/data/json/talk_vitrified.json @@ -27,7 +27,7 @@ "dynamic_line": "Sitting among the glass cushions of the couch is the only thing among all the glass which is soft; the limbless, faceless torso of a worn plush doll. It is warm to the touch, but it doesn't feel right to pick it up while it's so damaged.", "responses": [ { - "text": "Reassmble the doll.", + "text": "Reassemble the doll.", "condition": { "and": [ { "u_has_item": "imperfect_doll_features" }, diff --git a/data/mods/Aftershock/items/seed.json b/data/mods/Aftershock/items/seed.json index 16ec23a69ede9..88f341f2ef9d6 100644 --- a/data/mods/Aftershock/items/seed.json +++ b/data/mods/Aftershock/items/seed.json @@ -3,7 +3,7 @@ "id": "seed_pineapple", "copy-from": "seed", "type": "COMESTIBLE", - "name": { "str_sp": "pineapple stem" }, + "name": { "str_sp": "pineapple roots" }, "description": "Roots of a pineapple plant, for growing your own.", "weight": "152 g", "price": "20 cent", @@ -30,15 +30,15 @@ "id": "seed_orange", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": { "str_sp": "orange vine" }, - "description": "Some orange vine. Definitely GMO.", + "name": { "str_sp": "orange vines" }, + "description": "Some orange vines. Definitely GMO.", "seed_data": { "plant_name": "orange", "fruit": "orange", "byproducts": [ "withered" ], "grow": "91 days" } }, { "id": "seed_lemon", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": { "str_sp": "lemon vine" }, + "name": { "str_sp": "lemon vines" }, "description": "Some lemon vines. Definitely GMO.", "seed_data": { "plant_name": "lemon", "fruit": "lemon", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -46,7 +46,7 @@ "id": "seed_coconut", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": { "str_sp": "subterraenean coconut" }, + "name": { "str": "subterraenean coconut" }, "description": "Proof that man went too far before the Cataclysm.", "seed_data": { "plant_name": "coconut", "fruit": "coconut", "byproducts": [ "withered" ], "grow": "120 days" } } diff --git a/data/mods/BombasticPerks/perkdata/empath.json b/data/mods/BombasticPerks/perkdata/empath.json index 5c2425045c515..7e8984bc5ac07 100644 --- a/data/mods/BombasticPerks/perkdata/empath.json +++ b/data/mods/BombasticPerks/perkdata/empath.json @@ -89,7 +89,7 @@ "You are really feeling for the last animal you killed. Reminds you of that scene in the movie where they kill the pet, really sad stuff. Though you are feeling ready to learn to fight right now." ], "apply_message": "You are ready for a fight.", - "decay_messages": [ [ "You're animal instincts dissipate.", "bad" ] ], + "decay_messages": [ [ "Your animal instincts dissipate.", "bad" ] ], "rating": "good", "max_intensity": 1, "int_dur_factor": "30 s", diff --git a/data/mods/BombasticPerks/perkdata/popeye.json b/data/mods/BombasticPerks/perkdata/popeye.json index 2aeb43d015203..baa49973ae8fe 100644 --- a/data/mods/BombasticPerks/perkdata/popeye.json +++ b/data/mods/BombasticPerks/perkdata/popeye.json @@ -33,7 +33,7 @@ "type": "effect_type", "id": "spinach_strength", "name": [ "Strength of Spinach" ], - "desc": [ "You have the strength of a Sailor!" ], + "desc": [ "You have the strength of a sailor!" ], "apply_message": "You feel strong!", "remove_message": "Your strength deflates.", "rating": "good", diff --git a/data/mods/BombasticPerks/perkdata/troubleseeker.json b/data/mods/BombasticPerks/perkdata/troubleseeker.json index 70a281f7a763b..8fcc30b5ae361 100644 --- a/data/mods/BombasticPerks/perkdata/troubleseeker.json +++ b/data/mods/BombasticPerks/perkdata/troubleseeker.json @@ -17,12 +17,12 @@ "type": "effect_on_condition", "id": "EOC_troubleseek_on", "//": "Activation effect", - "effect": [ { "u_message": "You start seeking trouble" } ] + "effect": [ { "u_message": "You start seeking trouble." } ] }, { "type": "effect_on_condition", "id": "EOC_troubleseek_off", "//": "Deactivation effect", - "effect": [ { "u_message": "You stop seeking trouble for now" } ] + "effect": [ { "u_message": "You stop seeking trouble for now." } ] } ] diff --git a/data/mods/Magiclysm/traits/temporary_demon_traits.json b/data/mods/Magiclysm/traits/temporary_demon_traits.json index d3829771bd03e..90e6e1fde28fc 100644 --- a/data/mods/Magiclysm/traits/temporary_demon_traits.json +++ b/data/mods/Magiclysm/traits/temporary_demon_traits.json @@ -36,8 +36,8 @@ "restricts_gear": [ "foot_l", "foot_r" ], "armor": [ { "parts": [ "foot_l", "foot_r" ], "bash": 1 }, { "parts": [ "leg_l", "leg_r" ], "cut": 1 } ], "attacks": { - "attack_text_u": "You kick %s with your hooves", - "attack_text_npc": "%1$s kicks %2$s with their hooves", + "attack_text_u": "You kick %s with your hooves!", + "attack_text_npc": "%1$s kicks %2$s with their hooves!", "chance": 15, "strength_damage": { "damage_type": "bash", "amount": 3 } } diff --git a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json index 9eb2e40e6d51c..0512247bd4f4a 100644 --- a/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json +++ b/data/mods/MindOverMatter/recipes/practice/clairsentient_practice.json @@ -351,7 +351,7 @@ { "type": "recipe", "activity_level": "LIGHT_EXERCISE", - "name": "contemplation: clairoyance", + "name": "contemplation: clairvoyance", "id": "practice_clair_voyance", "description": "Contemplate your powers and improve your ability to extend your senses beyond your body.", "category": "CC_*", diff --git a/data/mods/Xedra_Evolved/snippets/migo_speech.json b/data/mods/Xedra_Evolved/snippets/migo_speech.json index 4d427ce98036d..adfc60445da93 100644 --- a/data/mods/Xedra_Evolved/snippets/migo_speech.json +++ b/data/mods/Xedra_Evolved/snippets/migo_speech.json @@ -14,7 +14,7 @@ { "type": "speech", "speaker": [ "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_myrmidon" ], - "sound": "\"Cease opposition our rights here are guaranteed by treaty M-A-J-I-K-1-2.\"", + "sound": "\"Cease opposition. Our rights here are guaranteed by treaty M-A-J-I-K-1-2.\"", "volume": 20 }, { diff --git a/data/mods/Xedra_Evolved/snippets/snippet.json b/data/mods/Xedra_Evolved/snippets/snippet.json index f770528da8ed1..e5b689e5cea36 100644 --- a/data/mods/Xedra_Evolved/snippets/snippet.json +++ b/data/mods/Xedra_Evolved/snippets/snippet.json @@ -41,7 +41,7 @@ "Finally, your work came to something good.", "yes, Yes, YES!", "That was stupid, but it did work.", - "The job is done" + "The job is done." ] }, { diff --git a/data/mods/Xedra_Evolved/snippets/xedra.json b/data/mods/Xedra_Evolved/snippets/xedra.json index 40bf172b1647b..150b6393f25c9 100644 --- a/data/mods/Xedra_Evolved/snippets/xedra.json +++ b/data/mods/Xedra_Evolved/snippets/xedra.json @@ -49,7 +49,7 @@ "id": "desk_postit_field_agent_4", "text": "Cultists? Foreign Agents? Pod people?" }, - { "name": "green postit 5", "id": "desk_postit_field_agent_5", "text": "Carcosa? Leng?." }, + { "name": "green postit 5", "id": "desk_postit_field_agent_5", "text": "Carcosa? Leng?" }, { "name": "green postit 6", "id": "desk_postit_field_agent_6", "text": "Delta Green? Majestic 12?" }, { "name": "green postit 7", diff --git a/data/mods/innawood/monsters/nether.json b/data/mods/innawood/monsters/nether.json index 9a94147042a40..d4c01ed2a9bcf 100644 --- a/data/mods/innawood/monsters/nether.json +++ b/data/mods/innawood/monsters/nether.json @@ -29,7 +29,7 @@ { "id": "mon_impossible_shape", "type": "MONSTER", - "name": { "str": "Impossible shape" }, + "name": { "str": "impossible shape" }, "description": "A twisted shape floating in midair; its angles don't quite seem to add up - it hurts to look at. You can see through it, not as if it were transparent but as if it isn't quite fully there.", "default_faction": "nether", "species": [ "NETHER" ], @@ -56,7 +56,7 @@ { "id": "mon_absence", "type": "MONSTER", - "name": { "str": "Absence" }, + "name": { "str": "absence" }, "description": "Every sense you have claims this space to be empty, but your mind is not fooled. There is an emptiness here that is far from natural or safe.", "default_faction": "nether", "species": [ "NETHER" ], @@ -83,7 +83,7 @@ { "id": "mon_giant_appendage", "type": "MONSTER", - "name": { "str": "Giant appendage" }, + "name": { "str": "giant appendage" }, "description": "A gigantic appendage reaching through what looks like a portal, as if this is merely a probing piece of something much larger.", "default_faction": "nether", "species": [ "NETHER" ], @@ -106,7 +106,7 @@ { "id": "mon_memory", "type": "MONSTER", - "name": { "str": "Memory", "str_pl": "Memories" }, + "name": { "str": "memory", "str_pl": "memories" }, "description": "The shade of a human body reaching towards you like it needs help. Though it has no eyes you feel as though it is staring through you.", "default_faction": "nether", "species": [ "NETHER" ], diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 225580dc1ca33..8ff396aeef0ad 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -629,6 +629,7 @@ craftsfolk craftswoman craftwork crappie +creasing creeply creped criniere @@ -1214,6 +1215,7 @@ glitchiness gliters gloppy glowstick +glumly glyceride glyptodont glyptotherium @@ -1431,6 +1433,7 @@ inclusiveness incompetencies incongruously incorporeal +incredulously indemnifying indiscernible inductance @@ -1666,6 +1669,7 @@ lithely litheness liturgies livingrooms +livestream lizardfolk lizardlike ll @@ -3079,6 +3083,7 @@ unbuckling unburnt uncleaned uncluttered +uncoiling uncoils uncured undecipherable @@ -3091,6 +3096,7 @@ underlayer underlayers undersides underslung +understandingly underwelming undescribed undried