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

Nanotrasen Harrier-class Exploration Cruiser #3185

Merged
merged 64 commits into from
Oct 5, 2024

Conversation

Apogee-dev
Copy link
Contributor

@Apogee-dev Apogee-dev commented Jul 6, 2024

About The Pull Request

harrier
harrier_areas

Originally an advanced ICW-era command cruiser, the surviving Harriers have been refurbished as exploration and "reclamation" ships in the post-ICW era. Large, well-rounded, and boasting excellent crew accomodations, Harriers are exceedingly popular with Nanotrasen crews in spite of their lack of specialized equipment.

Replaces both the Osprey and the Skipper with the Harrier, filling roughly the same role. Key features:

  • Internal Affairs office
  • Security office with working brig
  • Dedicated AI core
  • Working mail and disposals system
  • A fancy atrium
  • The sector's biggest cafeteria

Hopefully this irons out some of the more common issues with the Osprey and makes for a more well-rounded and enjoyable ship that actually gives Nanotrasen security slots for once.

Why It's Good For The Game

Osprey is crungled and Skipper competes for niche space. Harrier should do better than either, with more polish and faction flavor.

Changelog

🆑
add: Added Nanotrasen Harrier-class cruiser
del: Removed Osprey-class cruiser
del: Removed Skipper-class cruiser
/:cl:

@github-actions github-actions bot added Map Change Tile placing is hard. Thank you for your service. Code change Watch something violently break. labels Jul 6, 2024
@thgvr thgvr added the Ship Ship successfully tested. label Jul 12, 2024
@Apogee-dev Apogee-dev marked this pull request as ready for review August 31, 2024 01:50
@Apogee-dev Apogee-dev requested a review from a team as a code owner August 31, 2024 01:50
Copy link
Contributor

github-actions bot commented Sep 9, 2024

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

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 14, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 23, 2024
Copy link
Contributor

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

@Thera-Pissed
Copy link
Contributor

could you put an atmos analyzer in the atmos tech's locker or somewhere in that room? Techs dont get one roundstart and there's no blue toolboxes

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 26, 2024
@Apogee-dev
Copy link
Contributor Author

Apogee-dev commented Sep 26, 2024

alright, issues should be fixed. please can another maptainer review or just merge it man it's been five months and i'm tired

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 29, 2024
Copy link
Contributor

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

Copy link
Contributor

@meemofcourse meemofcourse left a comment

Choose a reason for hiding this comment

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

fix conflicts and i think we can marg

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 5, 2024
@meemofcourse meemofcourse added this pull request to the merge queue Oct 5, 2024
Merged via the queue into shiptest-ss13:master with commit 9677097 Oct 5, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Oct 6, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![harrier](https://github.com/user-attachments/assets/34ba8038-b64e-4da9-be85-a448e1d71262)

![harrier_areas](https://github.com/user-attachments/assets/c777f96d-b8b5-484e-910b-53b81a4aaeb5)

_Originally an advanced ICW-era command cruiser, the surviving Harriers
have been refurbished as exploration and "reclamation" ships in the
post-ICW era. Large, well-rounded, and boasting excellent crew
accomodations, Harriers are exceedingly popular with Nanotrasen crews in
spite of their lack of specialized equipment._

Replaces both the Osprey and the Skipper with the Harrier, filling
roughly the same role. Key features:
- Internal Affairs office
- Security office with working brig
- Dedicated AI core
- Working mail and disposals system
- A fancy atrium
- The sector's biggest cafeteria

Hopefully this irons out some of the more common issues with the Osprey
and makes for a more well-rounded and enjoyable ship that _actually
gives Nanotrasen security slots for once._

## Why It's Good For The Game

Osprey is crungled and Skipper competes for niche space. Harrier should
do better than either, with more polish and faction flavor.

## Changelog

:cl:
add: Added Nanotrasen Harrier-class cruiser
del: Removed Osprey-class cruiser
del: Removed Skipper-class cruiser
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. Map Change Tile placing is hard. Thank you for your service. Ship Ship successfully tested.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants