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

Metempsychosis Returns #685

Merged
merged 56 commits into from
Feb 18, 2024
Merged

Conversation

VMSolidus
Copy link
Contributor

@VMSolidus VMSolidus commented Jan 17, 2024

About the PR

This PR brings back a much beloved feature from Nyanotrasen, the Metempsychosis Machine. Metempsychosis is a Nyanotrasen variant on the cloning machine. Instead of giving you a new body, it forcibly reincarnates its patient(victim) into an entirely new body.

Why / Balance

Back by INCREDIBLY POPULAR demand.

Technical details

So, technically speaking, Wizden no longer maintains the Cloning code. It is effectively gone from their codebase, and no longer present on their servers. This realistically means that the absurd amount of changes required to make this happen will essentially never be an issue.

Media

image

Changelog

🆑 VMSolidus

  • add: Metempsychosis machines have been added to the game.

@VMSolidus VMSolidus marked this pull request as ready for review January 17, 2024 01:15
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review labels Jan 17, 2024
Copy link
Contributor

github-actions bot commented Jan 17, 2024

RSI Diff Bot; head commit e73f454 merging into 6687a31
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Nyanotrasen/Structures/Machines/metempsychotic.rsi

State Old New Status
pod_0 Added
pod_1 Added

Edit: diff updated after e73f454

@github-actions github-actions bot added the Changes: Localization Changes any ftl files label Jan 17, 2024
@VMSolidus
Copy link
Contributor Author

image
And now the first of the two midround antags that required Metempsychosis are back. I've also fixed some bugs with Metempsychosis. It no longer randomizes character name on the 2nd reincarnation onwards.

Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

This is adding 2 unrelated features that aren't part of metempsychosis.

VMSolidus and others added 5 commits February 1, 2024 23:16
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
Somehow this got removed during cleanup

Signed-off-by: VMSolidus <[email protected]>
I put it back in the wrong file...

Signed-off-by: VMSolidus <[email protected]>
Content.Server/Cloning/CloningSystem.cs Outdated Show resolved Hide resolved
Content.Server/Cloning/CloningSystem.cs Outdated Show resolved Hide resolved
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
DebugOk
DebugOk previously approved these changes Feb 12, 2024
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

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

Its probably fine, I didn't spot any error just reading over everything

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 Status: Merge Conflict Fix your PR! label Feb 13, 2024
@VMSolidus
Copy link
Contributor Author

I haven't been able to merge this yet since when Debug approved it, I required Death's approval too. Then merging Paradox anoms without Metem first caused a merge conflict, removing Debug's approval. Now I have Death's approval but not Debug's, so this still can't be merged.

@DebugOk DebugOk merged commit 8df7cc3 into DeltaV-Station:master Feb 18, 2024
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Feb 18, 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: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants