Extra Plushies + Plushify Spell #27384

Drakeven · 2024-11-17T23:54:52Z

What Does This PR Do

Adds new plushies- including some to the loadout. A Skrell, Borg (of all colours), Kidan, Plasmaman, diona/nymph, drask, and human plushie to fill out the other species that don't have a 'representative' plushie yet.

They all have some small aspect that makes them unique, Kidan cry when exposed to bug spray, Diona split into nymphs when exposed to weed killer, two nymph plushies combine into a diona plushie (Which will set off grenades in either), the Skrell plushie has a small item sized headpocket you can use with alt-click, the borg plushie also acts as a flashlight, the plasmaman plushie has a one tile light explosion when exposed to open flame, the drask plushie eats soap, and the human plushie... screams.

Since each species has an assigned plushie now, I've also added a new spell- 'Plushify', similar to the admin bread smite it turns whatever is hit to its respective plushie. Same cost/general idea as disintegrate that lasts 10 minutes. Also, an admin smite that lasts permanently. The initial mob is deleted in an admin smite, so the admins are notified of any important items that have been deleted.

All plushies have grenade compatibility. Vox & Nian plushies will now activate their grenades even if they are doing their 'hug' sound.

Why It's Good For The Game

It's good that all the species are now represented by plushies, giving a wider focus to the many different species we have featured on paradise.

Images of changes

Testing

Used 'Plushify' on all species, including ones not represented by plushies (get turned into a random plushie), comited crimes against plush kind by stuffing each one with a grenade and blowing them up. Many of them. Diona explode when split into nymphs, plasmamen explode when they... explode.

Declaration

I confirm that I either do not require pre-approval for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.

Changelog

🆑
add: New plushies for all species
add: New spell that turns people into plushies
add: Adds new plushies to loadout
fix: Poof sound not using pick-wight on hit
tweak: Plushies are always destroyed when a grenade goes off inside it- including flashbangs, chem grenades, ect
tweak: Vox & Nian plushies will now activate any grenades in them even if they're saying their 'hug word'
/:cl:

TODO- Fix borgs becoming mind Add to smite list Add diona plush effect

Added alien plush Added loadout Yeah

ParadiseSS13-Bot · 2024-11-17T23:54:55Z

Your PR has been put on hold as your GitHub account is not linked to a Paradise forums account.

Please link your account at https://www.paradisestation.org/forum/custom/link_github_account.php

Headcoders may ignore this in specific circumstances (Minor fix PR, trusted contributor from another codebase, anything at their discretion)

Drakeven · 2024-11-17T23:57:54Z

Just need to fix something with the godhand.

code/modules/client/preference/loadout/loadout_general.dm

code/game/objects/items/toys.dm

code/game/gamemodes/wizard/godhand.dm

code/game/objects/items/toys.dm

Coolrune206 · 2024-11-18T03:22:35Z

Plushify will nuke the brain unlike disintegrate. Is there any way to move the mob's brain inside the plushie so it can be cut out?

Fordoxia · 2024-11-18T04:21:21Z

Plushify will nuke the brain unlike disintegrate. Is there any way to move the mob's brain inside the plushie so it can be cut out?

That sounds very possible. Generate the plush before the mob is deleted, move the brain/MMI inside it.

Make system to allow brain to be removed.

Maybe allow the plush to be possessed by the brain.

Drakeven · 2024-11-18T05:05:21Z

Plushify will nuke the brain unlike disintegrate. Is there any way to move the mob's brain inside the plushie so it can be cut out?

Could use the grenade plushie code.

HMBGERDO · 2024-11-18T07:39:20Z

lizard plushie colors? ❤️

SynthTwo · 2024-11-18T21:06:56Z

!wiki_label

code/game/gamemodes/wizard/godhand.dm

code/game/objects/items/toys.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

Will finish later

Drakeven · 2024-11-18T23:22:14Z

Added a 10 minute timer to the wizard spell, still a WIP that I will finish off soon!

SteelSlayer · 2024-11-19T18:30:18Z

Author has a linked account.

Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite.

Needs a closer look but all the immediate stuff is fixed

code/game/objects/items/toys.dm

code/modules/mob/living/living.dm

code/modules/reagents/chemistry/reagents/toxins.dm

spacegeese · 2024-11-28T02:54:55Z

where are their clothes

And stuff

Converting all the attacks into more sleek attacks, will need to finish.

Burzah

This will need to be adjusted, due to the attack chain refactor.

Yippie!

now you can self-shoot again! Horay!

IPC clowns everywhere devistated

Qwertytoforty · 2024-12-21T01:23:44Z

deconflicted and tested!

Burzah

Just a few small things.

code/game/objects/items/toys.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

:)

Burzah

Looks good!

pwbokie · 2024-12-24T05:19:31Z

Looks like Plushify when used on a dead body traps the ghost in the plushy after they re-enter body.

Drakeven added 3 commits November 17, 2024 17:43

Plushie PR

7c933a8

TODO- Fix borgs becoming mind Add to smite list Add diona plush effect

Fixed Issues

31eb620

Added alien plush Added loadout Yeah

Merge remote-tracking branch 'upstream/master' into ExtraPlushies

3e976d6

ParadiseSS13-Bot added the On Hold Its gonna be a while before this is reviewed label Nov 17, 2024

ParadiseSS13-Bot added -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally Sprites This PR modifies the game sprites labels Nov 18, 2024

Contrabang previously requested changes Nov 18, 2024

View reviewed changes

github-actions bot added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Nov 18, 2024

lewcc reviewed Nov 18, 2024

View reviewed changes

code/game/gamemodes/wizard/godhand.dm Outdated Show resolved Hide resolved

code/game/objects/items/toys.dm Show resolved Hide resolved

code/game/objects/items/toys.dm Outdated Show resolved Hide resolved

Drakeven and others added 2 commits November 19, 2024 09:22

Apply suggestions from code review

1d356b1

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

WIP

d3f083e

Will finish later

SteelSlayer removed the On Hold Its gonna be a while before this is reviewed label Nov 19, 2024

Fixed the various issues

fa5ceb0

Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite.

1080pCat added the Feature This PR is a new addition to the game label Nov 22, 2024

github-actions bot added the Merge Conflict This PR is merge conflicted label Nov 25, 2024

lewcc reviewed Nov 26, 2024

View reviewed changes

Drakeven added 3 commits December 5, 2024 09:45

Minor typo fixing

e5a281d

And stuff

Merge remote-tracking branch 'upstream/master' into ExtraPlushies

d5451d7

WIP Conversion

e4450e9

Converting all the attacks into more sleek attacks, will need to finish.

github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 5, 2024

Burzah requested changes Dec 9, 2024

View reviewed changes

github-actions bot added the Merge Conflict This PR is merge conflicted label Dec 9, 2024

Drakeven added 4 commits December 21, 2024 10:30

Merge remote-tracking branch 'upstream/master' into ExtraPlushies

efad4a2

Fixes galore

d023c05

Yippie!

Russian revolver wasn't working

0bcd66d

now you can self-shoot again! Horay!

You can no longer eat spraycans

bef04b0

IPC clowns everywhere devistated

lewcc added the Attack Chain Migration Refactoring of legacy attack chain items label Dec 21, 2024

github-actions bot removed the Merge Conflict This PR is merge conflicted label Dec 21, 2024

Burzah reviewed Dec 21, 2024

View reviewed changes

Drakeven and others added 3 commits December 22, 2024 10:14

Apply suggestions from code review

cbf64ed

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

A tinsy bit of touching up

eb81e1d

:)

Merge remote-tracking branch 'upstream/master' into ExtraPlushies

eefd042

Burzah approved these changes Dec 22, 2024

View reviewed changes

ParadiseSS13-Bot added -Status: Awaiting merge This PR is ready for merge and removed -Status: Awaiting review This PR is awaiting review from the review team labels Dec 22, 2024

Burzah requested review from lewcc and Qwertytoforty December 22, 2024 16:55

Qwertytoforty approved these changes Dec 22, 2024

View reviewed changes

Burzah added this pull request to the merge queue Dec 23, 2024

Merged via the queue into ParadiseSS13:master with commit a5726ef Dec 23, 2024
12 checks passed

Contrabang mentioned this pull request Dec 23, 2024

Plushies from Plushify spell do not GC when admin deleted #27729

Closed

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Extra Plushies + Plushify Spell #27384

Extra Plushies + Plushify Spell #27384

Drakeven commented Nov 17, 2024 •

edited

Loading

ParadiseSS13-Bot commented Nov 17, 2024

Drakeven commented Nov 17, 2024

Coolrune206 commented Nov 18, 2024

Fordoxia commented Nov 18, 2024 •

edited

Loading

Drakeven commented Nov 18, 2024

HMBGERDO commented Nov 18, 2024

SynthTwo commented Nov 18, 2024

Drakeven commented Nov 18, 2024

SteelSlayer commented Nov 19, 2024

spacegeese commented Nov 28, 2024

Burzah left a comment

Qwertytoforty commented Dec 21, 2024

Burzah left a comment

Burzah left a comment

pwbokie commented Dec 24, 2024 •

edited

Loading

Extra Plushies + Plushify Spell #27384

Extra Plushies + Plushify Spell #27384

Conversation

Drakeven commented Nov 17, 2024 • edited Loading

What Does This PR Do

Why It's Good For The Game

Images of changes

Testing

Declaration

Changelog

ParadiseSS13-Bot commented Nov 17, 2024

Drakeven commented Nov 17, 2024

Coolrune206 commented Nov 18, 2024

Fordoxia commented Nov 18, 2024 • edited Loading

Drakeven commented Nov 18, 2024

HMBGERDO commented Nov 18, 2024

SynthTwo commented Nov 18, 2024

Drakeven commented Nov 18, 2024

SteelSlayer commented Nov 19, 2024

spacegeese commented Nov 28, 2024

Burzah left a comment

Choose a reason for hiding this comment

Qwertytoforty commented Dec 21, 2024

Burzah left a comment

Choose a reason for hiding this comment

Burzah left a comment

Choose a reason for hiding this comment

pwbokie commented Dec 24, 2024 • edited Loading

Drakeven commented Nov 17, 2024 •

edited

Loading

Fordoxia commented Nov 18, 2024 •

edited

Loading

pwbokie commented Dec 24, 2024 •

edited

Loading