Markings Port Wave 1 #1658
Merged
Markings Port Wave 1 #1658
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
* add sprite pulato * update * add pulato hair * add pulato hair * add pulato hair * update meta "pulato"
* Sprite&Meta * Marking_Prototype * Locale * Meta_copyright_change * Sprite_Change * New_Sprite * And_another_new_sprite * Change_Locale
… only TODO add localization ughhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
TODO: localization cleanup oni horns including kanaya maryam missing sprite
angelofallars
requested review from
DEATHB4DEFEAT,
sleepyyapril and
Remuchi
as code owners
github-actions
bot
added
Status: Needs Review
|
RSI Diff Bot; head commit e9dc129 merging into 8eafa7a Resources/Textures/DeltaV/Mobs/Customization/hair.rsi
Resources/Textures/Mobs/Customization/gauze.rsi
Resources/Textures/Mobs/Customization/human_hair.rsi
Resources/Textures/_ADT/Mobs/Customization/Human/custom.rsi
Resources/Textures/_ADT/Mobs/Customization/augments/headaugs.rsi
Resources/Textures/_Corvax/Mobs/Customization/human_facial_hair.rsi
Resources/Textures/_Corvax/Mobs/Customization/human_hair.rsi
Resources/Textures/_Goobstation/Mobs/Customization/human_hair.rsi
Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi
|
sleepyyapril
approved these changes
Jan 26, 2025
|
Have these (Simple-Station/Parkstation-Friendly-Chainsaw#25) been ported here already? would be cool |
|
this is mostly the pngs and such, its fine |
huh? |
not at you, my approval |
not all of them, tbh I found most of the corvax hairs (which were all straight ports from skyrat-TG btw) to not have the same quality as the hairs we have in game and/or be a duplicate of an already-existing hair but older so that's why I only kept the afropuff and african pigtails hairstyles for now but i can deffo port some of them for markings port wave 2, most likely this for Onis |
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.
Description
Added a ton of markings to the game, ported from other codebases:
HumanHairClassicLong2andHumanHairClassicLong3have been upstreamed from DV to Wizden so I'm doing the same here. Return Long2 and Long3 hairstyles space-wizards/space-station-14#30963Also cherry-picked space-wizards/space-station-14#30786 and space-wizards/space-station-14#30852.
I was initially going to include new Oni markings like horns, ears and tails from Adventure Time here but due to what I think is quality issues with some of them I've postponed adding them until I have the time to correct them. I gotta put out the markings I can put out now cause I know everyone's gonna want to immediately upstream merge all the other content we've added today.
Media
Pulato (from Wizden) + Iron Jaw (from Adventure Time)
Side Comb + Beard (Short) (all from Adventure Time)
Front Braids (Medium) (from Goob LRP) + Gauze Head Wrap (from Wizden)
IPC Wings (from SimpleStation) + Long Pompadour (from Goob LRP) + Moustache (Handlebar 2) (from Corvax)
Plasmaman Wings (from SimpleStation)
Changelog
🆑 Skubman