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

Shrimp Mob for Metempsychosis #862

Merged
merged 9 commits into from
May 26, 2024
Merged

Shrimp Mob for Metempsychosis #862

merged 9 commits into from
May 26, 2024

Conversation

leonardo-dabepis
Copy link
Contributor

@leonardo-dabepis leonardo-dabepis commented Feb 19, 2024 •
edited by DEATHB4DEFEAT
Loading

About the PR

Adds shrimp mob, but only as a rare result of metempsychosis. They have pyrokenisis to make up for their lack in most other things.

Why / Balance

I got high and thought it'd be funny. This will probably get denied but it's worth the shot.

Technical details

Media

image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Shrimp morphotype*

@github-actions github-actions bot added S: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Feb 19, 2024
@FluffiestFloof
Copy link
Contributor

FluffiestFloof commented Feb 19, 2024 •
edited
Loading

🦐 shrimple as that

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Feb 19, 2024 •
edited
Loading

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

Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi

State Old New Status
dead Added
shrimp Added

Edit: diff updated after 194ad6e

@musicmanvr
Copy link
Contributor

SHRIMP!!!!

@rosieposieeee
Copy link
Contributor

real

@DebugOk
Copy link
Contributor

DebugOk commented Feb 19, 2024

This will absolutely not be merged until the psionics rework is done. Pyrokenisis in its current state is not at all balanced

@DebugOk DebugOk added the S: Do Not Merge Don't merge this yet label Feb 19, 2024
@leonardo-dabepis
Copy link
Contributor Author

Originally I had tried to give them built in laser carbines, but I couldn't figure it out so I settled for pyrokenisis. I can continue to reduce their power level though. My thought was they need some sort of natural defense since they cannot use weapons or do much of anything aside from pull objects and speak, but I can think of something else.

@UnicornOnLSD
Copy link
Contributor

based

@DEATHB4DEFEAT DEATHB4DEFEAT changed the title Shrimp Morphotype for Metempsychosis Shrimp Mob for Metempsychosis Feb 23, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT added the S: Requires This requires something else to be done before resolved label Feb 23, 2024
@DebugOk DebugOk removed the S: Do Not Merge Don't merge this yet label Mar 7, 2024
DebugOk
DebugOk reviewed Mar 7, 2024
View reviewed changes
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.

If you can do the changes Death requested, and temporarily remove the fire shit until psionics is refactors it should be good

DEATHB4DEFEAT
DEATHB4DEFEAT previously approved these changes Mar 15, 2024
View reviewed changes
@DEATHB4DEFEAT
Copy link
Member

Fix the tests and this looks fine.

@leonardo-dabepis
Copy link
Contributor Author

Fix the tests and this looks fine.

how do i fix the tests? 🥲

@Timemaster99
Copy link
Contributor

Fix the tests and this looks fine.

how do i fix the tests? 🥲

You go down to the failed tests at the bottom of the page and click on "details". Here's the reason it failed

Resources/Textures/DeltaV/Mobs/Animals/shrimp.rsi: Failed to read meta.json: Expecting property name enclosed in double quotes: line 22 column 5 (char 393)

@leonardo-dabepis
Update meta.json
02a6441 
remove ONE SILLY COMMA
@leonardo-dabepis
Copy link
Contributor Author

wow it was just one comma stopping the whole thing from working 😭

@IamVelcroboy
Copy link
Member

Fix the tests and this looks fine.

Can this be merged then?

@Colin-Tel
Copy link
Contributor

image
The shrimp stays levitating when it is knocked into crit, which seems a little silly.

@Colin-Tel
Copy link
Contributor

Also the body of the shrimp doesn't stop moving when it's dead, which is a little silly too.

@leonardo-dabepis
Copy link
Contributor Author

image The shrimp stays levitating when it is knocked into crit, which seems a little silly.

they're just really skilled

@NullWanderer
Copy link
Contributor

I can't remember if anything else needed to be done for this, should this be reviewed as is?

@leonardo-dabepis
Copy link
Contributor Author

I can't remember if anything else needed to be done for this, should this be reviewed as is?

It is ready

Colin-Tel
Colin-Tel approved these changes May 26, 2024
View reviewed changes
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

えび！🦐

@Colin-Tel Colin-Tel merged commit 9206e3f into DeltaV-Station:master May 26, 2024
13 checks passed
@Mnemotechnician Mnemotechnician mentioned this pull request Sep 7, 2024
Merged
VMSolidus added a commit to Simple-Station/Einstein-Engines that referenced this pull request Sep 8, 2024
@Mnemotechnician @leonardo-dabepis
@DEATHB4DEFEAT @NullWanderer @VMSolidus
Cherry-Pick "Shrimp Mob for Metempsychosis (#862)" (#882)
08be023 
# Description
Cherry-picks DeltaV-Station/Delta-v#862 on
behalf of the author.

This was not tested; need someone to check if it actually works before
merging.

# Changelog
:cl:
- add: A shrimp morphotype was added to the failure pool of the
metempsychotic machine.

---------

Signed-off-by: leo <[email protected]>
Signed-off-by: Mnemotechnican <[email protected]>
Co-authored-by: leo <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Co-authored-by: Null <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@Peptide90 @VMSolidus @DEATHB4DEFEAT
Weather Block Marker, Rad Markers and Invisible Walls (DeltaV-Station…
41a8b1b 
…#862)

Ported from Nuclear14 by request of @OldDanceJacket as they wanted the
weather blocking markers. Tought you may as well get the rest of the
stuff for rad markers and invisible walls too. Useful for planets.

---------

Signed-off-by: Peptide90 <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DebugOk DebugOk DebugOk left review comments

@Colin-Tel Colin-Tel Colin-Tel approved these changes

@DEATHB4DEFEAT DEATHB4DEFEAT DEATHB4DEFEAT left review comments

Assignees
No one assigned
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review S: Requires This requires something else to be done before resolved
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.