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

Moff plushies Extended. Part 1. Attempt №2 #31923

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

Pgriha
Copy link
Contributor

@Pgriha Pgriha commented Sep 7, 2024

recrated #31922

About the PR

  • Adding 23 new plush moff variations ported over from the BeeStation build. Of them, 6 really have some features, the others are just variations of textures.
  • Increased variation of sounds that the plush moff can make and the possibility of grinding them into fiber.
  • Adding handheld sprites to all plush moffs.
  • Adding a cargo option to order a box with plush moffs.
  • Adding plush moff options to loadouts of any roles.
  • Adding an option for plush moffs to drop from gifts.
  • Adding moff plushie to dresser.
  • Adding moff plushie to toy spawner.

Why part 1? Because there is still an idea to add some more moff plushes or replace the existing ones and also add the ability to wear on the head =)

Why / Balance

More is better? Adding a bunch of variations to the moff toy and improving the existing one.

Technical details

As mentioned earlier. Most of the sprites are taken from the BeeStation build, although some were missing and were finished by another user, Miyugi.

From unique 4 plushies:

  1. moff rainbow plushie - respectively, rainbow. Implemented in the same way as a rainbow carp or bee.
  2. moff musician plushie - musical, able to play sunset.ogg composition, although quite quietly. It has a usage timeout of 10 minutes to prevent spam.
  3. moff bluespace plushie - bluespace, has the ability to "teleport". This is implemented through the RandomWalk system, but with breaks of 30-60 seconds and a speed of 500.
  4. broken moff plushie – broken, all sounds replaced by others and "poisonouns" when eated.

Loadout:

  1. Moff plushie - available to all;
  2. Moff rainbow plushie - available if you have more than 10 hours on passenger;
  3. Moff bartender plushie - available if you have more than 5 hours on bartender.
  4. Moffsician plushie - available if you have more than 5 hours on musician.

Media

All moff plushie:

Space.Station.14.2024-09-07.15-14-52.mp4

Random moff plushie proto:

Space.Station.14.2024-09-07.14-53-18.mp4

Moff in hand:

Space.Station.14.2024-09-07.15-03-38.mp4

Moff sounds:

Space.Station.14.2024-09-07.15-17-45.mp4

Music moff:

Space.Station.14.2024-09-07.15-20-44.mp4

Moff in cargo:

Space Station 14 07 09 2024 15_22_30

Moff in loadout:

Screenshot 08 09 2024 4_59_19

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

From proto PlushieMoth to proto PlushieMoff. And added migration all PlushieMoth to PlushieMoffRandom.
Changelog
🆑

  • add: Adding 23 new moff(moth) plushie and make they more cute and fluffy!
  • add: Moff plushie crate available for order in cargo.
  • add: Moff plushies are now available in the loadout.
  • add: Moff plushie can be found in dresser, gifts and around the station.

@github-actions github-actions bot added No C# For things that don't need code. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Sep 7, 2024
Copy link
Contributor

github-actions bot commented Sep 7, 2024

RSI Diff Bot; head commit 7e30774 merging into 9d75a22
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Fun/toys.rsi

State Old New Status
plushie_moth Removed

Resources/Textures/Objects/Fun/moff_plushie.rsi

State Old New Status
moff-inhand-left Added
moff-inhand-right Added
moff Added
moff_all Added
moff_atlas-inhand-left Added
moff_atlas-inhand-right Added
moff_atlas Added
moff_bluespace-inhand-left Added
moff_bluespace-inhand-right Added
moff_bluespace Added
moff_brown-inhand-left Added
moff_brown-inhand-right Added
moff_brown Added
moff_clockwork-inhand-left Added
moff_clockwork-inhand-right Added
moff_clockwork Added
moff_deadhead-inhand-left Added
moff_deadhead-inhand-right Added
moff_deadhead Added
moff_firewatch-inhand-left Added
moff_firewatch-inhand-right Added
moff_firewatch Added
moff_gothic-inhand-left Added
moff_gothic-inhand-right Added
moff_gothic Added
moff_lovers-inhand-left Added
moff_lovers-inhand-right Added
moff_lovers Added
moff_luna-inhand-left Added
moff_luna-inhand-right Added
moff_luna Added
moff_monarch-inhand-left Added
moff_monarch-inhand-right Added
moff_monarch Added
moff_moonfly-inhand-left Added
moff_moonfly-inhand-right Added
moff_moonfly Added
moff_plasmafire-inhand-left Added
moff_plasmafire-inhand-right Added
moff_plasmafire Added
moff_poison-inhand-left Added
moff_poison-inhand-right Added
moff_poison Added
moff_ragged-inhand-left Added
moff_ragged-inhand-right Added
moff_ragged Added
moff_redish-inhand-left Added
moff_redish-inhand-right Added
moff_redish Added
moff_rosy-inhand-left Added
moff_rosy-inhand-right Added
moff_rosy Added
moff_royal-inhand-left Added
moff_royal-inhand-right Added
moff_royal Added
moff_snow-inhand-left Added
moff_snow-inhand-right Added
moff_snow Added
moff_whitefly-inhand-left Added
moff_whitefly-inhand-right Added
moff_whitefly Added
moff_witchwing-inhand-left Added
moff_witchwing-inhand-right Added
moff_witchwing Added
moffbar-inhand-left Added
moffbar-inhand-right Added
moffbar Added
moffrror-inhand-left Added
moffrror-inhand-right Added
moffrror Added
moffsician-inhand-left Added
moffsician-inhand-right Added
moffsician Added

Edit: diff updated after 7e30774

@Hanzdegloker
Copy link
Contributor

Holy xhit!

@lzk228
Copy link
Contributor

lzk228 commented Sep 7, 2024

better to do as in #14624
adding a fucktone of almost the same prototypes is quite bad

@dffdff2423
Copy link
Contributor

I think it should remain as "moth plushie" rather then "moff plushie" for parity with the other plushies. If you insist otherwise, there is not really a reason to cause a breaking change of PlushieMoth -> PlushieMoff, you can just change the display name and keep the internal name the same.

@Pgriha
Copy link
Contributor Author

Pgriha commented Sep 7, 2024

better to do as in #14624 adding a fucktone of almost the same prototypes is quite bad

Uh, it makes sense, I initially did everything through a random sprite, but... I ran into a problem, the impossibility of making a variable sprite of the object in the hands.
Is it somehow possible to add this without prototypes spam?

@Pgriha
Copy link
Contributor Author

Pgriha commented Sep 7, 2024

I think it should remain as "moth plushie" rather then "moff plushie" for parity with the other plushies. If you insist otherwise, there is not really a reason to cause a breaking change of PlushieMoth -> PlushieMoff, you can just change the display name and keep the internal name the same.

Always thought the moff was a much better fit than the moth in the toy case because of it's design. That's why I made such names at first, and then the id to match.
Although if this is really a problem, then I will return to the moth.

I just didn't understand... How does that relate to parity with other plush? .-.

@NotSoDana
Copy link
Contributor

No fucking way

@dffdff2423
Copy link
Contributor

Always thought the moff was a much better fit than the moth in the toy case because of it's design. That's why I made such names at first, and then the id to match. Although if this is really a problem, then I will return to the moth.

Just wait for maintainer feedback before doing anything then. Ids don't need to match with the name and in my opinion it is better to keep the old ID then do a breaking change (but the maintainers might disagree with me on that).

I just didn't understand... How does that relate to parity with other plush? .-.

The lizard plush is not called a "lizer plush"

@Pgriha
Copy link
Contributor Author

Pgriha commented Sep 8, 2024

Always thought the moff was a much better fit than the moth in the toy case because of it's design. That's why I made such names at first, and then the id to match. Although if this is really a problem, then I will return to the moth.

Just wait for maintainer feedback before doing anything then. Ids don't need to match with the name and in my opinion it is better to keep the old ID then do a breaking change (but the maintainers might disagree with me on that).

Okay, although the remark is still valid =)

I just didn't understand... How does that relate to parity with other plush? .-.

The lizard plush is not called a "lizer plush"

A bit dishonest, really. . .

@github-actions github-actions bot added the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 8, 2024
Copy link
Contributor

github-actions bot commented Sep 8, 2024

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

@github-actions github-actions bot removed the Merge Conflict This PR currently has conflicts that need to be addressed. label Sep 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. No C# For things that don't need code.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants