-
Notifications
You must be signed in to change notification settings - Fork 557
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
Fixes the the majority of "The the" in chat messages (Part 1) #5087
Conversation
Required for the `toggle_blast_dampener()` text to display properly.
This change is generally only applicable to atom insertions (as in "some text [atom_insert] some text"). When they are either capitalized or are forced proper with You'd be better off instead changing all instances of |
Since I see you were already using \a in some cases, you probably already know about that behavior though. So as long as all the changes work out; its fine. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good overall
Plus a bit extra in `/obj/item/lightstick/attack_hand()` because it's right there.
# About the pull request Fixes instances of `"The the item"` and `"A the item"` in chat messages so that they display as `"The item"` and `"A item"` instead. See #5087 for more details. # Explain why it's good for the game Better english I guess. # Testing Photographs and Procedure <details> <summary>Screenshots</summary> **Before:** ![old](https://github.com/cmss13-devs/cmss13/assets/57483089/649bf896-e712-4f8c-9e7f-d64403a1e45a) ![pizza before](https://github.com/cmss13-devs/cmss13/assets/57483089/d00a158f-fcab-4aec-b044-f5d591b12aad) ![cigarette before](https://github.com/cmss13-devs/cmss13/assets/57483089/463a0b36-1ee9-4b3b-bf63-36326edd04c3) ![barricade before](https://github.com/cmss13-devs/cmss13/assets/57483089/92bffce0-c2f4-47c9-8358-b9c36474c787) **After:** ![new](https://github.com/cmss13-devs/cmss13/assets/57483089/991a230c-2e5a-4dac-8d32-4af91b957715) ![pizza after](https://github.com/cmss13-devs/cmss13/assets/57483089/9bfb1388-d712-4386-beca-0c924e4f1adf) ![cigarette after](https://github.com/cmss13-devs/cmss13/assets/57483089/fd707f3e-583e-49da-97c9-9972f9013de3) ![barricade after](https://github.com/cmss13-devs/cmss13/assets/57483089/65d8d0c3-921a-41c2-a640-27f184db01d8) </details> # Changelog :cl: spellcheck: Fixed instances of "The the" and "A the" in chat messages so that they're just "The" instead. (Part 2) /:cl:
# About the pull request Part 1: #5087 Part 2: #5121 Part 3: \<You are here!\> Third and final part of the 'The the' trilogy! Please see the first PR (#5087) for more details. # Explain why it's good for the game ![image](https://github.com/cmss13-devs/cmss13/assets/57483089/04c7cace-6360-4eb3-a910-cda7c2a9ee9e) # Changelog :cl: spellcheck: Fixed instances of "The the" and "A the" in chat messages so that they're just "The" instead. (Part 3) /:cl:
(Part 1/3 because there's about 100 files in total and it's easier to review if they're split up.)
Part 1: <You are here!>
Part 2: #5121
Part 3: #5139
About the pull request
Fixes instances of
"The the item"
and"A the item"
in chat messages so that they display as"The item"
and"A item"
instead.These were caused by DM's built-in Text Macros system either being used incorrectly, or used unintentionally.
DM outputs for various inputs:
(Code validation here in Coderbus)
I've tried to avoid touching anything that already works properly in-game in order to keep the PR size down, even if the manner in which it's working isn't the "correct" way (things like improper nouns being capitalised and vice versa).
I did edit the names of some items in
chem_grenade.dm
though, since they needed to be changed for the/obj/item/explosive/proc/toggle_blast_dampener()
proc to display its message properly.RegEx used:
^(?!.*(?:\/{2,}|\/\*|\* )).*?[^\\](?:the|a) \[.+\]
(https://regexr.com/7o5vd)(For search only. All replacements were done manually and I skipped a lot of false positives.)
Bad regex explanation:
Explain why it's good for the game
"Typo" fixes.
Testing Photographs and Procedure
Screenshots
(I took these screenshots before I split the PR into smaller parts and I'm posting it pretty late at night, so some of these examples might not actually be included in this PR.)
(I can take new ones later if that's requested later.)
Before:
After:
Changelog
🆑
spellcheck: Fixed instances of "The the" and "A the" in chat messages so that they're just "The" instead. (Part 1)
/:cl: