-
Notifications
You must be signed in to change notification settings - Fork 405
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
Quickfix #130
Quickfix #130
Conversation
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/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 <120885811+TadJohnson00@users.noreply.github.com>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
Per Floofers' review Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
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 |
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 |
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
raaagh Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
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? |
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 |
…taV-Station#130) ## Mirror of PR #25318: [Add a toggle for colorblind friendly progress bar colors](space-wizards/space-station-14#25318) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `f3f4616c49317898aeeff304160b0b50df9ee851` PR opened by <img src="https://avatars.githubusercontent.com/u/98561806?v=4" width="16"/><a href="https://github.com/EmoGarbage404"> EmoGarbage404</a> at 2024-02-16 17:40:39 UTC PR merged by <img src="https://avatars.githubusercontent.com/u/19864447?v=4" width="16"/><a href="https://github.com/web-flow"> web-flow</a> at 2024-03-09 11:43:20 UTC --- PR changed 8 files with 169 additions and 84 deletions. The PR had the following labels: - Changes: UI - Status: Needs Review --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Adds a toggle in the accessibility menu that lets 'progress bars' (doafters, medhud) toggle between a standard rainbow palette and the colorblind-friendly Viridis palette. > > also makes the medhud bar unshaded to match the icon and to improve readability. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Medical huds used a (frankly) bastardized version of Viridis without proper smoothing. Doafters used the standard rainbow palette but with actual smoothing. I personally don't really like the medhud colors, but i figured if i wanted to get rid of them it was best to unify and make it an option broadly so that people who needed it could get more use out of it. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > Makes a new static method in ProgressColorSystem that handles the CVAR. also adds a new checkbox to MiscTab.xaml > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > https://github.com/space-wizards/space-station-14/assets/98561806/743c2c31-6504-4693-ab6b-7f54e0d65e06 > > - [x] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > 🆑 > - add: Added a new "colorblind friendly" toggle in the accessibility menu. This allows you to toggle between a standard and colorblind-friendly palette for things like progress bars and the medical HUD. > - tweak: The medical HUD is now bright, even in low light levels. > </details> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
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
![268429206-16600fe5-2808-44fe-935d-b9a7f0431d00](https://private-user-images.githubusercontent.com/120885811/273461395-9b30747a-1eb4-422c-9e2b-4cbe146bbdcd.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk3NDg1MzUsIm5iZiI6MTczOTc0ODIzNSwicGF0aCI6Ii8xMjA4ODU4MTEvMjczNDYxMzk1LTliMzA3NDdhLTFlYjQtNDIyYy05ZTJiLTRjYmUxNDZiYmRjZC5wbmc_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjUwMjE2JTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI1MDIxNlQyMzIzNTVaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT01ZTQ0NWM4YTAwZDIzMmNiNTMwOWIzNWQ4ZGYyNzhkOGQyODE4YmEwZGE3Njk1ZWNiMDI0MjMxY2I0MjE3ZmVkJlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.LqLZrIXReA7QoqCTbNxwlO5SAqNbhzkkXsuZc5PmPP0)
That's from the Arsenal Expansion PR
Breaking changes
Changelog