Add doormats, modify liquid presentation #4796
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
e3cfc30 to
462d294
Compare
13803a2 to
7a6b66f
Compare
7a6b66f to
17b8d06
Compare
| - `infix`: TODO | ||
| - `suffix`: TODO | ||
| - `infix`: An optional string appended directly to the 'That's an X' string, between the name the end of the sentence. | ||
| - `suffix`: An optional string appended in a separate sentence after the initial introduction line. | ||
| - Return: `TRUE` when the call chain is valid, otherwise `FALSE` | ||
| - Events: `atom_examined` | ||
| */ | ||
| /atom/proc/examine(mob/user, distance, infix = "", suffix = "") |
There was a problem hiding this comment.
Note to self to get around to splitting base examine() up like mob examine() and make it combine a set of lines instead of farting it straight out at user.
| /obj/item/towel/can_be_poured_into(atom/source) | ||
| return (reagents?.maximum_volume > 0) | ||
|
|
||
| /obj/item/towel/proc/update_material_description() |
There was a problem hiding this comment.
We really need an item-level update_descrption() to go with update_name(). Maybe even /obj level so the structure procs can share behavior or override.
| // would this have any use aside from fluff strings? sandpaper grit maybe? | ||
| desc = "A [is_soft ? "soft" : "rugged"] [material.adjective_name] [base_name][additional_description ? " [additional_description]" : null]." // 'a soft cotton towel' by default. also supports 'a rugged leather doormat used to blah blah' etc | ||
|
|
||
| /obj/item/towel/examine(mob/user, distance, infix, suffix) |
There was a problem hiding this comment.
Wonder if we could use the drying system for towel wetness instead of the general evaporation thing it does currently? Have it dry out without ever creating a dried product, would let you put towels near a fire to dry.
code/modules/materials/_materials.dm
Outdated
| /// Gets the name used to describe a coating with this material as its primary reagent. | ||
| /// This is mostly for handling special cases like mud. | ||
| /decl/material/proc/get_primary_coating_name(datum/reagents/coating) | ||
| var/phase_at_stp = phase_at_temperature() |
There was a problem hiding this comment.
Any particular reason to cast this versus just passing the function call as a parameter?
There was a problem hiding this comment.
the comment after was added when i ripped out a bunch of more nuanced handling that didn't really work
code/modules/materials/_materials.dm
Outdated
| var/used_color = get_reagent_color(coating) | ||
| if(get_config_value(/decl/config/enum/colored_coating_names) == CONFIG_COATING_COLOR_COMPONENTS) | ||
| return FONT_COLORED(used_color, coated_adjective) | ||
| else |
There was a problem hiding this comment.
Nit: extraneous else.
17b8d06 to
30081ac
Compare
MistakeNot4892
previously approved these changes
Jan 30, 2025
30081ac to
bc61312
Compare
MistakeNot4892
approved these changes
Feb 1, 2025
NebulaSS13Bot
added a commit
that referenced
this pull request
Feb 1, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
This is kind of a doozy, I wasn't great with modularising, planning to split it out if needed.
Depends on #4798 to fix CI errors.Done.Why and what will this PR improve
Adds a way to stop people from tracking stains indoors on certain (planetary) maps, which isn't foolproof and requires occasional interaction. I might even nerf the passive drying a lot or even remove it entirely, to give you a reason to pick it up and wash it or wring it out outside.
Makes coating and fluid presentation a lot more visually interesting and informative. I might try palletizing the colors in the future (based on client light/dark mode setting) to make sure they're readable, but for now this works well enough.
Authorship
Me, and the Caves of Qud developers for the inspiration for the coating/liquid name system. Also thanks to suno-lili-so and librarianmage in the Caves of Qud discord for explaining the technical side of the liquids system in CoQ more in-depth, and to the Caves of Qud wiki maintainers (which I believe includes those two as well as others) for documenting liquid adjectives for me to steal.
Changelog
🆑
add: Added doormats.
tweak: Modified liquid and coating presentation to be more fancy.
/:cl: