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

Feature: Clown recycler, a new Cmag effect #28233

Merged
merged 9 commits into from
Feb 10, 2025

Conversation

Toastical
Copy link
Contributor

@Toastical Toastical commented Feb 3, 2025

What Does This PR Do

Adds a cmag effect to the recycler, which utilizes a variant of the banantouched() proc called bananatouched_harmless()
Made a new proc, alternative to bananatouched() called bananatouched_harmless(). It's identical in idea, but omits some of the more round crippling effects that the original proc has.
Added dropdel variants of the clown clothes, which will be used to equip the recycled clown.
Recycler emag and cmag are now mutually exclusive. You cannot cmag an emagged recycler and vice versa.

Process goes, cmag recycler, someone falls in, they get stripped off their uniform, shoes, mask and if plasmaman, helmet. Their original belongings drop under the recycler (where they won't be deleted). They get equipped with enough dropdel clown clothing that they won't burn up or look naked. If they have internals, their tank will snap into the best available slot and turn itself on.

Why It's Good For The Game

Because funi. Also, more possible uses for the cmag. Kinda fit's the goofy sorta stuff a cmag would do.

Images of changes

2025-02-03.22-09-44.mp4

dreamseeker_tRaqqPYZCT

Testing

Emagged it and tried cmagging it.
Cmagged it and tried emagging it.
Went through while it's cmagged.
Went through with a modsuit while it's cmagged.
Went through it as a plasmaman with an internals tank. The internals tank snapped onto me immediately.


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: recycler can now be cmagged, dressing people who fall into it like a clown.
/:cl:

@ParadiseSS13-Bot ParadiseSS13-Bot added the -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally label Feb 3, 2025
code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
@Toastical Toastical requested a review from Contrabang February 3, 2025 18:56
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting approval This PR is waiting for approval internally and removed -Status: Awaiting type assignment This PR is waiting for its type to be assigned internally labels Feb 4, 2025
Copy link
Contributor

@FunnyMan3595 FunnyMan3595 left a comment

Choose a reason for hiding this comment

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

Test what happens with vox, plasmamen, and anyone else with internals on. Since this is supposed to be harmless, let's make sure we don't take away their ability to breathe.

code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
@Toastical
Copy link
Contributor Author

Test what happens with vox, plasmamen, and anyone else with internals on. Since this is supposed to be harmless, let's make sure we don't take away their ability to breathe.

They'll probably have their internals dropped, but being oxygenless for 14 seconds wouldn't really do any serious harm. My intent with it being harmless is not having permanent effects, like no drop.

@Destrucnope
Copy link

So I am hopping that plasmamen will just get their envirosuit switched with the clown envirosuit? Cause it would suck that it does like wizard clowning spell, who is basically a one shot round removal for plasmamen

@Toastical
Copy link
Contributor Author

So I am hopping that plasmamen will just get their envirosuit switched with the clown envirosuit? Cause it would suck that it does like wizard clowning spell, who is basically a one shot round removal for plasmamen

Uhh that'll probably have to be changed. Will do,

code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
@ParadiseSS13-Bot ParadiseSS13-Bot added -Status: Awaiting review This PR is awaiting review from the review team and removed -Status: Awaiting approval This PR is waiting for approval internally labels Feb 5, 2025
@ParadiseSS13-Bot 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 Feb 6, 2025
@SynthTwo
Copy link
Contributor

SynthTwo commented Feb 6, 2025

!wiki_label

@github-actions github-actions bot added the Requires Wiki Update Useful for Wiki Contributers to search for things that need updating label Feb 6, 2025
code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
code/datums/spells/banana_touch.dm Outdated Show resolved Hide resolved
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>
oh theyre 2

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>
@Toastical Toastical requested a review from lewcc February 6, 2025 22:24
@Burzah Burzah added this pull request to the merge queue Feb 10, 2025
Merged via the queue into ParadiseSS13:master with commit 404f11f Feb 10, 2025
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
-Status: Awaiting merge This PR is ready for merge Requires Wiki Update Useful for Wiki Contributers to search for things that need updating
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants