Upstream #19
Merged
Upstream #19
Conversation
This file contains 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
* Better special locale * fix client special points manupilation * use better symbol for examining special for clothing
* Adds basic weapons to domestic * adds military based lockers
* Fixes plasma caster * Fixes T-60 / Tesla sprites showing ass * replaces refilling closets with loot closets on sunnyvale2 * naming consistency * nerfs 50 bullet, but adds AP (HEIAP as talked about in dev channel)
|
Thank you for contributing to our repository. Unfortunately, it looks like you submitted your pull request from the master branch. We suggest you follow the git usage documentation. You can move your current work from the master branch to another branch by branching from and resetting the master branch. |
|
RSI Diff Bot; head commit 20322b7 merging into fa6e2dd Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi
Resources/Textures/_Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz2000.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Battery/wattz3000.rsi
Resources/Textures/_Nuclear14/Objects/Weapons/Guns/Pistols/9mm.rsi
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Description.
TODO
Media