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

Replaces the escape pod shuttle #11150

Merged
merged 17 commits into from
Aug 16, 2024

Conversation

spockye
Copy link
Member

@spockye spockye commented Jul 3, 2024

About The Pull Request

This PR replaces the current escape pod shuttle with the one i made for TG (its the shuttle you go to with the escape pods)
IMO the old one was a little outdated, and i've already replaced TG's with this one, so i might aswell port it over here aswell! (with changes fitting the codebase)

The new shuttles consists of:
a docking hallway
a main room, with a bar and medbay
a garden
a bridge
two engines!

it also adds capybaras!
you can purchase them for 10k credits at your nearest cargo console

Why It's Good For The Game

as i said earlier, i think the previous one is a little outdated, and this new one allows us to have a total of EIGHT escape pods for the larger stations (if one is made that deserves so many)

Testing Photographs and Procedure

Screenshots&Videos

New shuttle:
image

Pod Hallway:
image

Garden:
image

Main Room:
image

bridge:
image

Engine pod:
image

in editor:
image

Current Shuttle:
image

Capybara!
image
Capybara!

Changelog

🆑 Spockye
fix: Remakes the escape pod shuttle
add: Ports Capybaras from Shiptest
/:cl:

@spockye spockye requested a review from a team as a code owner July 3, 2024 20:35
@github-actions github-actions bot added the Mapping DMM Change label Jul 3, 2024
@MarkusLarsson421
Copy link
Contributor

Only looking at MapDiffBot2 here.

What is this? Is it meant to be an air tank? If so, use the actual air tank instead then.
image

Who's bed is this for? Just any pet?
image

Perhaps uneaten food at the bar to make it more inviting?
image

Perhaps a medbay-bar signs here? Along with Command and Engineering up above where appropriate.
image

I really like these windows. Also, no distro scrubber and vent in the engines.
image

The docking hallway feels a tad empty. Perhaps add in a turned off and unlocked janitor bot there? Similar to the ones found in Medbay. And perhaps an atmosbot in one of the two engines. If they risk taking unnecessary CPU power then you could leave them turned off by default.

Then an active medibot in Medbay.

I would avoid floorlights unless it is really necessary to have them. Although, this is on the CC-level so it might be "shrug whatever".
image

Perhaps add some picture frames to it too? In the docking hallway and or at the bar and garden.

I'd also probably flip the medbay so the entrance is closer to the door and the table-chair is less obstructive.

@spockye
Copy link
Member Author

spockye commented Jul 3, 2024

Oh shit i forgot the pet. Taking ideas for a pet

Only looking at MapDiffBot2 here.

What is this? Is it meant to be an air tank? If so, use the actual air tank instead then. image

Who's bed is this for? Just any pet? image

Perhaps uneaten food at the bar to make it more inviting? image

Perhaps a medbay-bar signs here? Along with Command and Engineering up above where appropriate. image

I really like these windows. Also, no distro scrubber and vent in the engines. image

The docking hallway feels a tad empty. Perhaps add in a turned off and unlocked janitor bot there? Similar to the ones found in Medbay. And perhaps an atmosbot in one of the two engines. If they risk taking unnecessary CPU power then you could leave them turned off by default.

Then an active medibot in Medbay.

I would avoid floorlights unless it is really necessary to have them. Although, this is on the CC-level so it might be "shrug whatever". image

Perhaps add some picture frames to it too? In the docking hallway and or at the bar and garden.

I'd also probably flip the medbay so the entrance is closer to the door and the table-chair is less obstructive.

@TsunamiAnt
Copy link
Contributor

pet should obviously be a xeno maid named spencer

@MarkusLarsson421
Copy link
Contributor

MarkusLarsson421 commented Jul 4, 2024

If you could make a drone pet, that'd be unique and cool.

Dibs on it also being found in Robotics.

@spockye
Copy link
Member Author

spockye commented Jul 4, 2024

Perhaps uneaten food at the bar to make it more inviting?

theres a box of donuts, and donk pockets for the hungry fools!

Pet will be added shortly!
Thanks for the review <3

spockye added 3 commits July 4, 2024 11:14
Medibot
More stuff in hallway
air tank
atmos in engine pods
@spockye
Copy link
Member Author

spockye commented Jul 4, 2024

Thats right folks. This PR now ports Capybaras from shiptest!
image

The capybara will serve as the mascot and emotional support for the Escape pod shuttle

@Fronsis
Copy link

Fronsis commented Jul 4, 2024

Speedmerge immediatly capybaras are here

@ClownMoff
Copy link
Contributor

Babe get in the vagina shaped shuttle

@PestoVerde322
Copy link
Contributor

The atmos loop is unnecessary since it's a roundend map.

immagine

Doesn't yield any error?

immagine

Not so sure if it should be this close to the map border.

@spockye
Copy link
Member Author

spockye commented Jul 4, 2024

Doesn't yield any error?

Nope!

thanks for the review <3

@MarkusLarsson421
Copy link
Contributor

Do add the pet to the Cargo order so it isn't too exclusive.

Copy link
Member

@PowerfulBacon PowerfulBacon left a comment

Choose a reason for hiding this comment

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

image

Why are there large palm trees inside a small space ship?

@spockye
Copy link
Member Author

spockye commented Jul 15, 2024

image

Why are there large palm trees inside a small space ship?

thought it was fitting (i dont imagine them being that huge, most likely just plastic props reaching the ceiling)

Copy link

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

@spockye spockye requested a review from PowerfulBacon July 25, 2024 19:08
@PowerfulBacon PowerfulBacon added this pull request to the merge queue Aug 16, 2024
Merged via the queue into BeeStation:master with commit be2a217 Aug 16, 2024
8 checks passed
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.

7 participants