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

Fix typos #60269

Merged
merged 1 commit into from Aug 19, 2022
Merged

Fix typos #60269

merged 1 commit into from Aug 19, 2022

Conversation

Cimanyd0
Copy link
Contributor

@Cimanyd0 Cimanyd0 commented Aug 18, 2022

Summary

None

Purpose of change

Typos. Fix them.

Describe the solution

floor mattresses: "in of itself" > "in and of itself"
metal RPG die: add period
gallon-sized zipper bag: "it's" > "its"
shotguns: "rolls" > "roles"
facial hair: add "a" before moustache/beard; "you" > "your"; add "the"
Smokes, about useless radios: "can't pick hear anything" > "can't pick up anything"
(un)living history scenario: add comma; "are taking break" > "were taking a break"
splintering reality scenario: "begun" > "began"
newspaper about marriage: "alter" > "altar"

Describe alternatives you've considered

Follow the advice the spellcheck bot gives to Erk and "fix" all of Rubik's spelling.

Testing

None. Does this need testing?

Checked scenarios and facial hair in character creation. Checked items and furniture with debug menu. All fixes appear.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Containers Things that hold other things Lore Game lore, in-game communication. Also the Lore tab. NPC / Factions NPCs, AI, Speech, Factions, Ownership Scenarios New Scenarios, balancing, bugs with scenarios astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 18, 2022
Copy link
Contributor

@pjf pjf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't know how much I wanted every one of these changes until I saw them. Thank you!

@PatrikLundell
Copy link
Contributor

If I had made the changes, I'd test at least a few of them by spawning the corresponding item and verify that the in-game description has changed. Such a test would catch changing the correct files in the wrong location (e.g. the game play installation vs the development installation). I'd probably test one example from each file changed.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 18, 2022
@dseguin dseguin merged commit b5f4419 into CleverRaven:master Aug 19, 2022
@Cimanyd0 Cimanyd0 deleted the typo-fixes branch August 20, 2022 01:36
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Aug 21, 2022
* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Containers Things that hold other things [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Lore Game lore, in-game communication. Also the Lore tab. NPC / Factions NPCs, AI, Speech, Factions, Ownership Scenarios New Scenarios, balancing, bugs with scenarios
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants