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.

Sign up for GitHub

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

Jump to bottom

this has gone wildly out of scope, I'll finish it later. #322

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

this has gone wildly out of scope, I'll finish it later. #322

wants to merge 18 commits into from
+253 −410

Conversation

Ediblebomb
Copy link
Contributor

@Ediblebomb Ediblebomb commented Jul 3, 2024 •
edited
Loading

Smoke no longer makes you cough or drop things if you're wearing a gasmask.
That's it.
I'm certain nobody but me will notice this change.

okay so actually it also moves around every part of the checks for whether or not a gas affects you.

kill me

AndroBetel
AndroBetel requested changes Jul 8, 2024
View reviewed changes
Copy link
Contributor

@AndroBetel AndroBetel left a comment

Choose a reason for hiding this comment

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

copied from discord

do you think you'd be able to make a blocked_by_gasmask var and move all that behavior to parent smoke class?

@AndroBetel AndroBetel marked this pull request as draft July 8, 2024 09:33
@Ediblebomb Ediblebomb changed the title gasmasks work against smoke gasmasks work against smoke, also some other stuff now. Jul 9, 2024
@Ediblebomb Ediblebomb marked this pull request as ready for review July 9, 2024 20:06
@Ediblebomb Ediblebomb marked this pull request as draft July 17, 2024 02:05
@Ediblebomb Ediblebomb changed the title gasmasks work against smoke, also some other stuff now. this has gone wildly out of scope, I'll finish it later. Jul 17, 2024
@Ediblebomb Ediblebomb force-pushed the the-only-reason-I-make-PRs-is-to-make-the-M5-Gasmask-more-useful branch from 337b4e7 to c862411 Compare August 8, 2024 23:10
@cm13-github
Copy link
Contributor

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

@cm13-github
Copy link
Contributor

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

@github-actions github-actions bot added the Missing Changelog Maintainers always document their changes. label Sep 13, 2024
@Ediblebomb
Copy link
Contributor Author

Ediblebomb commented Sep 13, 2024 •
edited
Loading

hang on a second
I missed a few PvP changes...

Edit: fuck

@Ediblebomb
Revert "Merge branch 'master' into the-only-reason-I-make-PRs-is-to-m…
f600a68 
…ake-the-M5-Gasmask-more-useful"

This reverts commit 65cfb23, reversing
changes made to c1abc9d.
@Ediblebomb
Copy link
Contributor Author

wait- I don't think I can do it like that, can I?

@Ediblebomb
Reapply "Merge branch 'master' into the-only-reason-I-make-PRs-is-to-…
3679a55 
…make-the-M5-Gasmask-more-useful"

This reverts commit f600a68.
@cm13-github
Copy link
Contributor

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

@Ediblebomb
Copy link
Contributor Author

kill me

@cm13-github
Copy link
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndroBetel AndroBetel Awaiting requested review from AndroBetel

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Github Mapping Missing Changelog Maintainers always document their changes. Sound Sprites UI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Ediblebomb @cm13-github @AndroBetel