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

Bunch of Sprites and Stuff #430

Merged
merged 7 commits into from
Dec 27, 2024
Merged

Bunch of Sprites and Stuff #430

merged 7 commits into from
Dec 27, 2024

Conversation

Fansana
Copy link
Owner

@Fansana Fansana commented Dec 23, 2024

🆑

  • add: Added Eggnog, Syndicate Eggnog.
  • add: Added wooden railing.
  • add: More Plushies. Chill human, Slime Tider, Dragon
  • add: added tiger tail, lizard fin and crest
  • add: added eggnog and syndicate eggnog
  • add: THE GLACIER UPDATE

@github-actions github-actions bot added 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 labels Dec 23, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title bunch of sprites and stuff Bunch of Sprites and Stuff Dec 23, 2024
Copy link
Contributor

github-actions bot commented Dec 23, 2024

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

Resources/Textures/DeltaV/Mobs/Customization/Felinid/tiger_tail.rsi

State Old New Status
m_tail_tiger_primary Added
m_tail_tiger_secondary Added
m_tail_tiger_tertiary Added

Resources/Textures/Floof/Mobs/Customization/Felinid/tiger_tail.rsi

State Old New Status
m_tail_tiger_primary Added
m_tail_tiger_secondary Added
m_tail_tiger_tertiary Added

Resources/Textures/Floof/Mobs/Customization/Reptilian/crest_large.rsi

State Old New Status
primary Added
secondary Added

Resources/Textures/Floof/Mobs/Customization/Reptilian/fin.rsi

State Old New Status
primary Added
secondary Added

Resources/Textures/Floof/Objects/Consumable/Drinks/eggnog.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/syndicate_eggnog.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/Floof/Objects/Consumable/Drinks/syndicate_eggnog_bottle.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added
icon_open Added

Resources/Textures/Floof/Objects/Fun/floof_plush.rsi

State Old New Status
chill Added
dino Added
dragon Added
slime Added
tricera Added

Resources/Textures/Floof/Structures/Walls/railing.rsi

State Old New Status
corner Added
corner_small Added
round Added
side Added
wood_corner Added
wood_corner_small Added
wood_round Added
wood_side Added

Edit: diff updated after 6dd2b98

@github-actions github-actions bot added the Changes: Map Changes any yml file in the Maps directories label Dec 25, 2024
@Fansana Fansana merged commit 02b4481 into master Dec 27, 2024
14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Dec 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories 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