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

Add Back Old Markings and Wings Layer #25

Merged
merged 17 commits into from
Jan 18, 2024
Merged

Add Back Old Markings and Wings Layer #25

merged 17 commits into from
Jan 18, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Nov 9, 2023

Media

I don't wanna make a ton of images, have this one image of this cool guy.

image

Someone resprited the fluffy tail, looks way better now
Content Client_1LV3Jf252n


Changelog

🆑

  • add: Added wings marking layer
  • tweak: Moved wings from the tail layer to wings
  • add: Added way too many markings to list here

@github-actions github-actions bot added Status: Needs Review Someone please review this 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 labels Nov 9, 2023
Copy link
Contributor

github-actions bot commented Nov 9, 2023

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

Resources/Textures/Corvax/Mobs/Customization/human_facial_hair.rsi

State Old New Status
handlebar Added
handlebar2 Added

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

State Old New Status
africanpigtails Added
afropuffdouble Added
afropuffleft Added
afropuffright Added
amazon Added
astolfo Added
baum Added
beachwave Added
bluntbangs Added
bluntbangs_alt Added
bobcutalt Added
bunhead4 Added
combed Added
combedbob Added
cotton Added
curly Added
dave Added
diagonal_bangs Added
emoshort Added
fingerwave Added
fluffy_short Added
fortuneteller Added
fortuneteller_alt Added
froofylong Added
geisha Added
gentle21 Added
glammetal Added
gloomy_long Added
gloomy_medium Added
grande Added
halfshave Added
halfshave_glamorous Added
halfshave_long Added
halfshave_messy Added
halfshave_messylong Added
halfshave_snout Added
hightight Added
hyenamane Added
jessica Added
long4 Added
longdtails Added
longeralt Added
longovereye_alt Added
longsidepartstraight Added
loose_slicked Added
mediumbraid Added
newyou Added
ponytailalt Added
ponytailf Added
poofy2 Added
quadcurls Added
sabitsuki Added
scully Added
shorthair4 Added
shy Added
simple_ponytail Added
sleaze Added
slightlymessy Added
slimedroplet Added
slimedroplet_alt Added
slimespikes Added
slimetendrils Added
slimetendrils_alt Added
spicy Added
twintail_floor Added
veryshortovereye Added
victory Added
viper Added
wife Added
ziegler Added

Resources/Textures/SimpleStation14/Mobs/Customization/ears.rsi

State Old New Status
avali_inner Added
avali_outer Added
bunny Added
bunny2 Added
chemlight_inner Added
chemlight_outer Added
dragonlong Added
easternd_ears Added
easternd_horns Added
jackal_inner Added
jackal_outer Added
magus_ears Added
magus_neck Added
mouse Added
shadowkin Added
shadowkin_stripes Added
sylveon_primary Added
sylveon_secondary Added
sylveon_tertiary Added

Resources/Textures/SimpleStation14/Mobs/Customization/ipc_antenna.rsi

State Old New Status
ipc_antenna_antlers Added
ipc_antenna_crowned Added
ipc_antenna_cyberhead Added
ipc_antenna_droneeyes Added
ipc_antenna_light Added
ipc_antenna_lightb Added
ipc_antenna_sidelights Added
ipc_antenna_tesla Added
ipc_antenna_towers Added
ipc_antenna_tv Added

Resources/Textures/SimpleStation14/Mobs/Customization/ipc_screens.rsi

State Old New Status
ipc_screen_blank Added
ipc_screen_blue Added
ipc_screen_breakout Added
ipc_screen_bsod Added
ipc_screen_console Added
ipc_screen_ecgwave Added
ipc_screen_eight Added
ipc_screen_exclaim Added
ipc_screen_eyes Added
ipc_screen_eyesangry Added
ipc_screen_eyestall Added
ipc_screen_frown Added
ipc_screen_glider Added
ipc_screen_goggles Added
ipc_screen_heart Added
ipc_screen_l Added
ipc_screen_loading Added
ipc_screen_monoeye Added
ipc_screen_nature Added
ipc_screen_orange Added
ipc_screen_pink Added
ipc_screen_question Added
ipc_screen_rainbowdiag Added
ipc_screen_rainbowhoriz Added
ipc_screen_redtext Added
ipc_screen_rgb Added
ipc_screen_ring Added
ipc_screen_scroll Added
ipc_screen_shower Added
ipc_screen_sinewave Added
ipc_screen_smile Added
ipc_screen_squarewave Added
ipc_screen_stars Added
ipc_screen_static Added
ipc_screen_tetris Added
ipc_screen_textdrop Added
ipc_screen_tv Added
ipc_screen_windowsxp Added
ipc_screen_yellow Added

Resources/Textures/SimpleStation14/Mobs/Customization/reptilian.rsi

State Old New Status
spines_aqua Added
spines_long Added
spines_longmeme Added
spines_short Added
spines_shortmeme Added
spineswag_aqua Added
spineswag_long Added
spineswag_longmeme Added
spineswag_short Added
spineswag_shortmeme Added
tailwag_dtiger Added
tailwag_ltiger Added
tailwag_smooth Added
tailwag_spikes Added

Resources/Textures/SimpleStation14/Mobs/Customization/snouts.rsi

State Old New Status
easterndnw_primary Added
easterndnw_secondary Added
easterndw_primary Added
extra_magus Added
skullbird Added

Resources/Textures/SimpleStation14/Mobs/Customization/tails32x32.rsi

State Old New Status
axolotl Added
datashark_ears Added
datashark_ears_inner Added
datashark_fin Added
datashark_tail Added
datashark_taildata Added
easternd_primary Added
easternd_secondary Added
fennec Added
fish_primary Added
fish_secondary Added
fluffy Added
fox_primary Added
fox_secondary Added
gecko_primary Added
gecko_secondary Added
gecko_tertiary Added
kitsune_primary Added
kitsune_secondary Added
maw Added
shadowkin_medium Added
shadowkin_shorter Added
shark_fin Added
shark_tail Added
snake Added
succubus Added

Resources/Textures/SimpleStation14/Mobs/Customization/tails64x32.rsi

State Old New Status
shadowkin Added
shadowkin_big Added
shadowkin_big_fluff Added

Resources/Textures/SimpleStation14/Mobs/Customization/wings64x34.rsi

State Old New Status
dragon Added
fly Added
robotic Added
skeleton Added

Resources/Textures/SimpleStation14/Mobs/Customization/wings96x34.rsi

State Old New Status
dragon_open Added
fly_open Added
megamoth Added
megamoth_open Added
mothra Added
mothra_open Added
skeleton_open Added

Edit: diff updated after 1aa8555

@OCOtheOmega
Copy link
Contributor

I could of course be wrong but the new icon system for hud requires a certain sprite size, otherwise they can be far away from the character, it's worth checking how all the wings look with the new sec hud.

@DEATHB4DEFEAT DEATHB4DEFEAT mentioned this pull request Dec 17, 2023
75 tasks
@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 17, 2024
Copy link
Contributor

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

@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 17, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit 0687286 into master Jan 18, 2024
12 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the markings branch January 18, 2024 07:00
SimpleStation14 added a commit that referenced this pull request Jan 18, 2024
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 Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants