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

Adds modular pipe ends #17268

Merged
merged 27 commits into from Dec 22, 2023
Merged

Conversation

Laboredih123
Copy link
Contributor

[ATMOSPHERICS][INTERNAL][CLEAN]

About the PR

Adds modular pipe ends, pipe underlays that can be easily changed to shown, hidden, or exposed. They can also have colors based on what they are connected to.
They use the format SET_PIPE_UNDERLAY(the node being connected to, the dir, size of pipe when exposed which can be "short" "medium" or "long", color of pipe, hide or show the pipe)
Gives it a icon cache so memory and perf is saved.
Adds icon map versions for atmos devices since we kinda don't want a valve with no pipe being shown in SDMM.
Adds subtypes so people don't have to varedit to the map icon they need. Adds these types to maps.
Changes the indicator on the pump and the dual vent so they don't get masked by the pipe color.
Manifolds now have consistent node directions so I don't have to deal with bits on this.

Why's this needed?

Makes it so much easier to edit icons, as you don't need to add pipes onto each state.
Improves consistency, as the pipes are centralised in one file.
Helps out mappers a bit so they need to do less varediting.

image

Changelog

(u)cringe
(+)Atmospheric stuff now has their pipe ends colored, which is pretty rad.

changes images to no longer use non-modular pipes
adjusts certain images to accomadate varying colours
Removes icon states that are no longer useful
Modular pipe ends can be coloured and hidden
Adds a caching system for the modular pipes
Some more things I'm probably forgetting
the furnace connector now uses modular pipes
adds extra types so they dont have to be varedited
Uses map icons using the IN_MAP_EDITOR define
@boring-cyborg boring-cyborg bot added the C-Sprites Automatically applied on any .dmi or icons folder change label Dec 10, 2023
@keywordlabeler keywordlabeler bot added A-Atmospherics Attempts to touch the atmos system, help us all ☠ A-Internal Deals with major internal, generally non-player facing code - e.g. types C-Code-Quality Cleans up code, refactors things to be more readable or intuitive labels Dec 10, 2023
@github-actions github-actions bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 10, 2023
@boring-cyborg boring-cyborg bot added the A-Mapping A mapping change label Dec 10, 2023
@github-actions github-actions bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 10, 2023
@Laboredih123 Laboredih123 marked this pull request as ready for review December 10, 2023 20:39
@Laboredih123
Copy link
Contributor Author

hello yes please review well i probably missed something

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.

Brief look over the code, thank you for providing an update paths script for secret <3

_std/macros/atmos.dm Outdated Show resolved Hide resolved
_std/macros/atmos.dm Show resolved Hide resolved
_std/macros/atmos.dm Show resolved Hide resolved
code/modules/atmospherics/machinery/binary/dp_vent_pump.dm Outdated Show resolved Hide resolved
code/modules/atmospherics/machinery/trinary/filter.dm Outdated Show resolved Hide resolved
code/modules/atmospherics/machinery/trinary/mixer.dm Outdated Show resolved Hide resolved
code/modules/atmospherics/machinery/trinary/retrofilter.dm Outdated Show resolved Hide resolved
Copy link
Contributor

@amylizzle amylizzle left a comment

Choose a reason for hiding this comment

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

Looks way better. Can't see anything broken with it in testing, code seems fine.

@goonstation-issuebot goonstation-issuebot removed the S-Testmerged [Dev Only] Testmerged for extended testing (applied by bot) label Dec 20, 2023
@github-actions github-actions bot added the S-Merge-Conflict Applied and removed when a PR has or no longer has a merge conflict label Dec 21, 2023
@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 21, 2023
@TobleroneSwordfish TobleroneSwordfish added E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. and removed E-DNM [Dev Only] Do Not Merge - can only be removed by the applier or with their explicit permission. labels Dec 22, 2023
@TobleroneSwordfish TobleroneSwordfish merged commit 2f0c369 into goonstation:master Dec 22, 2023
23 checks passed
github-actions bot pushed a commit that referenced this pull request Dec 22, 2023
@Laboredih123 Laboredih123 deleted the pipeunderlays branch December 22, 2023 17:26
@vortex1942
Copy link
Contributor

Was the revert of #17334 intentional?

@Laboredih123
Copy link
Contributor Author

Was the revert of #17334 intentional?

no not particularly

@Laboredih123
Copy link
Contributor Author

mapmerge was being funky so im blaming that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Atmospherics Attempts to touch the atmos system, help us all ☠ A-Internal Deals with major internal, generally non-player facing code - e.g. types A-Mapping A mapping change C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Sprites Automatically applied on any .dmi or icons folder change size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants