Closed Tych0theSynth closed 2 weeks ago
RSI Diff Bot; head commit 2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9 merging into ddd3e308dd4eb0576b8ab12e8bf2146fae76c7b8 This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
| State | Old | New | Status | --- | --- | --- | --- | | welded | ![](https://raw.githubusercontent.com/new-frontiers-14/frontier-station-14/ddd3e308dd4eb0576b8ab12e8bf2146fae76c7b8/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/welded.png) | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/welded.png) | Modified | n2 | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/n2.png) | Added | n2_door | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/n2_door.png) | Added | n2_open | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/n2_open.png) | Added | o2n2 | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/o2n2.png) | Added | o2n2_door | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/o2n2_door.png) | Added | o2n2_open | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker.rsi/o2n2_open.png) | Added
| State | Old | New | Status | --- | --- | --- | --- | | welded | ![](https://raw.githubusercontent.com/new-frontiers-14/frontier-station-14/ddd3e308dd4eb0576b8ab12e8bf2146fae76c7b8/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png) | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/wall_locker_color.rsi/welded.png) | Modified
| State | Old | New | Status | --- | --- | --- | --- | | o2n2 | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/closet.rsi/o2n2.png) | Added | o2n2_door | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/closet.rsi/o2n2_door.png) | Added | o2n2_open | ![]() | ![](https://raw.githubusercontent.com/Tych0theSynth/frontier-station-14/2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9/Resources/Textures/_NF/Structures/Storage/closet.rsi/o2n2_open.png) | Added
Edit: diff updated after 2cf4a8ef1e7be4fb1a12ec414018426f2ff0bef9
Could this not be added to the O2 locker instead? Maybe resprite the door if needed?
Could this not be added to the O2 locker instead? Maybe resprite the door if needed?
I'm not sure I understand what you mean. The colours are completely different across sprites, including with the fullsize lockers.
You can look at # Fuel / materials storage section in this file and make your empty locker with minimal spriting: you'll have to add sprite for "n2" decal in corresponding rsi folder and link it.
Could this not be added to the O2 locker instead? Maybe resprite the door if needed?
I'm not sure I understand what you mean. The colours are completely different across sprites, including with the fullsize lockers.
Why not have one "air/breathables/internals/etc." locker with essentials for species-independent breathing? It's not about the sprites.
Could this not be added to the O2 locker instead? Maybe resprite the door if needed?
I'm not sure I understand what you mean. The colours are completely different across sprites, including with the fullsize lockers.
Why not have one "air/breathables/internals/etc." locker with essentials for species-independent breathing? It's not about the sprites.
OH. You're talking about making a combined locker that just contains everything? Yeah. That can be done.
Converting to draft while I work on the combined locker and bundle it in with this.
I think I'm there with this one. Ready for review now.
Small set of suggestions up here: whatston3:frontier-station-14:2024-08-28-wallmountn2-suggestions
Curious of your thoughts, otherwise this looks good.
Small set of suggestions up here: whatston3:frontier-station-14:2024-08-28-wallmountn2-suggestions
* I've pushed the fills to the fills folder. I've left the nitrogen one as its own fill instead of reparenting the existing standing nitrogen closet. * I think the term "emergency internals closet" works better than "emergency nitrogen and oxygen closet", matches with the "internals crate".
Curious of your thoughts, otherwise this looks good.
This looks great, and the name change makes so much more sense and is far more concise. I'll take a proper look tomorrow but chances are I'll merge this into it! Cheers!
Tested and working with some good adjustments by @whatston3. Good to go!
Going to fix up the weld sprites on the wallmount versions, will pull from Erhard's wall lockers, they look pretty good.
Finagled it a bit, looks like this now, I think it's an improvement.
Yeah that's an improvement for sure!
About the PR
Added a wallmount N2 locker as this variant was not available, also added a combined o2/n2 emergency locker and wallmount.
Why / Balance
We have a wallmount O2 locker, so why not have an N2 locker as well?
25/08: Now also adds combined emergency closets! These include the emergency suit and have the chance to give the bonus toolbox, airloss medkit, larger tanks and flare gun as the original closets. Still including the N2 locker as it would feel weird to have the combined locker, the o2 locker and no n2 locker. If this is merged I imagine the combined lockers becoming the standard, so I can always remove the n2 locker from this PR.
Increased friendliness to Slime people and Vox, yay!
29/08: Combined lockers are now 'Emergency Internals Closet'. Much better name. Fills were moved into the fills dir.
How to test
Checkout the branch, load up and spawn the objects.
Media
Breaking changes
None!
Changelog Make sure to take this Changelog template out of the comment block in order for it to show up. :cl: