Skip to content

[Resprite] Mugs & Cafe Latte - #306

Open
YaraaraY wants to merge 2 commits into
funky-station:masterfrom
YaraaraY:mugs
Open

[Resprite] Mugs & Cafe Latte#306
YaraaraY wants to merge 2 commits into
funky-station:masterfrom
YaraaraY:mugs

Conversation

@YaraaraY

Copy link
Copy Markdown
Collaborator

About the PR

Ports funky-station/funky-station#1938 and funky-station/funky-station#2057 with some minor edits, and adds a new sprite and inhands for the cafe latte.

Why / Balance

Parity, looks nice.

Technical details

Redirected YAMLs

Test plan

Spawn mugs and latte in game.

Media

image

Requirements

  • I have read and am following the Macrocosm Pull Request Conventions.
  • I have tested this pull request and written instructions on how to test it
  • I have added media to this PR or it does not require an in-game showcase.
  • If I am porting something, I have done my best to respect the appropriate licenses associated with the presented changes.

License

MIT

Changelog

🆑 AraiMaia

  • add: Resprited mugs and cafe latte.

@github-actions

github-actions Bot commented Aug 10, 2026

Copy link
Copy Markdown
Contributor

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

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/cafe_latte.rsi

State Old New Status
fill-1 Added
icon-vend Added
icon Added
icon_empty Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon-vend-brown Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_black.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_blue.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_green.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_heart.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_metal.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_moebius.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_one.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_rainbow.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/_Funkystation/Objects/Consumable/Drinks/mug_red.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 3c52143

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant