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.

Sign up for GitHub

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

Jump to bottom

early merge of rebalanced salv weapon researching #2077

Merged
merged 9 commits into from
Dec 20, 2024
Merged

early merge of rebalanced salv weapon researching #2077

merged 9 commits into from
Dec 20, 2024

Conversation

deltanedas
Copy link
Member

About the PR

early merge of space-wizards/space-station-14#32398 due to 1 month ops

Changelog
🆑

  • tweak: Changed Salvage Weapons to be a tier 2 tech, Experimental Salvage Weaponry.
  • tweak: Crusher weapons are researchable again, PKA is roundstart.
  • add: Added the Fauna Protection Module for borgs, it has a PKA and crusher dagger.

@deltanedas deltanedas requested review from IamVelcroboy and a team as code owners October 31, 2024 15:24
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi and removed S: Needs Review labels Oct 31, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 31, 2024 •
edited
Loading

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

Resources/Textures/Interface/Actions/actions_borg.rsi

State Old New Status
fauna-module Added

Resources/Textures/Objects/Specific/Robotics/borgmodule.rsi

State Old New Status
icon-carp Added

Edit: diff updated after dd74a7a

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 7, 2024

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

@deltanedas
Merge branch 'master' into salv-weapon-ops
ddc1734 
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Nov 24, 2024
@deltanedas
Merge branch 'master' into salv-weapon-ops
12de408 
Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
@github-actions github-actions bot added size/M 64-255 lines and removed S: Merge Conflict Fix your PR! labels Nov 24, 2024
@deltanedas deltanedas requested review from a team as code owners December 17, 2024 04:52
@Lyndomen
Copy link
Contributor

Is this even relevant anymore

@deltanedas
Copy link
Member Author

yes borgs dont have pkas

@Lyndomen
Copy link
Contributor

ETA 24 hours on Direction review

@deltanedas deltanedas merged commit 9f39931 into DeltaV-Station:master Dec 20, 2024
16 checks passed
@deltanedas deltanedas deleted the salv-weapon-ops branch December 20, 2024 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Lyndomen Lyndomen Lyndomen approved these changes

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy

Assignees
No one assigned
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 size/M 64-255 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@deltanedas @Lyndomen