Shuttle landing lights. #5222
Shuttle landing lights. #5222
Conversation
github-actions
bot
added
Sprites
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
cm13-github
removed
the
Merge Conflict
Drulikar
added
the
Testmerge Candidate
| on_prearrival() | ||
| return | ||
| on_prearrival() |
There was a problem hiding this comment.
This results in prearrival being called twice for a single landing
There was a problem hiding this comment.
Problem is the second calling is at the same time as on_arrival and I don't know why it does it. It was doing it prior to my change, it's why the sounds were playing when I was testing but the lights weren't working
code/modules/shuttle/shuttle.dm
Outdated
| if(prearrivalTime && mode != SHUTTLE_PREARRIVAL) | ||
| set_mode(SHUTTLE_PREARRIVAL) | ||
| setTimer(prearrivalTime) | ||
| log_debug("SHUTTLE DEBUG: shuttle on approach failed check!") | ||
| on_prearrival() | ||
| return | ||
| on_prearrival() |
There was a problem hiding this comment.
Document modifications from upstream code clearly please, this avoids things getting reverted on update
| @@ -704,6 +745,8 @@ | |||
| if(prearrivalTime && mode != SHUTTLE_PREARRIVAL) | |||
| set_mode(SHUTTLE_PREARRIVAL) | |||
| setTimer(prearrivalTime) | |||
| /// Run on_prearrival after setting the mode rather than waiting for next check, as this doesn't occur until landing is complete. | |||
| on_prearrival() | |||
There was a problem hiding this comment.
All assumptions prior to this PR have expected on_prearrival to occur below on line 708.
As I said before, this needs to be a new proc e.g. on_start_prearrival. Alternatively you do something similar inside of set_mode(SHUTTLE_PREARRIVAL)
Then move all landing light handling that is on_prearrival to the new on_start_prearrival
cm13-github
added
the
Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
cm13-github
removed
the
Merge Conflict
|
Conflicts have been resolved. A maintainer will review the pull request shortly. |
|
This PR has been inactive for long enough to be automatically marked as stale. This means it is at risk of being auto closed in ~ 7 days, please address any outstanding review items and ensure your PR is finished, if these are all true and you are auto-staled anyway, you need to actively ask maintainers if your PR will be merged. Once you have done any of the previous actions then you should request a maintainer remove the stale label on your PR, to reset the stale timer. If you feel no maintainer will respond in that time, you may wish to close this PR youself, while you seek maintainer comment, as you will then be able to reopen the PR yourself |
About the pull request
Adds landing lights to ERT landing pads.
Explain why it's good for the game
No one likes getting squished by the ERT shuttles.
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
add: Added landing lights to the ERT landing bays.
imgadd: Added some mapicons for the differend landing light delay settings to make it easier to see what is what on the map.
code: Restructured the procs that toggle landing lights on and off for simplicity.
/:cl: