Better insectoid glasses (round 2) #1670
Open
+342
−45
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
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.
github-actions
bot
added
Changes: YML
|
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/beerpatch.rsi
Resources/Textures/Clothing/Eyes/Hud/command.rsi
Resources/Textures/Clothing/Eyes/Hud/diag.rsi
Resources/Textures/Clothing/Eyes/Hud/diagpatch.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/medpatch.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/secpatch.rsi
Resources/Textures/Clothing/Eyes/Hud/synd.rsi
Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi
Resources/Textures/Clothing/Eyes/Misc/blindfold.rsi
Resources/Textures/Clothing/Eyes/Misc/eyepatch.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. |
ghost
reviewed
Aug 26, 2024
There was a problem hiding this comment.
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... |
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
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