Better insectoid glasses (round 2) #1670

HTMLSystem · 2024-08-23T18:20:31Z

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

I have read and I am following the Pull Request Guidelines. I understand that not doing so may get my pr closed at maintainer’s discretion
I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

N/A
Changelog

Nuh uh

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 · 2024-08-23T18:21:11Z

RSI Diff Bot; head commit f04e4bb merging into b0965ed
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Eyes/Glasses/commandglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/gar.rsi

State	Old	New	Status
alt-equipped-EYES-arachnid			Added
equipped-EYES-arachnid			Added
super-equipped-EYES-arachnid			Added

Resources/Textures/Clothing/Eyes/Glasses/glasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/jamjar.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/jensen.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/mercglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/meson.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/ninjavisor.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added

Resources/Textures/Clothing/Eyes/Glasses/outlawglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/science.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/sunglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Glasses/thermal.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/beergoggles.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Clothing/Eyes/Hud/beerpatch.rsi

State	Old	New	Status
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/command.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/diag.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/diagpatch.rsi

State	Old	New	Status
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/friedonion.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/med.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/medonion.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/medonionbeer.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Clothing/Eyes/Hud/medpatch.rsi

State	Old	New	Status
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/medsec.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Clothing/Eyes/Hud/medsecengi.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Clothing/Eyes/Hud/omni.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/Clothing/Eyes/Hud/onionbeer.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/sec.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/secpatch.rsi

State	Old	New	Status
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Hud/synd.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added

Resources/Textures/Clothing/Eyes/Hud/syndagent.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added

Resources/Textures/Clothing/Eyes/Misc/blindfold.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/Clothing/Eyes/Misc/eyepatch.rsi

State	Old	New	Status
equipped-EYES-moth			Added

Resources/Textures/_DV/Clothing/Eyes/Glasses/safetyglasses.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/_DV/Clothing/Eyes/Hud/prescmedhud.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Resources/Textures/_DV/Clothing/Eyes/Hud/prescsechud.rsi

State	Old	New	Status
equipped-EYES-arachnid			Added
equipped-EYES-moth			Added

Edit: diff updated after f04e4bb

HTMLSystem · 2024-08-23T20:17:17Z

This is ready to be merged whenever.

ghost

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

HTMLSystem · 2024-08-27T02:34:11Z

My habit of mispelling words strikes again.
I'll fix those later. In the meantime you could dm me on discord (or I could dm you, whichever happens first) on PRing this upstream.

github-actions · 2024-08-30T14:04:23Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Fixes all typos in the meta.json files, hopefully.

Signed-off-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>

HTMLSystem · 2024-10-13T14:19:28Z

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?
Edit: I just realized I NEVER put the command glasses or admin hud glasses in here. I'll fix that really quick.

HTMLSystem · 2024-10-13T15:39:05Z

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...

deltanedas

ideally there would be a verb on clothing or a character preference to disable using species specific sprites

deltanedas · 2024-11-03T09:35:21Z

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

+  - type: Inventory
+    templateId: arachnid
+    speciesId: arachnid # DeltaV - allow arachnid clothing sprite variants


add the speciesId bit to the existing Inventory component at the bottom (dont remove it just to place it here)

deltanedas · 2024-11-03T09:35:38Z

Resources/Prototypes/Entities/Mobs/Species/arachnid.yml

@@ -125,6 +126,8 @@
  components:
  - type: HumanoidAppearance
    species: Arachnid
+  - type: Inventory
+    speciesId: arachnid #DeltaV - Allows the "dummy" in th elobby menu to wear the arachnid sprites


deltanedas · 2024-11-03T09:36:00Z

Resources/Prototypes/Entities/Mobs/Species/moth.yml

@@ -15,6 +15,14 @@
  - type: Icon
    sprite: Mobs/Species/Moth/parts.rsi
    state: full
+  - type: Inventory
+    speciesId: moth # Deltav - allows moth clothing sprite variants


same, dont move it for no reason

