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

E40 Changes (.299 cargo and firerate) #3502

Merged
merged 6 commits into from
Oct 18, 2024

Conversation

generalthrax
Copy link
Contributor

About The Pull Request

Brings up the E40 ballistic mode firerate by a fair amount to compensate for the significantly lower damage. Experimenting, mostly. Takes the .299 Caseless box out of the black market and adds it to cargo. Fixes a typo that said it held 75 rounds when it actually held 120. You're gonna need that ammo, it guzzles.

Why It's Good For The Game

E40 is a Big, Big purchase if you don't already have it and the Raleigh starts with the rifle and needs to Gamble in order to get more ammo. Should make it the legendary, expensive weapon it is And make both components Actually Usable.

Changelog

🆑
balance: E40 hybrid rifle ballistic mode now shoots faster
balance: .299 Caseless taken out of the black market, added to cargo
fix: .299 Caseless now correctly states it holds 120 rounds
/:cl:

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

github-actions bot commented Oct 8, 2024

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

@github-actions github-actions bot added the Code change Watch something violently break. label Oct 8, 2024
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Oct 8, 2024
@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 9, 2024

I have concerns here regarding the Raleigh. Part of the reason the Raleigh actually gets an E40 when no other ship gets an assault rifle of any description is actually because of the lower peak damage output than a normal AR. If the damage output gets buffed it might end up too strong to just give somebody. I think the flexibility of being able to swap between laser and ballistic damage as needed makes up for lower peak dps.

@DIB-DOG
Copy link
Contributor

DIB-DOG commented Oct 9, 2024

I may be wrong, but doesn’t the Atlas class start with an assault rifle?

Still not fullmerged ofc, but just for sake of argument.

@Apogee-dev
Copy link
Contributor

Apogee-dev commented Oct 9, 2024

I may be wrong, but doesn’t the Atlas class start with an assault rifle?

Still not fullmerged ofc, but just for sake of argument.

true actually, they do get one CM-82.... but the atlas is also an actual military ship. and i don't think the E40 is weaker than a ballistic assault rifle anyway, it's much more flexible at the cost of having slightly less dps. the dps is the reason i put ARs right on the cusp of acceptability for a normal ship.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Oct 12, 2024
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 Merge Conflict Use Git Hooks, you're welcome. label Oct 13, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

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

good code wise, probably doesn't need a tm.

@FalloutFalcon FalloutFalcon added this pull request to the merge queue Oct 18, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 18, 2024
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Oct 18, 2024
github-merge-queue bot pushed a commit that referenced this pull request Oct 18, 2024
## About The Pull Request

Brings up the E40 ballistic mode firerate by a fair amount to compensate
for the significantly lower damage. Experimenting, mostly. Takes the
.299 Caseless box out of the black market and adds it to cargo. Fixes a
typo that said it held 75 rounds when it actually held 120. You're gonna
need that ammo, it guzzles.

## Why It's Good For The Game

E40 is a Big, Big purchase if you don't already have it and the Raleigh
starts with the rifle and needs to Gamble in order to get more ammo.
Should make it the legendary, expensive weapon it is And make both
components Actually Usable.

## Changelog

:cl:
balance: E40 hybrid rifle ballistic mode now shoots faster
balance: .299 Caseless taken out of the black market, added to cargo
fix: .299 Caseless now correctly states it holds 120 rounds
/:cl:

---------

Signed-off-by: generalthrax <[email protected]>
Merged via the queue into shiptest-ss13:master with commit 1a71631 Oct 18, 2024
14 checks passed
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
## About The Pull Request

Brings up the E40 ballistic mode firerate by a fair amount to compensate
for the significantly lower damage. Experimenting, mostly. Takes the
.299 Caseless box out of the black market and adds it to cargo. Fixes a
typo that said it held 75 rounds when it actually held 120. You're gonna
need that ammo, it guzzles.

## Why It's Good For The Game

E40 is a Big, Big purchase if you don't already have it and the Raleigh
starts with the rifle and needs to Gamble in order to get more ammo.
Should make it the legendary, expensive weapon it is And make both
components Actually Usable.

## Changelog

:cl:
balance: E40 hybrid rifle ballistic mode now shoots faster
balance: .299 Caseless taken out of the black market, added to cargo
fix: .299 Caseless now correctly states it holds 120 rounds
/:cl:

---------

Signed-off-by: generalthrax <[email protected]>
zimon9 pushed a commit to zimon9/Shiptest-PR-testing that referenced this pull request Oct 29, 2024
MrCat15352 pushed a commit to MrCat15352/MrCat that referenced this pull request Dec 27, 2024
## About The Pull Request

Brings up the E40 ballistic mode firerate by a fair amount to compensate
for the significantly lower damage. Experimenting, mostly. Takes the
.299 Caseless box out of the black market and adds it to cargo. Fixes a
typo that said it held 75 rounds when it actually held 120. You're gonna
need that ammo, it guzzles.

## Why It's Good For The Game

E40 is a Big, Big purchase if you don't already have it and the Raleigh
starts with the rifle and needs to Gamble in order to get more ammo.
Should make it the legendary, expensive weapon it is And make both
components Actually Usable.

## Changelog

:cl:
balance: E40 hybrid rifle ballistic mode now shoots faster
balance: .299 Caseless taken out of the black market, added to cargo
fix: .299 Caseless now correctly states it holds 120 rounds
/:cl:

---------

Signed-off-by: generalthrax <[email protected]>
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants