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

refactor light fixture placing #15911

Merged
merged 4 commits into from Oct 8, 2023

Conversation

zjdtmkhzt
Copy link
Contributor

About the PR

Refactors light fixture placement code a bit to move the stuff out of the walls and floors and into the light fixture object.

Why's this needed?

  • The initial impetus for this was to make it possible to simply place light fixtures onto windows.
  • Light fixtures should now also be offset correctly depending on the wall sprite, like those that are defined in maps already are.
  • Removes a lot of sort of duplicate code?
  • Ideally it will also prevent the thing where you smack walls with the fixtures while placing them.

Changelog

(u) zjdtmkhzt
(+) Light fixtures can now be placed directly on windows.

@github-actions github-actions bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 20, 2023
@zjdtmkhzt zjdtmkhzt added A-Game-Objects The point of this PR is to deal with a specific game object size/L Denotes a PR that changes 100-499 lines, ignoring generated files. C-Bug A bug that impacts usage of a feature C-Code-Quality Cleans up code, refactors things to be more readable or intuitive and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Sep 20, 2023
@zjdtmkhzt
Copy link
Contributor Author

I still have some minor merge conflicts to resolve and want to test it a bit before then, after that it should be good to merge hopefully.

Also, the RCD will still smack things with this, but I'd rather change that in a subsequent PR since this is already sizable and I might have to shuffle some RCD code around.

@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 Sep 20, 2023
@ZeWaka
Copy link
Member

ZeWaka commented Sep 20, 2023

finally, nice

@zjdtmkhzt
Copy link
Contributor Author

Also added functionality now for stacking several lights on one tile, if it makes sense with the types and directions.
image

@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 Sep 21, 2023
Copy link
Contributor

@flappybatpal flappybatpal left a comment

Choose a reason for hiding this comment

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

Tested ingame and seems good.

@ZeWaka ZeWaka merged commit e34320e into goonstation:master Oct 8, 2023
23 checks passed
@ZeWaka ZeWaka added the C-Feature A new feature or enhancements to existing features label Oct 8, 2023
github-actions bot pushed a commit that referenced this pull request Oct 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-Game-Objects The point of this PR is to deal with a specific game object C-Bug A bug that impacts usage of a feature C-Code-Quality Cleans up code, refactors things to be more readable or intuitive C-Feature A new feature or enhancements to existing features 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

3 participants