github-actions · 2024-11-20T01:08:55Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions · 2024-11-20T02:21:57Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Fixed the command glasses sprite and moved the species ID to the bottom of the prototype file like I was asked to.

github-actions · 2025-01-01T08:26:02Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

HTMLSystem added 2 commits August 23, 2024 14:00

Sprites and meta files, part 2 admeme edition

276db7c

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 Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Aug 23, 2024

ghost reviewed Aug 26, 2024

View reviewed changes

github-actions bot added the S: Merge Conflict Fix your PR! label Aug 30, 2024

HTMLSystem and others added 2 commits September 2, 2024 19:24

Typo fix

5837bba

Fixes all typos in the meta.json files, hopefully.

Merge branch 'master' into Better-insectoid-glasses-(round-2)

5d32675

Signed-off-by: HTML/Crystal <152909599+HTMLSystem@users.noreply.github.com>

github-actions bot removed the S: Merge Conflict Fix your PR! label Sep 4, 2024

Added command glasses and hud

4398ac3

HTMLSystem requested review from IamVelcroboy and a team as code owners October 13, 2024 14:41

github-actions bot added the S: Needs Review label Oct 13, 2024

deltanedas requested changes Nov 3, 2024

View reviewed changes

deltanedas added S: Awaiting Changes Do not merge due to requested changes and removed S: Needs Review labels Nov 3, 2024

HTMLSystem marked this pull request as draft November 3, 2024 15:19

github-actions bot added Status: Merge Conflict S: Merge Conflict Fix your PR! labels Nov 20, 2024

deltanedas removed the Status: Merge Conflict label Nov 20, 2024

Deltanedas requested changed

8453cb3

Fixed the command glasses sprite and moved the species ID to the bottom of the prototype file like I was asked to.

github-actions bot removed the S: Merge Conflict Fix your PR! label Nov 21, 2024

github-actions bot added the S: Merge Conflict Fix your PR! label Jan 1, 2025

merge master and fix some comments

f04e4bb

github-actions bot added size/M 64-255 lines and removed S: Merge Conflict Fix your PR! labels Jan 1, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Better insectoid glasses (round 2) #1670

Better insectoid glasses (round 2) #1670

HTMLSystem commented Aug 23, 2024

github-actions bot commented Aug 23, 2024 •

edited

Loading

HTMLSystem commented Aug 23, 2024

ghost left a comment

HTMLSystem commented Aug 27, 2024

github-actions bot commented Aug 30, 2024

HTMLSystem commented Oct 13, 2024 •

edited

Loading

HTMLSystem commented Oct 13, 2024

deltanedas left a comment

deltanedas Nov 3, 2024

deltanedas Nov 3, 2024

deltanedas Nov 3, 2024

github-actions bot commented Nov 20, 2024

github-actions bot commented Nov 20, 2024

github-actions bot commented Jan 1, 2025

Better insectoid glasses (round 2) #1670

Are you sure you want to change the base?

Better insectoid glasses (round 2) #1670

Conversation

HTMLSystem commented Aug 23, 2024

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

github-actions bot commented Aug 23, 2024 • edited Loading

HTMLSystem commented Aug 23, 2024

ghost left a comment

Choose a reason for hiding this comment

HTMLSystem commented Aug 27, 2024

github-actions bot commented Aug 30, 2024

HTMLSystem commented Oct 13, 2024 • edited Loading

HTMLSystem commented Oct 13, 2024

deltanedas left a comment

Choose a reason for hiding this comment

deltanedas Nov 3, 2024

Choose a reason for hiding this comment

deltanedas Nov 3, 2024

Choose a reason for hiding this comment

deltanedas Nov 3, 2024

Choose a reason for hiding this comment

github-actions bot commented Nov 20, 2024

github-actions bot commented Nov 20, 2024

github-actions bot commented Jan 1, 2025

github-actions bot commented Aug 23, 2024 •

edited

Loading

HTMLSystem commented Oct 13, 2024 •

edited

Loading