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

Comet Defib Update #2690

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

Conversation

dustylens
Copy link
Contributor

@dustylens dustylens commented Jan 12, 2025

About the PR

Ship owner: @Shodhans
Just tagging you to make sure you're aware there's proposed changes on your ship. I made a few changes that differentiate from the original layout so I want to make sure that you're comfortable with them.

"[7:37 PM]Recluse (Marty Sevenn): in that case yeah no worries at all, full speed ahead"

Original author says good to go. Always important!

Claire Vallis, I believe, over on Discord raised the flag of the Comet missing a defib. A discussion emerged regarding the AME over producing power and some other elements with the shuttle having a few pieces that could use some up to date passes.

Major changes:

  • Complete re-wire of the hull (again)
  • Complete replacement of the atmos system (again)
  • Replaces the AME power system with a dual super pacman system, which is much more closely aligned with the ship's power draw.

Secondary changes:

  • Rebuilt the power room to accommodate the new system.
  • Moved all gyroscopes to the interior of the shuttle.
  • Rebuilt the "suit" and atmos room to be a suit and "crew" space to take advantage of the real estate for some creature comforts.
  • Made a small shift to the tail section to allow for a smidgen more room. It remains a super duper top secret smuggling space.
    Tertiary changes:
  • Rebadged most spaces to accommodate shifts in space.
  • Added new lighting systems to accompany the blast doors.
  • Added door lock and engine shutoff controls as qol features.

Equipment changes:

  • Loose materials replaced with new material locker.
  • Various high end equipment lockers replaced with 3x salvage suit lockers and 1x QM suit locker.
  • Removed salvage vend and salvage drobe.
  • Added salvage and engineering techfab.
  • Added tank dispenser.
  • Moved various pieces around to fit into the new spaces.

Oh and also I added the requested defib.

If this PR seems acceptable I can submit an updated map for the guidebook as well.

Why / Balance

Defibs are good.

How to test

Buy the ship. Push the buttons.

Media

ss+(2025-01-11+at+07 21 36)
ss+(2025-01-11+at+07 21 26)

Requirements

Breaking changes

Changelog

🆑

  • tweak: Added defib to Comet along with some cosmetic and layout changes.

@github-actions github-actions bot added Map-Shuttle Map - Shuttle No C# labels Jan 12, 2025
@Jakumba
Copy link
Contributor

Jakumba commented Jan 28, 2025

Pulled it to have a walk around. There is a lot of love put into this revamp and it shows immediately. From small things like the attention and details put into the new crew living space, to the hazard lights that strobe when the cargo blast doors are open.

My only critical feedback would be that the light switch in the "smuggling area" wall does make it clear there is a fake wall there. I'm not sure how to fix this without compromising the smuggling areas aesthetic. Maybe just ditch the hidden door since most folks know it's there anyway, and leave it as a viewing deck? Unsure. Very minor point either way, and I can see myself using the Comet a lot with a crew in the future.

@dustylens
Copy link
Contributor Author

I feel you. Wall placement visibility remains a trial and an annoyance.

On one hand the Comet's smuggling deck is about as much of a secret as my user name. On the other hand, uh, yeah visuals are annoying.

Dang has it really been over half a month since I submitted this?

@Houtblokje
Copy link
Contributor

My only critical feedback would be that the light switch in the "smuggling area" wall does make it clear there is a fake wall there. I'm not sure how to fix this without compromising the smuggling areas aesthetic. Maybe just ditch the hidden door since most folks know it's there anyway, and leave it as a viewing deck? Unsure. Very minor point either way, and I can see myself using the Comet a lot with a crew in the future.

If you want to smuggle, just deconstruct the lightswitch?

@dustylens
Copy link
Contributor Author

If you want to smuggle don't buy a Comet.

Not that anyone will ever buy a Comet ever again.

Anyways the holopad is updated.

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 Jan 31, 2025
@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Feb 4, 2025
@whatston3
Copy link
Contributor

Ran through the merge conflict - things seem okay, but do give them another look when you can, and do map a black deck box instead of the deck of cards. Thanks!

@dustylens
Copy link
Contributor Author

Let's [DO NOT MAP] the inappropriate deck to prevent issues down the road?

@github-actions github-actions bot added the YML label Feb 4, 2025
@github-actions github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Feb 5, 2025
Copy link
Contributor

github-actions bot commented Feb 5, 2025

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

@whatston3
Copy link
Contributor

ha, cards

@github-actions github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Feb 5, 2025
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Took a look through this, seems good on the whole.

Wiring looks good, atmos setup makes sense to my eyes, nicely sectioned, devices seem linked well. There seem to be a lot of mapped gubbins on tables and the like, but with the exceptions of maybe the QM's locker and the materials locker (and even then, comparable to the CE locker/suit storage and loose materials mapped previously), nothing seems overtly questionable.

Ship looks nice, good decal work on the floors, and the buttons do some neat things.

Resources/Maps/_NF/Shuttles/comet.yml Outdated Show resolved Hide resolved
Resources/Maps/_NF/Shuttles/comet.yml Outdated Show resolved Hide resolved
Resources/Maps/_NF/Shuttles/comet.yml Outdated Show resolved Hide resolved
Resources/Maps/_NF/Shuttles/comet.yml Outdated Show resolved Hide resolved
dustylens and others added 4 commits February 8, 2025 04:32
Spin me right round

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
like a record

Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

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

Reapproving, requested changes made.

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.

5 participants