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

Un-cavemans some strain buy information, and changes every strain flavor text from 40k/doom references #6204

Merged
merged 11 commits into from
May 2, 2024

Conversation

Red-byte3D
Copy link
Contributor

@Red-byte3D Red-byte3D commented Apr 28, 2024

About the pull request

changes up the stupid "talls, auto spitters etc" inside OOC strain buying information.
Re-writes all strainflavor text.

Explain why it's good for the game

Cooler(imo) strain flavor texts are better when not all of them are warhammer references.
its weird as hell to use IC in OOC information like "talls, auto spitters". (its also stupid as hell that they speak like this anyway, or whoever intrdouced this)

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
spellcheck: New flavor text and better strain information
/:cl:

@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Apr 28, 2024
@github-actions github-actions bot added the Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors label Apr 28, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Apr 28, 2024
@Red-byte3D
Copy link
Contributor Author

chill bro i dont want you

@Birdtalon
Copy link
Contributor

I'm all in favour of rewriting out the stuff about talls, spitters etc but the little flavour text references to Thanos and stuff I'm not particularly in favour of replacing, but then again I'm a little inactive at the moment so won't stand in the way.

@Red-byte3D
Copy link
Contributor Author

i just dont think marvel references / 40k references have place (they're also TOO cringy)

@Drulikar Drulikar enabled auto-merge May 2, 2024 02:24
@Drulikar Drulikar added this pull request to the merge queue May 2, 2024
Merged via the queue into cmss13-devs:master with commit 27a679d May 2, 2024
26 checks passed
cm13-github added a commit that referenced this pull request May 2, 2024
@Red-byte3D Red-byte3D deleted the uncaveman branch June 4, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Grammar and Formatting Fixes the codebase's tpyos and grammatical's errors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants