-
Notifications
You must be signed in to change notification settings - Fork 404
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
hivehum
wants to merge
3
commits into
DeltaV-Station:master
Choose a base branch
from
hivehum:markings-bundle
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
+4,913
−61
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
RSI Diff Bot; head commit 920a696 merging into 3f098ce Resources/Textures/Mobs/Species/Slime/parts.rsi
Resources/Textures/_Impstation/Mobs/Customization/animatedmarkings.rsi
Resources/Textures/_Impstation/Mobs/Customization/bodyhair.rsi
Resources/Textures/_Impstation/Mobs/Customization/headcovers.rsi
Resources/Textures/_Impstation/Mobs/Customization/human_hair.rsi
Resources/Textures/_Impstation/Mobs/Customization/markingsbundle1.rsi
Resources/Textures/_Impstation/Mobs/Customization/moth.rsi
Resources/Textures/_Impstation/Mobs/Customization/reptilian_parts.rsi
Resources/Textures/_Impstation/Mobs/Customization/scars.rsi
Resources/Textures/_Impstation/Mobs/Customization/slime_parts.rsi
Resources/Textures/_Impstation/Mobs/Customization/tattoos.rsi
Resources/Textures/_Impstation/Mobs/Customization/vox_scars.rsi
Resources/Textures/_Impstation/Mobs/Customization/voxbundle1.rsi
|
👀 |
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
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.
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
![SS14 Loader_iaZe2EqtrF](https://private-user-images.githubusercontent.com/26695058/408836240-7c2757eb-44d9-4f02-91b0-2f575534b36a.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzk0ODkxNDEsIm5iZiI6MTczOTQ4ODg0MSwicGF0aCI6Ii8yNjY5NTA1OC80MDg4MzYyNDAtN2MyNzU3ZWItNDRkOS00ZjAyLTkxYjAtMmY1NzU1MzRiMzZhLnBuZz9YLUFtei1BbGdvcml0aG09QVdTNC1ITUFDLVNIQTI1NiZYLUFtei1DcmVkZW50aWFsPUFLSUFWQ09EWUxTQTUzUFFLNFpBJTJGMjAyNTAyMTMlMkZ1cy1lYXN0LTElMkZzMyUyRmF3czRfcmVxdWVzdCZYLUFtei1EYXRlPTIwMjUwMjEzVDIzMjA0MVomWC1BbXotRXhwaXJlcz0zMDAmWC1BbXotU2lnbmF0dXJlPWU1MDRlZmI0ZTQ3MDBjODU0Mjg2NTFjZTM5ZTNiZjdhZjNlODJjNzc5NmU2MjNmZDU5Mjg4NzY3YTAwNWE2NmUmWC1BbXotU2lnbmVkSGVhZGVycz1ob3N0In0.k_xubj_mjC4dUTFeC88iTDsDj89W0E8qYEaFlpyoz50)
Requirements
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