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

Arsenal tech overhaul #2104

Merged
merged 43 commits into from
Nov 7, 2024
Merged

Conversation

Stop-Signs
Copy link
Contributor

@Stop-Signs Stop-Signs commented Nov 3, 2024

About the PR

Merges some of the redundant techs, reduces the amount of content locked behind getting t3 arsenal. adjusts some pricing and moves the incendiary ammo and uranium ammo techs to tier 2.

Why / Balance

The 2 laser cannons being single item techs really wasnt doing sec any favors, neither was having the pdw and ik60 cost 20k combined. merging them with a slight price increase should overall be better for the game. moving the advanced munitions to t2 is kind of just where i thought they fit better, they are t1's that both cost a large amount of money, and they aren't exactly basic things for sec. Svallins being moved to t2 shouldn't cause many issues as the gun sucks and sec can just confiscate them(if needed I can move the recipe location, remove the tech alltogether, or move it back to t3) Basic shuttle armament is now a t1, but you have to get explosive tech and salv weaponry first. advanced shuttle armament is now a t2. hopefully with events involving shuttles coming soon, this will allow sec to be able to have those oh so fun shuttle battles. Advanced laser pistol is remaining a t3 for obvious reasons.

Technical details

Comments were left on everything (i hope) still working on that new t3, will update when I do.

Media

image

Requirements

Changelog

🆑

  • add: New Sec melee for epi to research!
  • tweak: Merged several arsenal techs to better fit the state of epi, as well as changing the tiering and prices.

Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
@github-actions github-actions bot added the Changes: YML Changes any yml files label Nov 3, 2024
Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
@Stop-Signs Stop-Signs marked this pull request as ready for review November 4, 2024 01:33
@Stop-Signs Stop-Signs requested review from IamVelcroboy and a team as code owners November 4, 2024 01:33
@Stop-Signs
Copy link
Contributor Author

why did it request velcro?? no offense

@Stop-Signs
Copy link
Contributor Author

i have a feeling that these errors are not fake :3

@MilonPL
Copy link
Member

MilonPL commented Nov 5, 2024

@IamVelcroboy for the love of all that is holy why did you submit this as 5 individual reviews

Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
@Stop-Signs
Copy link
Contributor Author

I HOPE that fixed it, we shall see

@IamVelcroboy
Copy link
Member

@IamVelcroboy for the love of all that is holy why did you submit this as 5 individual reviews

🤷‍♂️ I was on my phone, looking through the file changes

Signed-off-by: deltanedas <[email protected]>
deltanedas
deltanedas previously approved these changes Nov 6, 2024
Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

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

im happy codewise, just above

Copy link
Contributor

github-actions bot commented Nov 6, 2024

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

Resources/Prototypes/Research/arsenal.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Research/arsenal.yml Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 6, 2024
@Stop-Signs Stop-Signs requested a review from MilonPL November 6, 2024 23:38
@MilonPL MilonPL added S: Awaiting Changes Do not merge due to requested changes and removed S: Needs Review labels Nov 6, 2024
Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Research/arsenal.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Research/arsenal.yml Outdated Show resolved Hide resolved
Stop-Signs and others added 3 commits November 6, 2024 18:41
Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
@Stop-Signs Stop-Signs requested a review from MilonPL November 7, 2024 00:43
@github-actions github-actions bot added S: Needs Review and removed S: Awaiting Changes Do not merge due to requested changes labels Nov 7, 2024
Signed-off-by: Stop-Signs <[email protected]>
@Stop-Signs
Copy link
Contributor Author

ubuntu error is fake, this is ready to merge

Resources/Prototypes/Research/arsenal.yml Outdated Show resolved Hide resolved
Resources/Prototypes/DeltaV/Research/arsenal.yml Outdated Show resolved Hide resolved
Signed-off-by: Stop-Signs <[email protected]>
Signed-off-by: Stop-Signs <[email protected]>
@MilonPL MilonPL enabled auto-merge (squash) November 7, 2024 01:26
@MilonPL MilonPL merged commit 64078b8 into DeltaV-Station:master Nov 7, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants