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.

Sign up for GitHub

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

Jump to bottom

Omakase (New Shuttle) #2002

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Omakase (New Shuttle) #2002

wants to merge 30 commits into from
+10,141 −4

Conversation

AF-Buyrcsp2
Copy link
Contributor

About the PR

Adds the SSS Omakase, a high-end japanese-style restaurant ship.

Why / Balance

The name Omakase means "Chef's Choice" in Japanese.

Notable Features

  • Huge seating area that can fit up to 28 diners
  • A stage for a musician to perform (or a jukebox for when there is no one)
  • A huge kitchen separated to 2 workstation for 2 chefs to compensate for high seating.
  • Small maintenance areas hosting EVA access and Disposals

Shuttle Specifications

  • 1 S.U.P.E.R.P.A.C.M.A.N. Generator
  • 1 Gyroscope
  • 8 Thrusters, 2 for each direction

How to test

Buy at Shipyard Console

Media

uninitialized
Screenshot 2024-09-13 184726
initialized
Screenshot 2024-09-13 185001

Requirements

  • I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑 Amfai/Buyrcsp2

  • add: Added the SSS Omakaze

@github-actions github-actions bot added Docs Improvements or additions to documentation Map-Shuttle Map - Shuttle No C# Sprites FTL labels Sep 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 13, 2024 •
edited
Loading

RSI Diff Bot; head commit 8b797e1 merging into 396a460
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi

State Old New Status
omakase Added

Edit: diff updated after 8b797e1

@AF-Buyrcsp2 AF-Buyrcsp2 changed the title initial SSS Okamase (NEW) Sep 13, 2024
@AF-Buyrcsp2 AF-Buyrcsp2 marked this pull request as ready for review September 13, 2024 13:21
@AF-Buyrcsp2
Copy link
Contributor Author

hmmm deed issue, what did i miss...

@AF-Buyrcsp2 AF-Buyrcsp2 changed the title SSS Okamase (NEW) SSS Omakase (NEW) Sep 27, 2024
@github-actions 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 S: Merge Conflict This PR has conflicts that prevent merging label Sep 30, 2024
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Sep 30, 2024
@AF-Buyrcsp2
Copy link
Contributor Author

removed the invalid network link, hopefully it is fixed

@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Oct 13, 2024
@github-actions 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 removed the S: Merge Conflict This PR has conflicts that prevent merging label Oct 16, 2024
@Cheackraze
Copy link
Member

test fails are unrelated to this PR it appears.

Cheackraze
Cheackraze requested changes Dec 9, 2024
View reviewed changes
Copy link
Member

@Cheackraze Cheackraze left a comment

Choose a reason for hiding this comment

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

omit the changes to your launch config files, and we'll get this merged

.vscode/launch.json Show resolved Hide resolved
@AF-Buyrcsp2
Copy link
Contributor Author

fix is up beep beep

@MagnusCrowe
Copy link
Contributor

MagnusCrowe commented Dec 16, 2024 •
edited
Loading

I just had a look through the restaurant and I have the following to say:

  1. The map has too many lights, many of which are redundant and cause the ship to be very bright. Maints and the freezer are particularly bad.
  2. The map is very well decorated and I love the aesthetic.
  3. The walkway/sitting area at the top of the ship has no atmos vents or scrubbers.

Overall, the ship seems about ready to merge once the number of lights is reduced. I've noticed a lot of the lights seem to be present for the sake of symmetry and it does not need to be that way.

Original:
image
Suggested:
image
If you think this is a little dark in the dining room, I can also recommend that you put a box or two of candles in there somewhere and put out something like this when you get customers....for the atmosphere.
image
image

@MagnusCrowe
Copy link
Contributor

A couple other things I forgot to mention.

The ship is rather large for a single nitrogen tank. I recommend pushing things around in the engineering area so you can do something like this...
image
You can put the gyroscope outboard if you can't find a better place for it.
image
Also, consider placing some sort of floor indicator to let noobs know which canister goes where...
image
It doesn't have to look like this but something to get the point across.

The last thing is, I found it weird that there were so many seats in the restaurant but no bathrooms...Now, I like the sitting area in the top of the ship but perhaps some of that space could be used for some toilets. If that doesn't work, perhaps a little build out in the ship's armpits on either side would work.
image

@AF-Buyrcsp2
Copy link
Contributor Author

AF-Buyrcsp2 commented Dec 17, 2024 •
edited
Loading

Changes:

  • Updates Price to 91000 Spesos
  • Added Restroom
  • Added "Emergency Bunker"
  • Uses 2 Nitrogen Tank Connector for Distro
  • Gyroscope moved to EVA
  • Added Air Vents and Scrubber to Walkway
  • Design Change:
    image
    image

@MagnusCrowe
Copy link
Contributor

Something I forgot to mention, the ship takes like 5 or 6 seconds to load after buying, other ships show up immediately...that will need to be investigated.

@AF-Buyrcsp2
Copy link
Contributor Author

could be the new engine classification which when the shuttle was first made, didnt exist.

@AF-Buyrcsp2
Copy link
Contributor Author

or just that illegal airlock

@AF-Buyrcsp2
Copy link
Contributor Author

this investigation also made me realise the becomesstation component dissappeared, might or might not be the cause.

@AF-Buyrcsp2
Copy link
Contributor Author

sorry, it does have the component but default id of 1

@AF-Buyrcsp2
Fixed BecomesStation Component, removed rotation from docking airlock…
673f674 
…s (to be safe), added engine classification, updated guidebook map
@AF-Buyrcsp2
Copy link
Contributor Author

the shuttle now loads at a comparatively faster rate, faster compared to mccargo. (i forgot to do a baseline test) please confirm

@MagnusCrowe
Copy link
Contributor

the shuttle now loads at a comparatively faster rate, faster compared to mccargo. (i forgot to do a baseline test) please confirm

Seems like you fixed it. Good job.

@AF-Buyrcsp2
Copy link
Contributor Author

separated copyright meta.json to new line

@AF-Buyrcsp2
Copy link
Contributor Author

fuck wait i used the old one

@AF-Buyrcsp2
Copy link
Contributor Author

fixed

@AF-Buyrcsp2
Copy link
Contributor Author

oops look like i broke things

@AF-Buyrcsp2
Copy link
Contributor Author

how the hell does a comma break so many checks

@dvir001 dvir001 added the Ship Contribution Freeze In effect from 2024-10-14 'til it ends, see https://discord.com/channels/1123826877245694004/1129270 label Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arimah arimah Awaiting requested review from arimah

@MagnusCrowe MagnusCrowe Awaiting requested review from MagnusCrowe

@Cheackraze Cheackraze Awaiting requested review from Cheackraze

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Docs Improvements or additions to documentation FTL Map-Shuttle Map - Shuttle No C# S: Needs Review This PR is awaiting reviews Ship Contribution Freeze In effect from 2024-10-14 'til it ends, see https://discord.com/channels/1123826877245694004/1129270 Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@AF-Buyrcsp2 @Cheackraze @arimah @dustylens @MagnusCrowe @dvir001 @whatston3 @ErhardSteinhauer