-
Notifications
You must be signed in to change notification settings - Fork 196
Balance Part 2 the Impining #1767
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
Draft
juniwoofs
wants to merge
8
commits into
TheDenSS14:master
Choose a base branch
from
juniwoofs:balancepart2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Conversation
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
Contributor
|
RSI Diff Bot; head commit 3593538 merging into bde1bc6 Resources/Textures/_Impstation/Objects/Misc/conversionkit.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Boxes/light_pistol.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/mpistol_mag.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/zipper_mag.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/daitomag.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/nemesismag.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Ammunition/Magazine/blastermag.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/advblaster.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/autodisabler.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/blaster.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/blastercannon.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/clowndisabler.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/disablerderringer.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Battery/stunprojector.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Pistols/mk92hb.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Pistols/mk93.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Pistols/zipper.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Projectiles/disablerbolts.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Rifles/daito.rsi
Resources/Textures/_Impstation/Objects/Weapons/Guns/Rifles/nemesis.rsi
Resources/Textures/_Impstation/Objects/Weapons/Melee/funbaton.rsi
Resources/Textures/_Impstation/Objects/Weapons/Melee/stunbat.rsi
Resources/Textures/_Impstation/Objects/Weapons/Melee/stunbaton.rsi
Resources/Textures/_Impstation/Objects/Weapons/Melee/stunsabre.rsi
|
The Disablers Collection
* Energy Weapons Draft Having issues with the sprites on the Blaster Pistol and the Blaster Cannon. No idea what's going on after banging my head against the wall a bit. * Energy Weapons Part 2 the rest of the PR * Update meta.json sorry rsi * blaster pistol needs gold badly Another post-pull-request realization. The standard pistol should have the same gold cost as the magazine so you can't just print more pistols to bypass the gold cost for the magazine. * Laser Weapons Final (Actual) (1) (2) Adjustments to the OL-71 Laser Rifle. Now fires at 4.5 shots per second, deals 10 burn per shot, and has a 30-shot magazine. Brings it down more in-line. * minor whitespace edit * not sure why you commented out uranium but not draconic * tiny tweaksssssss --------- Co-authored-by: hivehum <[email protected]>
Contributor
|
a lot of items need adjusting in terms of contraband parents, namely, anything with BaseRestrictedContraband should be reparented accordingly |
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Changes: Audio
Changes: Localization
Changes: Sprite
Changes: YML
Status: Merge Conflict
This PR contains an unhandled merge conflict.
Status: Needs Review
This PR needs a review from a maintainer.
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
Importing of Imp balancing as decided by the direction team.
Also adds imp goodies to the syndie uplink and to security! (yes this is going to give some tuoys back)
Current List of Added PRS:
Why / Balance
It's far easier to switch to an already established system of balance that isn't as broken as EE's then to spend time balancing everything and trying to please everyone by band.
Technical details
Media
Requirements
Changelog
🆑
tbd