-
Notifications
You must be signed in to change notification settings - Fork 281
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
Better insectoid glasses (round 2) #1670
base: master
Are you sure you want to change the base?
Better insectoid glasses (round 2) #1670
Conversation
Adds the glasses and meta files for glasses and huds that don't require admins to spawn in. For some reason the arachnid and moth had it's - type:Inventory section down at the bottom, so I removed that and added whatever was there to the original spot I had them in the previous PR.
The other part of the sprites and meta files, consisting of huds only admins can spawn in and the ninja visor.
RSI Diff Bot; head commit 4398ac3 merging into 677bd72 Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/gar.rsi
Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi
Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi
Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/meson.rsi
Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi
Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/science.rsi
Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi
Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi
Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi
Resources/Textures/Clothing/Eyes/Hud/command.rsi
Resources/Textures/Clothing/Eyes/Hud/diag.rsi
Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi
Resources/Textures/Clothing/Eyes/Hud/med.rsi
Resources/Textures/Clothing/Eyes/Hud/medonion.rsi
Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi
Resources/Textures/Clothing/Eyes/Hud/medsec.rsi
Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi
Resources/Textures/Clothing/Eyes/Hud/omni.rsi
Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi
Resources/Textures/Clothing/Eyes/Hud/sec.rsi
Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi
Resources/Textures/Clothing/Eyes/Misc/blindfold.rsi
Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi
Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi
Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi
|
This is ready to be merged whenever. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor spelling error on most meta.jsons - modified is spelled "motified."
I've looked at all of this - and this might sound controversial, but:
the vast majority of this PR touches upstream items, so you might wanna PR it up there considering that's where moths and arachnids are maintained.
I can help you out if you have trouble doing that.
I commend your effort to make glasses that fit arachnids and moths because there's a lot of them that just don't fit and kinda look like ass on those species
My habit of mispelling words strikes again. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Signed-off-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>
So, the PR upstream has been in review for about a month and they seem a bit dead set on me using displacement maps for some of the glasses (which I'm not very willing to do). Would there be any problems if this is merged early here instead of waiting on upstream? |
The test fail seems unrelated? My dev environment boots up fine without any issues or warnings, and the yaml looks completely fine. None of the warnings look related either. Though maybe I'm overlooking something... |
About the PR
This adds custom sprites for arachnids and moths for all glasses and huds.
Why / Balance
It's so the glasses actually cover the species eyes. There are many players, myself included, that avoid wearing glasses and some huds (or have to use the eyepatches) because they look dumb on those species. This fixes that.
Technical details
Sprite stuff and whatnot.
Media
Requirements
Breaking changes
N/A
Changelog
Nuh uh