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

Markings Bundle from Impstation #2928

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

Conversation

hivehum
Copy link
Contributor

@hivehum hivehum commented Feb 8, 2025

my build is failing locally and it seems to be entirely unrelated to this PR so i'm extremely sorry for committing a cardinal sin and PRing without testing.

About the PR

This is an updated port of new-frontiers-14/frontier-station-14#2771, rolling in three more impstation PRs (impstation/imp-station-14#1545, impstation/imp-station-14#1541 and impstation/imp-station-14#1563) plus a couple i missed (impstation/imp-station-14#282 & a couple other reptilian markings i cant actually find the source PR for). additionally i included my changes to the Harpy Bionic Wings marking from #2767

Why / Balance

Cosmetics, bugfix, Lyndomen was already porting several of the head coverings,

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.

Slimes and arachnids have a minor resprite. Major overhaul to how Vox markings work.

Additionally, adds the following:

9 new hair styles - humans, slimes, oni, felinid, and harpies. vulpkanin get 7 of them
28 markings for arachnids
28 markings for reptilians
44 markings for humans, oni, felinid. harpies get like half of these
50 markings for slimes
49 markings for moths
74 markings for vox, including underwear
6 markings for dionae

Media

markings.demo.mp4

oh please look at the linked prs for more screenshots. some highlights tho
2 3 5 6 7 preview firefox_z44nTVTw5I SS14 Loader_gunXWzt5kl SS14 Loader_iaZe2EqtrF

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

Slimes lost their nose and mouth (they are now opt-in).

Arachnids have had their body sprite significantly lightened to take advantage of the full RGB slider.

Vox no longer have forced markings, so their arms, legs, and beak are no longer always yellow. (These are also opt-in, and the sprites are recolorable.) Additionally their skin tone slider was unclamped, because it was buggy to begin with and birds in nature are extremely colorful.

The Harpy Bionic Wings marking was split into two markings, where the lights are now an overlay.

Changelog

🆑 Impstation

  • add: From the IMP sector: Well over a hundred new markings and hairstyles!
  • tweak: Slimes, Arachnids, and Vox have received a visual rework.

@github-actions github-actions bot added size/XL Over 1024 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/XL Over 1024 lines labels Feb 8, 2025
Copy link
Contributor

github-actions bot commented Feb 8, 2025

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

Resources/Textures/Mobs/Species/Slime/parts.rsi

State Old New Status
full Modified
head_f Modified
head_m Modified
l_arm Modified
l_foot Modified
l_hand Modified
l_leg Modified
r_arm Modified
r_foot Modified
r_hand Modified
r_leg Modified
torso_f Modified
torso_m Modified

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

State Old New Status
bubble Added
dionabigfirefly Added
dionafirefly Added
dionalivingnymph Added
dionapollendust Added
fadingstars1 Added
fadingstars2 Added
fadingstars3 Added
fishbowl1 Added
fishbowl2 Added
fizz Added
mothfirefly1 Added
mothglowantenna Added
spidermirror Added

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

State Old New Status
human_bodyhair_female Added
human_bodyhair_male Added

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

State Old New Status
burqalizard Added
burqasolid Added
hijabchic Added
hijabchicvox Added
hijabsimple Added
hijabsimplevox Added
niqab Added
niqablizard Added
tichelfashionable Added
tichelfashionablevox Added
tichelsimple Added
tichelsimplevox Added

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

State Old New Status
frenchbraid Added
gatheredlow Added
lowpigtails Added

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

State Old New Status
bee1 Added
bee2 Added
bee3 Added
beetle1 Added
beetle2 Added
beetle3 Added
dionamoonbloom Added
dionamosschest Added
glasswing1 Added
glasswing2 Added
glasswing3 Added
mothbeetlehorn1 Added
mothbeetlehorn2 Added
mothbiggereyes Added
mothfirefly2 Added
mothtruebutterfly1 Added
mothtruebutterfly2 Added
mothtruebutterfly3 Added
rhinobeetle1 Added
rhinobeetle2 Added
rhinobeetle3 Added
snoth1 Added
snoth2 Added
spidereyesmulti1 Added
spidereyesmulti2 Added
spidereyesmulti3 Added
spidereyesmulti4 Added
spidergloweyes Added
vitiligoarml Added
vitiligoarmr Added
vitiligochestf Added
vitiligochestspots Added
vitiligohandl Added
vitiligohandr Added
vitiligoheadjaw Added
vitiligoheadl Added
vitiligoheadr Added
vitiligolegl Added
vitiligolegr Added
voxarmprostheticl Added
voxarmprostheticr Added
voxarmsstripesl Added
voxarmsstripesr Added
voxbeakcolor Added
voxbeaksplit1 Added
voxbeaksplit2 Added
voxbeaktipped Added
voxbelly Added
voxchains Added
voxcheeks Added
voxchestplumage Added
voxcocktail1 Added
voxcocktail2 Added
voxcocktail3 Added
voxcocktail4 Added
voxfootgradientl1 Added
voxfootgradientl2 Added
voxfootgradientr1 Added
voxfootgradientr2 Added
voxfootspines Added
voxhandgradientl1 Added
voxhandgradientl2 Added
voxhandgradientl3 Added
voxhandgradientr1 Added
voxhandgradientr2 Added
voxhandgradientr3 Added
voxheadgradient1 Added
voxheadgradient2 Added
voxheadgradient3 Added
voxlegsstripesl Added
voxlegsstripesr Added
voxsunandmoon Added
voxtailballed Added
voxtailbell1 Added
voxtailbell2 Added
voxtailcolorable Added
voxtaillantern Added
voxtailsinglestripe Added
voxtailsmallplume Added
voxtailspines Added
voxtailsplit Added
voxtailstripes Added

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

State Old New Status
arm_l_chimera_moth Added
arm_l_prosthetic_moth Added
arm_l_twisting_moth Added
arm_r_prosthetic_moth Added
arm_r_twisting_moth Added
chest_chimera_f_moth Added
chest_chimera_m_moth Added
chest_l_twisting_f_moth Added
chest_l_twisting_m_moth Added
chest_r_twisting_f_moth Added
chest_r_twisting_m_moth Added
chest_star_moth Added
eyes_heterochromia_moth Added
foot_l_chimera_moth Added
foot_l_prosthetic_moth Added
foot_r_prosthetic_moth Added
hand_l_chimera_moth Added
hand_l_prosthetic_moth Added
hand_l_twisting_moth Added
hand_r_prosthetic_moth Added
hand_r_twisting_moth Added
head_badmolt_moth Added
head_chimera_moth Added
head_eyebags_moth Added
head_twisting_moth Added
leg_l_chimera_moth Added
leg_l_prosthetic_moth Added
leg_l_twisting_moth Added
leg_r_prosthetic_moth Added
leg_r_twisting_moth Added
moth_body_claw Added
moth_burn_l Added
moth_burn_r Added
moth_face_claw Added
moth_slash_l Added
moth_slash_r Added
torso_incision_moth Added
wings_backstabbed Added

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

State Old New Status
fangs Added
horns_kobold_ears Added
horns_kobold_ears_piercings Added
horns_nubby Added
piercings1 Added

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

State Old New Status
arm_l_prosthetic Added
arm_l_twisting Added
arm_r_prosthetic Added
arm_r_twisting Added
chest_backstabbed Added
chest_l_twisting Added
chest_r_twisting Added
chest_star Added
foot_l_prosthetic Added
foot_r_prosthetic Added
hand_l_prosthetic Added
hand_l_twisting Added
hand_r_prosthetic Added
hand_r_twisting Added
head_smile Added
head_twisting Added
leg_l_prosthetic Added
leg_l_twisting Added
leg_r_prosthetic Added
leg_r_twisting Added
torso_incision Added

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

State Old New Status
bonearmleft Added
bonearmright Added
bonechest Added
bonefootleft Added
bonefootright Added
bonehandleft Added
bonehandright Added
bonehead Added
bonelegleft Added
bonelegright Added
brain Added
core Added
eyeglow Added
lungs Added
mouth Added
nose Added

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

State Old New Status
chest_cuthere Added
l_arm_doll Added
l_foot_doll Added
l_hand_doll Added
l_leg_doll Added
r_arm_doll Added
r_foot_doll Added
r_hand_doll Added
r_leg_doll Added

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

State Old New Status
bigslash_l_head Added
bigslash_r_head Added
claw_torso Added
roadrash_l_head Added
roadrash_r_head Added
slash_l_head Added
slash_r_head Added

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

State Old New Status
balding Added
beardlargewattle Added
beardpadovana Added
beardsmallwattle Added
earhole Added
featheredlegl Added
featheredlegr Added
friendsfeather1 Added
friendsfeather2 Added
hairemover Added
hairpadovana Added
hairpolish Added
hairwindswept Added
largecomb Added
neckband Added
scarheadblasted Added
scarincision Added
scarmangled Added
scarspinal Added
sidequills1 Added
sidequills2 Added
sidequills3 Added
spotsarml Added
spotsarmr Added
spotschest1 Added
spotschest2 Added
spotstail Added
streamers1 Added
streamers2 Added
streamers3 Added

Edit: diff updated after 920a696

@github-actions github-actions bot added the size/XL Over 1024 lines label Feb 8, 2025
@dvir001
Copy link
Contributor

dvir001 commented Feb 8, 2025

👀

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 size/XL Over 1024 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants