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

Cleanup of Shuttle Subsystem + General Housekeeping [MDB IGNORE] #227

Merged
merged 24 commits into from
Sep 24, 2021

Conversation

MarkSuckerberg
Copy link
Member

@MarkSuckerberg MarkSuckerberg commented Sep 3, 2021

About The Pull Request

Basically removes everything in the code related to the Emergency shuttle, as well as cleans up SSshuttle in general. I don't doubt this will break things so it should be tested thoroughly.

Also removes most non-shiptest shuttle map files and datums, as most are too small to even be considered for repurposing as a normal ship.

Most of the more trivial (relatively) changes are listed in the changelog.

Why It's Good For The Game

The emergency shuttle is unused and breaks certain things because it doesn't ever exist.

Changelog

🆑
admin: The call-shuttle and cancel-shuttle verbs have been replaced with initiate_jump and cancel_jump respectively.
admin: You can actually open check-antagonists again to delay the round \o/
del: Emergency shuttle code
del: Personal objectives. I am quite sure this was broken already anyways.
del: Lots of unrelated shuttle map files and templates.
del: A lot of antagonist objective code has been removed (as it didn't work at all already)
del: AIs can no longer randomly initiate a shuttle call
del: Normal cargo shuttle consoles have been removed, as they do not work. Express consoles remain.
del: The old and deprecated shuttle consoles have been removed as they do not work.
del: Bluespace gigabeacons have been removed since they do not work.
del: Emergency shuttle purchasing has been removed. Not that it worked at all anyways.
del: Removed unbuyable shuttle config for obvious reasons seen in the entry above.
tweak: Express cargo consoles no longer require you to unlock them.
tweak: Express cargo consoles' "cargo bay" option will now actually send pods to your current ship's cargo bay.
tweak: Export scanners no longer need to be "linked" to a cargo shuttle console.
tweak: Moved whiteship map files into the shiptest directory as they're normal ships now.
/:cl:

@keywordlabeler keywordlabeler bot added the Removal We hate fun. label Sep 3, 2021
@github-actions github-actions bot added Admin They do it for free. DME Edit Map Change Tile placing is hard. Thank you for your service. TGUI labels Sep 3, 2021
@MarkSuckerberg MarkSuckerberg marked this pull request as draft September 3, 2021 22:07
@ZephyrTFA ZephyrTFA self-assigned this Sep 3, 2021
@ZephyrTFA ZephyrTFA added Red Label This PR will not auto stale, this label should be green at all times. Stale Exempt Take your time. labels Sep 3, 2021
code/controllers/subsystem/shuttle.dm Show resolved Hide resolved
code/game/gamemodes/objective.dm Show resolved Hide resolved
code/game/machinery/computer/communications.dm Outdated Show resolved Hide resolved
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 4, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Sep 4, 2021

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 4, 2021
@github-actions github-actions bot added the Config Watch us shake head admins violently until this gets merged. label Sep 4, 2021
@MarkSuckerberg MarkSuckerberg changed the title Removes all emergency shuttle code Cleanup of Shuttle Subsystem + General Housekeeping Sep 5, 2021
@keywordlabeler keywordlabeler bot added the Tweak label Sep 5, 2021
@MarkSuckerberg
Copy link
Member Author

Updated changelog and PR description to better show all the changes this PR makes.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 6, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Sep 6, 2021

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 6, 2021
@ZephyrTFA ZephyrTFA added the Test Merge Candidate You do it for free. label Sep 7, 2021
@MarkSuckerberg
Copy link
Member Author

Conflicts with #108, waiting for that to be merged before this can get TM'd

@github-actions
Copy link
Contributor

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

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 19, 2021
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 19, 2021
@MarkSuckerberg MarkSuckerberg changed the title Cleanup of Shuttle Subsystem + General Housekeeping Cleanup of Shuttle Subsystem + General Housekeeping [MDB IGNORE] Sep 19, 2021
@MarkSuckerberg
Copy link
Member Author

LGTM

@MarkSuckerberg MarkSuckerberg merged commit a280641 into shiptest-ss13:master Sep 24, 2021
@ZephyrTFA ZephyrTFA removed the Test Merge Candidate You do it for free. label Sep 8, 2022
@ZephyrTFA ZephyrTFA removed the Stale Exempt Take your time. label Sep 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin They do it for free. Administration They're a janitor on a niche roleplaying atmospherics simulator. Config Watch us shake head admins violently until this gets merged. DME Edit Map Change Tile placing is hard. Thank you for your service. Red Label This PR will not auto stale, this label should be green at all times. Removal We hate fun. TGUI Tweak
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants