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

Caduceus as mothership #823

Merged

Conversation

Mnemotechnician
Copy link
Contributor

About the PR

Adds a mothership console to the Caduceus, offering such small ships as the mailtruck, the pulse and the searchlight.

Before this can be merged, #808 must be merged first. The branch I was working on contains commits from there.

Why / Balance

Caduceus is a big and not very maneuverable ship that's not very fitted for emergency responses. It's better to have a medical fleet of a caduceus as a hospital and a pulse/searchlight as a ship to carry wounded people. Adding a shipyard console to the caduceus makes it easier for it to fulfill the job of a mothership.

Technical details

Yml changes, still requires #808 to be merged.

Media

https://cdn.discordapp.com/attachments/732665247302942730/1192126411096457306/waaaaaaaaaaaaa.mp4?ex=65a7f13d&is=65957c3d&hm=12e481ebbf14733b6c7abd73dcc40dd6c11aa078e8ffd489fc625523d980a473&

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

None

Changelog
🆑

  • add: Added a mothership console to the Caduceus, offering small medical ships.

@github-actions github-actions bot added Map-Shuttle Map - Shuttle YML C# UI Merge Conflict This PR has conflicts that prevent merging labels Jan 3, 2024
Copy link
Contributor

github-actions bot commented Jan 7, 2024

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

@Mnemotechnician Mnemotechnician marked this pull request as ready for review January 7, 2024 21:14
@github-actions github-actions bot added No C# and removed Merge Conflict This PR has conflicts that prevent merging Map-Shuttle Map - Shuttle C# UI labels Jan 7, 2024
@Mnemotechnician
Copy link
Contributor Author

Okay I think it should be good now. I don't wanna bother rewriting the commit history of this branch and force-pushing since PRs are squash-merged anyway.

@Mnemotechnician
Copy link
Contributor Author

Mnemotechnician commented Jan 7, 2024

Mapchecker seems to scream at me because the sec shuttles contain "illegal" sec-only stuff while having the "None" group. Nothing I can do here.

@dvir001
Copy link
Contributor

dvir001 commented Jan 13, 2024

Mapchecker seems to scream at me because the sec shuttles contain "illegal" sec-only stuff while having the "None" group. Nothing I can do here.

I rerun the test, going to see if its fine now and test this in game after.

@dvir001
Copy link
Contributor

dvir001 commented Jan 13, 2024

Can you update this with master to see if the error goes away?

@github-actions github-actions bot added the Map-Shuttle Map - Shuttle label Jan 14, 2024
@dvir001 dvir001 self-requested a review January 14, 2024 01:09
Copy link
Contributor

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

Resources/Textures/_NF/Structures/Machines/computers.rsi

State Old New Status
computer_medical Added
shipyard_medical Added

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Jan 14, 2024
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

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

Working as expected

image

@dvir001 dvir001 merged commit b85cb9f into new-frontiers-14:master Jan 14, 2024
13 of 14 checks passed
FrontierATC added a commit that referenced this pull request Jan 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Map-Shuttle Map - Shuttle No C# Sprites Status: Needs Review This PR is awaiting reviews YML
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants