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

Added Opporozidone and ReduceRotting Effect #62

Merged
merged 1 commit into from
Jul 26, 2024

Conversation

XavierSomething
Copy link
Contributor

@XavierSomething XavierSomething commented Jul 25, 2024

Description

Added Opporozidone, the chemical that reduces rot, from upsteam! Allows people to be revived even if their bodies are rotting, which reduces the use of cloning and losing your character. The code for this may be a bit botched, as I patched in the Wizden code, which required adding a method from upstream to the sharedRottingSystem. Not sure if it was the right place to put it but the chemical DOES work, so.


Media

opporozidone chemical


Changelog

🆑 Xavier

  • add: Opporozine, upstream chemical that allows you to remove rotting by cryopods!

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Jul 25, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Added Opporozidone and ReduceRotting effect Added Opporozidone and ReduceRotting Effect Jul 25, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 25, 2024
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

All seem good due i think this PR seem better in EE, also upsteam is EE not wizden.

I hope all positions are correct or were gona have pain with upstream merges.

@XavierSomething
Copy link
Contributor Author

XavierSomething commented Jul 25, 2024

Oh, if Oppo is in upstream EE I can see about remaking what I did for what they did, if that works. I did PR this fully myself from Wizden upstream so I can do this again with EE upstream this time.

@FoxxoTrystan
Copy link
Collaborator

Oh, if Oppo is in upstream EE I can see about remaking what I did for what they did, if that works. I did PR this fully myself from Wizden upstream so I can do this again with EE upstream this time.

Currently EE does not have those changes, feel free to PR it to EE, this PR is fine also.

@XavierSomething
Copy link
Contributor Author

Wait, nevermind, I misread what you meant. I feel afraid to do a PR to EE but I might give it a shot,

Also, what do you mean by positions? Still learning most terms and how things work.

@FoxxoTrystan
Copy link
Collaborator

Wait, nevermind, I misread what you meant. I feel afraid to do a PR to EE but I might give it a shot,

Also, what do you mean by positions? Still learning most terms and how things work.

I mean by position is that we avoid when EE has the feature to have double the code or something making conflicts, and dont worry about EE, a bunch of friendly bloke who loves birds...

@XavierSomething
Copy link
Contributor Author

Alright, I might give it a shot then! hopefully I can figure out how to get these changes over to EE.

@Fansana
Copy link
Owner

Fansana commented Jul 26, 2024

@FoxxoTrystan Do we actually have to do it this way. We could just merge it here, and upstream can pull the changes. If we use git properly nothing should change.

@FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan Do we actually have to do it this way. We could just merge it here, and upstream can pull the changes. If we use git properly nothing should change.

Ye i still approve the changes here, just saying all the above.

@Fansana Fansana merged commit 9d7719f into Fansana:master Jul 26, 2024
15 of 16 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jul 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants