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

Converts xenomorph messages to be more hivemind like instead of individual #5194

Merged
merged 60 commits into from
Dec 15, 2023

Conversation

Red-byte3D
Copy link
Contributor

@Red-byte3D Red-byte3D commented Dec 11, 2023

About the pull request

Converts most YOU / YOUR / to WE / OUR for xenomorph actions (had to re-open due to a git error)

Explain why it's good for the game

I think its cooler and heavier on the "Hivemind pawn" part of the game.

Testing Photographs and Procedure

will show screenshots once its off draft

Changelog

🆑
spellcheck: Xenomorph text is now WE/OUR instead of YOU/YOUR
/:cl:

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 11, 2023
@cm13-github
Copy link
Contributor

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

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

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

@Red-byte3D Red-byte3D marked this pull request as ready for review December 11, 2023 22:39
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 13, 2023
@cm13-github
Copy link
Contributor

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

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 13, 2023
@cm13-github
Copy link
Contributor

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

code/game/turfs/walls/wall_types.dm Outdated Show resolved Hide resolved
code/modules/cm_aliens/structures/fruit.dm Outdated Show resolved Hide resolved
code/modules/cm_aliens/structures/fruit.dm Outdated Show resolved Hide resolved
code/modules/cm_aliens/structures/special/pylon_core.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/attack_alien.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/attack_alien.dm Outdated Show resolved Hide resolved
code/modules/mob/living/carbon/xenomorph/castes/Lurker.dm Outdated Show resolved Hide resolved
code/modules/mob/mob_grab.dm Show resolved Hide resolved
@Red-byte3D Red-byte3D requested a review from fira December 14, 2023 18:01
Copy link
Member

@fira fira left a comment

Choose a reason for hiding this comment

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

LGTM

@Birdtalon Birdtalon marked this pull request as draft December 15, 2023 14:59
@Red-byte3D Red-byte3D marked this pull request as ready for review December 15, 2023 15:03
Copy link
Contributor

@Birdtalon Birdtalon left a comment

Choose a reason for hiding this comment

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

Into the unknown we boldly stride.

@Birdtalon Birdtalon added this pull request to the merge queue Dec 15, 2023
Merged via the queue into cmss13-devs:master with commit 9b0b9a5 Dec 15, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Dec 15, 2023
@Red-byte3D Red-byte3D deleted the weinsteadofyou branch January 18, 2024 13:40
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 Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants