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

Twink Tweaks: The Second #2536

Merged
merged 32 commits into from
Feb 11, 2024
Merged

Twink Tweaks: The Second #2536

merged 32 commits into from
Feb 11, 2024

Conversation

meemofcourse
Copy link
Contributor

@meemofcourse meemofcourse commented Nov 28, 2023

About The Pull Request

imagen
Updates the armory, cryogenics, bar, bridge, and the equipment of the Twinkleshine. Eliminates the vendor and voucher system in favor of a more controlled stockpile by the Lieutenant. Crew now spawn in with barely any equipment, excluding the voicechanger mask, which now works (for real trust me), with some other stuff there and there. The Captain is now a Flotilla Admiral, to reflect the importance of a Twinkleshine. Adds the Redshield Officer.

Why It's Good For The Game

I should be making ruins.

Changelog

🆑
add: Syndicate Cryopod.
tweak: The Twinkleshine has gotten a facelift.
tweak: The Syndicate has started assigning Flotilla Admirals and Redshield Officers to Twinkleshines.
tweak: Crew on the Twinkleshine now have to get their stuff from their lockers.
tweak: Modified the starting text to reflect the lack of telecomms on most ships.
fix: Access on the Twinkleshine.
fix: Syndicate jobs should show up properly on SecHUDs.
/:cl:

@meemofcourse meemofcourse requested a review from a team as a code owner November 28, 2023 18:47
@keywordlabeler keywordlabeler bot added the Tweak label Nov 28, 2023
@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Nov 28, 2023
Copy link
Contributor

github-actions bot commented Dec 6, 2023

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 Dec 6, 2023
@github-actions github-actions bot added Merge Conflict Use Git Hooks, you're welcome. and removed Merge Conflict Use Git Hooks, you're welcome. labels Dec 6, 2023
Copy link
Contributor

github-actions bot commented Dec 6, 2023

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 Dec 8, 2023
@Admiral-Gigaton
Copy link

thank god this isnt player spawnable, a dark gygax? nuke op gear? this the shit that gets pirates to SLAM the server

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 Jan 17, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 3, 2024
@goober3
Copy link
Member

goober3 commented Feb 7, 2024

meemofcourse commented on Nov 28, 2023

i love not doing my job!

Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

f8c0fd5db9ddafbc2070c2e52c5b4452
some minor scale issues. the bar / kitchen area itself could probably stand to be a tile higher, given the scale of this ship. maybe lose the staircase, too, for extra walking space. give them a table or two as well, if it'd fit.

dfd5ce79bc1328ff7f1116701c096457
this is a minor nitpick but the scrubber and vent arent aesthetically pleasing and i will kill you if you dont fix it.

e4ebf1e6a18029812d0b4307632053b1
more scale issues. move the desk to the left one tile, and move the photocopier elsewhere to make space for the suit storage unit. maybe also remove the windoors on the inner-section of the office so the lieutenant doesn't have to open a window to access their laptop.

9ff11e6d1316bc0de688aaeb5a8f2d6a
you could probably stand to lose these jutty-out bits on both sides. makes the outline more consistent.

34ea378897ce4708911fa8f0043f829a
consider spicing up these aft-areas with things like catwalks, techfloors, and the such. monofloor plating engine rooms are evil and i think we should kill them all.

2c6c57946820e066aa8b1faabdaa8c0b
spline jumpscare under the armory door.

@meemofcourse meemofcourse requested a review from goober3 February 7, 2024 17:57
Copy link
Member

@Latentish Latentish left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looked at this in round, I think this is basically good to merge

Copy link
Member

@goober3 goober3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi. this looks good. just some minor gripes before we hit merge.
19020fc5cfadeedfff6c033442ce625d
re-arrange the seating here, slightly. the table blocking the door isnt very aesthetically pleasing.
b66579d0a2df77f5e01e25febecadd7a
i'm not sure these grey tiles meld very well with the rest of the ship. try something else here.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 11, 2024
Copy link
Contributor

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

@goober3
Copy link
Member

goober3 commented Feb 11, 2024

fix your conflicts and we can hit merge, i think.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 11, 2024
@Latentish Latentish added this pull request to the merge queue Feb 11, 2024
Merged via the queue into shiptest-ss13:master with commit 95d80ef Feb 11, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Feb 12, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

![imagen](https://github.com/shiptest-ss13/Shiptest/assets/75212565/e0558629-b3e4-46d7-9695-dafe63a62a06)
Updates the armory, cryogenics, bar, bridge, and the equipment of the
Twinkleshine. Eliminates the vendor and voucher system in favor of a
more controlled stockpile by the Lieutenant. Crew now spawn in with
barely any equipment, excluding the voicechanger mask, which now works
(for real trust me), with some other stuff there and there. The Captain
is now a Flotilla Admiral, to reflect the importance of a Twinkleshine.
Adds the Redshield Officer.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
I should be making ruins.

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl:
add: Syndicate Cryopod.
tweak: The Twinkleshine has gotten a facelift.
tweak: The Syndicate has started assigning Flotilla Admirals and
Redshield Officers to Twinkleshines.
tweak: Crew on the Twinkleshine now have to get their stuff from their
lockers.
tweak: Modified the starting text to reflect the lack of telecomms on
most ships.
fix: Access on the Twinkleshine.
fix: Syndicate jobs should show up properly on SecHUDs.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: meem <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Tweak
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants