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

Split disposal.dmi #3621

Merged
merged 2 commits into from
Feb 15, 2024
Merged

Split disposal.dmi #3621

merged 2 commits into from
Feb 15, 2024

Conversation

quardbreak
Copy link
Contributor

@quardbreak quardbreak commented Jan 24, 2024

Description of changes

Cleanups disposal.dmi and puts disposals objects sprites in separate files.
Removed bunch of unused and old icons:

  • Semi-transparency disposal pipe icons (T-Ray should use alpha on pipes already)
  • "trashbin" (duplicate of old machinery component icon)
  • old toilet 😔

Updated some code to make animation icon less hardcoded.
Renamed con[icon_state] to [icon_state]_construct for better explanation.

Open as draft PR. I need to test that nothing is missing.

Why and what will this PR improve

Less icon hoarding, easier to maintain and one step closer to disposals refactor.

Authorship

Myself.

@MistakeNot4892 MistakeNot4892 added the work in progress This PR is under development and shouldn't be merged. label Jan 27, 2024
@quardbreak quardbreak marked this pull request as ready for review February 13, 2024 17:20
@MistakeNot4892 MistakeNot4892 added ready for review This PR is ready for review and merge. and removed work in progress This PR is under development and shouldn't be merged. labels Feb 15, 2024
@@ -310,21 +310,21 @@ var/global/list/diversion_junctions = list()

// flush handle
if(flush)
overlays += image('icons/obj/pipes/disposal.dmi', "dispover-handle")
overlays += image(icon, "[icon_state]-handle")
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 Feb 15, 2024

Choose a reason for hiding this comment

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

Should just be overlays += "[icon_state]-handle" here and below, wherever it's just using icon.
Would be good to replace the direct overlays modification with cut_overlays()/add_overlay() if you're willing.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

@comma comma merged commit 81f5b7f into NebulaSS13:dev Feb 15, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready for review This PR is ready for review and merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants