Skip to content
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

[Port] Markings support shaders #2767

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

hivehum
Copy link
Contributor

@hivehum hivehum commented Jan 18, 2025

About the PR

This is primarily a port of impstation/imp-station-14#842, mostly to fix a bug I noticed with a harpy marking added in #1641 but I also decided to port impstation/imp-station-14#833 and parts of impstation/imp-station-14#1181 so that more species have access to the new marking shader feature

I'll admit, I'm not quite sure how to organize what I did to get the bionic harpy wing marking functioning w/r/t file structure. Applying a shader to a marking is an all-or-nothing situation, so I split the marking in two with the highlights now being unshaded. Would like input there

Why / Balance

Bugfix + purely cosmetic/flavor change. If anything, a player that opts into these markings is tactically disadvantaged because now they are visible in low light

Technical details

Alters HumanoidAppearanceSystem and MarkingPrototype to accept shaders, and prototypes.go because. um. i actually don't know but the original PR did this. Splits HarpyWingBionic into two markings so that the lights are unshaded as initially intended; adds 10 new markings (2 slime, 2 arachnid, 2 moth, 3 diona, 1 vox) that utilize unshaded.

Media

markings.demo.mp4

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Simple Bionic Wings (Whitescale) is now #FFFFFF by default and is missing the string of lights; characters using that marking need to add Simple Bionic Wings (Lights) from the Overlay tab

Changelog

🆑 widgetbeck, Sha-Seng, hivehum, crocodilecarousel

  • add: From Impstation: Harpies, Slime people, Arachnids, Moths, Dionae and Vox all have new glow-in-the-dark markings.

@hivehum hivehum requested review from deltanedas and a team as code owners January 18, 2025 16:04
@github-actions github-actions bot added S: Needs Review size/L 256-1023 lines Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi and removed size/L 256-1023 lines labels Jan 18, 2025
Copy link
Contributor

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

Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi

State Old New Status
dionabigfirefly Added
dionafirefly Added
fadingstars1 Added
fadingstars2 Added
fadingstars3 Added
mothfirefly1 Added
mothglowantenna Added
spidermirror Added

Resources/Textures/_Impstation/Mobs/Customization/arachnid.rsi

State Old New Status
spidergloweyes Added

Resources/Textures/_Impstation/Mobs/Customization/diona.rsi

State Old New Status
dionamoonbloom Added

Resources/Textures/_Impstation/Mobs/Customization/moth.rsi

State Old New Status
mothfirefly2 Added

Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi

State Old New Status
eyeglow Added

Resources/Textures/_Impstation/Mobs/Customization/vox.rsi

State Old New Status
voxtaillantern Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants