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

Tycoon Request Consoles and Stormdrive Fix #2469

Merged
merged 16 commits into from
Jul 28, 2023

Conversation

SerynEngi
Copy link
Contributor

@SerynEngi SerynEngi commented Jul 5, 2023

About The Pull Request

This PR adds request consoles to various places within the Tycoon. It also corrects a mapping issue where the request consoles were all drawing from the engineering budget. Lastly, it fixes the piping and wiring near the Stormdrive on this vessel.

Why It's Good For The Game

Fix man good. Depleted engineering budget bad.

Testing Photographs and Procedure

Souldrive BeforeAfter

Changelog

🆑
add: Added request consoles to various locations within Medical, Munitions, and Engineering on the Tycoon
fix: Corrected atmos and power connection near the Stormdrive on the Tycoon
fix: Corrected department budget draw for request consoles on the Tycoon
/:cl:

@SerynEngi SerynEngi requested a review from a team as a code owner July 5, 2023 19:00
@github-actions
Copy link

github-actions bot commented Jul 7, 2023

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

Bokkiewokkie
Bokkiewokkie previously approved these changes Jul 7, 2023
@SerynEngi SerynEngi changed the title Tycoon Request Consoles Tycoon Request Consoles and Souldrive Fix Jul 10, 2023
@Karmic-Skink Karmic-Skink changed the title Tycoon Request Consoles and Souldrive Fix Tycoon Request Consoles and Stormdrive Fix Jul 10, 2023
@Karmic-Skink
Copy link
Contributor

Karmic-Skink commented Jul 10, 2023

Just don't.

Edit: This banter.

@covertcorvid
Copy link
Member

Just don't.

I requested this fix because the room is supposed to have connected power and air and got broken during the FTL rework

@SerynEngi
Copy link
Contributor Author

Just don't.

I requested this fix because the room is supposed to have connected power and air and got broken during the FTL rework

No, in this case, he's actually in the right here. I internally think of that particular stormdrive as the Souldrive because of its decoration (and was corrected, as I legitimately thought it was called that), and he is correct that it should not be called the souldrive in the PR.

@Bokkiewokkie Bokkiewokkie merged commit 343cb28 into BeeStation:master Jul 28, 2023
@SerynEngi SerynEngi deleted the TycoonRequest branch August 1, 2023 03:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants