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

Makes rear dropship doors solid again and refactors multi door filler turf logic #4837

Merged
merged 13 commits into from
Nov 9, 2023

Conversation

Das15
Copy link
Contributor

@Das15 Das15 commented Nov 4, 2023

About the pull request

Fixes a bug with rear drop ship doors, which allowed people to see through them (you can see space for 1 tick on departure though, dunno how to fix this detail). Refactored filler turfs logic in door parent, so we can avoid redundant code.

Also removed some unnecessary code from door class.

Explain why it's good for the game

Bugs and old, unnecessary code bad, therefore they should be gone.

Testing Photographs and Procedure

  • Checked rear drop ship doors on start of the round,
  • Launched the ship,
  • Checked the doors again,
  • On arrival checked the doors once again.

Changelog

🆑 MrDas
fix: You can no longer see through solid rear drop ship doors.
code: Moved filler turf logic from almayer airlocks to its parent door.
/:cl:

@github-actions github-actions bot added Fix Fix one bug, make ten more Code Improvement Make the code longer labels Nov 4, 2023
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
@ihatethisengine
Copy link
Contributor

You are supposed to see through lifeboats doors (which is a subtype of reardoor), so make sure it's working

@Das15
Copy link
Contributor Author

Das15 commented Nov 5, 2023

You are supposed to see through lifeboats doors (which is a subtype of reardoor), so make sure it's working

Yup, checked just in case, lifeboat doors work as they are supposed to

code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/game/machinery/doors/door.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttles/dropship.dm Outdated Show resolved Hide resolved
@harryob harryob marked this pull request as draft November 6, 2023 02:51
@Das15 Das15 marked this pull request as ready for review November 6, 2023 20:40
@Das15 Das15 requested a review from harryob November 8, 2023 16:14
@harryob harryob added this pull request to the merge queue Nov 9, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Nov 9, 2023
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 9, 2023
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 9, 2023
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@harryob harryob added this pull request to the merge queue Nov 9, 2023
Merged via the queue into cmss13-devs:master with commit 4e52130 Nov 9, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Nov 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Improvement Make the code longer Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants