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

EVAC Shuttles Update #11584

Merged
merged 15 commits into from
Sep 28, 2024
Merged

Conversation

MarkusLarsson421
Copy link
Contributor

@MarkusLarsson421 MarkusLarsson421 commented Sep 27, 2024

About The Pull Request

Added cameras, holopads, extinguishers, foam dispensers, intercoms, news casters and so on to a bunch of shuttles! Most details are in the CL.

Also changes the floors, decals and whatnot to look more modern and have some more details.

Why It's Good For The Game

Looks good, works better and is an overall improvement.

Testing Photographs and Procedure

Screenshots&Videos A few of the many changed shuttles.

image

image

image

Fire alarm also works, all the windows all have their own firelock window shutter too.

image

Changelog

🆑
balance: [Box, Meta, Asteroid, Bar, Birdboat, Delta, Tiny] Added cameras, holopads, extinguishers, fire window shutters, and functioning fire alarms to EVAC shuttles.
balance: [Box, Meta, Asteroid, Bar, Birdboat, Delta, Tiny] Added fire alarm to the cockpit.
add: [Box, Meta, Asteroid, Bar, Birdboat, Delta, Tiny] Added intercoms and news casters.
fix: [Meta] Fixed windows on Meta EVAC shuttle.
del: [Box, Meta] Removes defibs due to it being an undocumented change in a recent PR.
tweak: [Box, Meta, Asteroid, Bar, Birdboat, Delta, Tiny] Tweaked decals and floors.
/:cl:

@MarkusLarsson421
Copy link
Contributor Author

Thought this was adorable. :D

image

@Fronsis
Copy link

Fronsis commented Sep 27, 2024

del: [Box, Meta] Removed free defib from EVAC shuttles.

You're adding a lot of QoL stuff to the shuttles, yet you remove one of the most basic ones?? There has been countless times where people couldn't be revived because no one brought the fixed defib or compact defib from medbay and nowadays most shuttles have been modernized with a bunch of different stuff, a defibrilator is basic and it's very annoying to be a doctor or patient and fail to revive because of the lack of a defib.

@MarkusLarsson421
Copy link
Contributor Author

Don't forget the defib.

@Fronsis
Copy link

Fronsis commented Sep 27, 2024

Don't forget the defib.

Doesn't makes sense, you're adding a lot of stuff that are basically ''Hug box'' for the shuttles, fair enough Centcom likes to ensure the crew have all the comodities for their shuttles, yet something as basic that's present everywhere IRL is not present on the shuttle of a futuristic space station?

@Fronsis
Copy link

Fronsis commented Sep 27, 2024

By the way, just in case you didn't realize it Box and Meta had Shuttle changes merged yesterday made by @ClownMoff on #11189

@MarkusLarsson421
Copy link
Contributor Author

Doesn't makes sense, you're adding a lot of stuff that are basically ''Hug box'' for the shuttles,

Not really... Intercoms, news casters, and holopads aren't THAT useful. Cameras, sure. Either way, this is a balance change that wasn't addressed by that PR when it should've. It isn't that hard to bring a defib, especially when you can carry it around your waist mid to late-game. Other paid shuttles tend to include a free defib.

@MarkusLarsson421
Copy link
Contributor Author

By the way, just in case you didn't realize it Box and Meta had Shuttle changes merged yesterday made by @ClownMoff on #11189

They do look great!

@Fronsis
Copy link

Fronsis commented Sep 27, 2024

Doesn't makes sense, you're adding a lot of stuff that are basically ''Hug box'' for the shuttles,

Not really... Intercoms, news casters, and holopads aren't THAT useful. Cameras, sure. Either way, this is a balance change that wasn't addressed by that PR when it should've. It isn't that hard to bring a defib, especially when you can carry it around your waist mid to late-game. Other paid shuttles tend to include a free defib.

Foam dispensers everywhere, cameras for the AI(i believe there was a reason that AI wasn't supposed to see inside but that might've changed. the discussion i remember was from years ago), firealarm ¿? (Corg library shuttle is the perfect example of firelocks being a pain in the ass for a Shuttle) and window shutters. Not to mention they have an impact on what an antagonist can do on a shuttle.

It's not hard to bring a defib you're right, however not all shifts go as planned and if you follow the basic idea of medbay's shuttles section(they have surgery tools, medicine and some others have more advanced machinery) i see no reason why you would exclude the defibs, like i said, i've seen countless times situations where people was unable to be revived because of the lack of a defib and it suck both for the doctor who spent time trying to save someone and the dead peson waiting to see if they'll make it home alive or not. and boiling it down to ''just bring a defib next time xd'' is.. not cool.

@Rukofamicom Rukofamicom added the Balance Approved The balance of this PR has been approved label Sep 27, 2024
@Rukofamicom
Copy link
Contributor

This just needs mapping approval.

@Rukofamicom
Copy link
Contributor

It's not hard to bring a defib

This is going to be reverted due to being undocumented in the original PR as a matter of principle. The defib should have been disclosed and discussed in the original PR.

@PowerfulBacon
Copy link
Member

The shuttles don't need foam dispensors, since they aren't an area the AI is intended to manage.

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.

These look very good overall

@Rukofamicom Rukofamicom added this pull request to the merge queue Sep 28, 2024
Merged via the queue into BeeStation:master with commit b161b73 Sep 28, 2024
21 checks passed
@MarkusLarsson421 MarkusLarsson421 deleted the shuttle-fixes branch September 28, 2024 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants