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

trijent shuttle now generic #4639

Merged
merged 11 commits into from
Oct 30, 2023

Conversation

mullenpaul
Copy link
Contributor

@mullenpaul mullenpaul commented Oct 11, 2023

About the pull request

I have made the Trijent shuttle generic, allowing this to be reused on other mapping projects. We can also have multiple elevators in the same mission.

Trijent dam also now has two elevators.

  1. LZ1 to Engineering
  2. LZ2 to Omega

Explain why it's good for the game

Other maps will be able to incorporate the Trijent elevator shuttle.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
refactor: reworked trijent elevators to be reusable on new maps
maptweak: Trijent map now has two elevators, lz1 to engineering and lz2 to omega
/:cl:

@github-actions github-actions bot added Mapping did you remember to save in tgm format? Refactor Make the code harder to read labels Oct 11, 2023
@mullenpaul mullenpaul changed the title trident shuttle now generic trijent shuttle now generic Oct 11, 2023
code/__DEFINES/shuttles.dm Outdated Show resolved Hide resolved
code/datums/shuttles.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttles.md Outdated Show resolved Hide resolved
@BeagleGaming1 BeagleGaming1 marked this pull request as draft October 12, 2023 20:32
@mullenpaul mullenpaul marked this pull request as ready for review October 16, 2023 16:06
@mullenpaul mullenpaul marked this pull request as draft October 16, 2023 16:06
@mullenpaul
Copy link
Contributor Author

Code changes done but I need to check a few things before undrafting

code/datums/shuttles.dm Outdated Show resolved Hide resolved
code/modules/shuttle/computers/trijent_elevator_control.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttles/trijent_elevator.dm Outdated Show resolved Hide resolved
code/modules/shuttle/shuttles/trijent_elevator.dm Outdated Show resolved Hide resolved
@mullenpaul mullenpaul marked this pull request as ready for review October 22, 2023 11:09
@mullenpaul mullenpaul requested a review from fira as a code owner October 22, 2023 11:09
@mullenpaul mullenpaul added the Testmerge Candidate we'll test this while you're asleep and the server has 10 players label Oct 22, 2023
@mullenpaul
Copy link
Contributor Author

This is working on TM

@harryob harryob added this pull request to the merge queue Oct 30, 2023
Merged via the queue into cmss13-devs:master with commit bb09fa3 Oct 30, 2023
26 of 27 checks passed
cm13-github added a commit that referenced this pull request Oct 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mapping did you remember to save in tgm format? Refactor Make the code harder to read Testmerge Candidate we'll test this while you're asleep and the server has 10 players
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants