Upstream Cherrypick + Tweaks: Weapon Loadouts#26
Open
Inkbeanjo wants to merge 7 commits intoTheDenSS14:masterfrom
Open
Upstream Cherrypick + Tweaks: Weapon Loadouts#26Inkbeanjo wants to merge 7 commits intoTheDenSS14:masterfrom
Inkbeanjo wants to merge 7 commits intoTheDenSS14:masterfrom
Conversation
…asic firearms, adjusted and changed mercenary loadout options, removal of .40 ammo damnation doesn't have yet, price tweaks, & addition of new surplus weapon options in merc vend.
…ed for wt-550 surplus
github-actions
bot
added
size/M
S: Untriaged
S: Needs Review
YML
FTL
No C#
and removed
S: Untriaged
S: Needs Review
labels
Contributor
|
I will merge this after the next upstream merge. |
Contributor
Author
hell yeah! no pressure and no stress, i can poke around and fix whatever if something hiccups uwub |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
About the PR
Pull from upstream Aurora, with a twist™. Adds longarm, sidearm, and ammunition options to contractor, pilot, and mercenary roles which are placed in-hand or in the player's bag on spawning.
Additionally added three new surplus firearms to the mercenary vend, from existing sprite and entity resources already present in the _AS namespace- a surplus WT-550, Atreides, and Soland-Moss, along with magazine bundles for the 550.
Why / Balance
PR is good QoL, original array of firearms offered did not reflect the standard mercenaries on average actively use on damnation; modified the array of options to better reflect people's interests/free time, and expanded the mercenary vend as it is currently in need of some love. Can't really justify further changing it in this PR, so this's just what i can do before the next one.
Technical details
i love lists, they're like long paper things damn wish there was a word for that (its literally just shuffling entities and adjusting prices to match vend standards)
How to test
load devbox, play dressup with loadouts and select gun(s)- see them in your hand, know that god can feel fear. also check the merc vend i guess
Requirements
Breaking changes
N/A
Changelog
🆑