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

Slug things, slime, dropSweat and wetify procs #17155

Merged
merged 10 commits into from Dec 8, 2023

Conversation

CalliopeSoups
Copy link
Contributor

@CalliopeSoups CalliopeSoups commented Nov 29, 2023

[C-Code-Quality] [A-Chemistry] [A-Catering]

About the PR

Rework of #17026

This PR adds a couple slug related things and includes two procs to cut down on instances of copy pasted code: wetify and dropSweat.

Slime is a new reagent that should generally be considered as a weaker but alternate source of glue for fun recipes and making floors sticky. You get slime by butchering a slug and extracting the goop out of the resulting lesser slugs, or by scooping oozed slime from the floor after eating a slug burger.

Instances where you're setting "wet" to 2 or 3 to cause slippiness is now handled by the proc wetify, which also accepts -1 as slime and -2 as space glue. dropSweat is a similar proc for status effects that cause you to drop liquids.

Some vestigal code may still need to be removed and comments added in a future commit.

Why's this needed?

Funny pun lead to a desire for slug burger. This lead to putting copy pasted code into some procs too.

Changelog

(u)CalliopeSoups
(*)Slugs can now be butchered and made into burgers, you monster.
(+)Butchered slugs contain slime that makes the floor sticky like glue.
(+)Sweat+ effects should be more pronounced as well.

@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Nov 29, 2023
@github-actions github-actions bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict labels Nov 29, 2023
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

Curse of merge conflict upon ye.
Oh also all instances where you're defining any kind of time should use the SECONDS define for clarity, that's in variables and proc arguments.

code/mob/living/carbon.dm Outdated Show resolved Hide resolved
code/mob/living/carbon.dm Show resolved Hide resolved
code/turf/floors.dm Outdated Show resolved Hide resolved
code/turf/floors.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-Misc.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-Misc.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-Misc.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-Misc.dm Outdated Show resolved Hide resolved
code/modules/status_system/statusEffects.dm Outdated Show resolved Hide resolved
@CalliopeSoups
Copy link
Contributor Author

Turns out I hadn't added an if block for superlube in the wetify proc so I added that, but the proc seems a bit bloated now. I can try shave it down if needed.

code/turf/floors.dm Outdated Show resolved Hide resolved
code/turf/floors.dm Outdated Show resolved Hide resolved
code/turf/floors.dm Outdated Show resolved Hide resolved
code/modules/chemistry/Reagents-Misc.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

Okay uh that doesn't compile because the indentation is all wrong, and invisible lube still needs to wet the turf, you'll need to add a silent argument to wetify to cancel the playsound and pass it an alpha of 0 if visible is false (also ideally don't set up the overlay at all if the alpha is zero)

@CalliopeSoups
Copy link
Contributor Author

Ah I see thanks, I'll get to it.

Copy link
Contributor

@TobleroneSwordfish TobleroneSwordfish left a comment

Choose a reason for hiding this comment

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

A few final nitpicks

code/turf/floors.dm Outdated Show resolved Hide resolved
code/turf/floors.dm Show resolved Hide resolved
code/turf/floors.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Dec 8, 2023
@TobleroneSwordfish TobleroneSwordfish merged commit f35975b into goonstation:master Dec 8, 2023
21 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-Sprites Automatically applied on any .dmi or icons folder change size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants