Quickfix #130
Closed
Quickfix #130
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
Basically my Arsenal Expansion PR on oldrepo now on rebase. Balances some cargo prices, fixes a few item appearances and descriptions, adds new weapons, cleans sprites... yada yada.
|
RSI Diff Bot; head commit 3365dde merging into bcb3d66 Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi
Resources/Textures/Nyanotrasen/Clothing/Belt/katanasheath.rsi
Resources/Textures/Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi
Resources/Textures/Structures/Wallmounts/posters.rsi
Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi
Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi
Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi
Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi
Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi
Resources/Textures/DeltaV/Objects/Weapons/Melee/e_cutlass.rsi
Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi
|
|
Obviously going to be a greentext, I have so much sleep and so much ambition, definitely and truly just yell if I made a mistake with any of my files. Like I said I am big tired |
Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/magnum.yml
Outdated
Show resolved
Hide resolved
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <[email protected]>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <[email protected]>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <[email protected]>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <[email protected]>
Per Floofers review :3
|
Probably even better now or something!!! Now I just need to greentext Floofers :3 |
I think
|
Even bettererer, perhaps the betterererest |
DebugOk
reviewed
Oct 9, 2023
|
|
|
smh I'm about to quickfix your internal organs |
|
|
|
maintainer abuse ;-; |
|
|
|
Gitbanned + L |
|
Merge the PR before I merge your house with a four-lane highway >:( |
|
"Close pull request" |
|
|
|
I would cry and seethe and then open up a slightly larger quickfix |
|
|
|
I dunno bud all I'm seeing is embed fail |
|
it's a redirect |
|
|
|
Fuck uhhh merge my PR or something (unless you want me to fix it more) |
Colin-Tel
reviewed
Oct 10, 2023
Signed-off-by: Colin-Tel <[email protected]>
Signed-off-by: Colin-Tel <[email protected]>
raaagh Signed-off-by: Tad "Taddy" Johnson <[email protected]>
auto-merge was automatically disabled
October 10, 2023 05:10
Head branch was pushed to by a user without write access
|
Updated Quickfix and added comments to e-sword.yml |
|
Sorry for kill autosquash but I figured it would be best to keep it all up-to-date and commented |
|
Error is unrelated I think? |
so quick, such wow
|
This fix just keeps getting quicker. I will laugh if I did not make a mistake here |
|
All good for review, or anything need fixing? If so, how to fix? |
|
There's just so much... |
|
Ah yes, but it is all green |
|
If I remember, Debug asked for this to be split in smaller PRs and with proper names.
I'm sure I missed something. |
|
Alright how do I split it into smaller PRs, simple ctrl+c and ctrl+v into new branches |
|
Durry and gin, time to divide this PR |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Obsolete now :3 |
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.
About the PR
Everything from the Arsenal Expansion PR (#189), plus some balances to cargo pricing, sprite updates, a few other things
Why / Balance
Arsenal Expansion PR: adding new weapons for mercenaries, potential addition to organic gameplay too. Rebalance of prices was necessary, rifles and Universals were far too cheap comparatively.
Technical details
N/A
Media
I think it's pretty self-explanatory and I'm mad tired, if you want me to show stuff there's really not much to show but ask and I'll try to grab a screenie
That's from the Arsenal Expansion PR
Breaking changes
Changelog