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.

Sign up for GitHub

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

Jump to bottom

Candy #102

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Candy #102

merged 1 commit into from
Oct 5, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Oct 5, 2023 •
edited
Loading

About the PR

Lollipop and Gumball.

Next I'll probably try to make a module so they can be created by mediborgs.
Mediborgs first...

Why / Balance

Technical details

Media

  • [ ss (2023-10-05 at 01 51 50) ] I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

🆑

  • add: Added Lollipop and Gumball candies.

@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Oct 5, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Oct 5, 2023

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

Resources/Textures/Nyanotrasen/Objects/Consumable/Food/candy.rsi

State Old New Status
gumball Added
lollipop Added

@DebugOk
Copy link
Contributor

DebugOk commented Oct 5, 2023

Yummy, drug filled candy

@DebugOk DebugOk merged commit 06bc5e2 into DeltaV-Station:master Oct 5, 2023
12 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Oct 5, 2023
Automatic Changelog Update (#102)
0ca753c
@FluffiestFloof FluffiestFloof deleted the lolipop branch October 5, 2023 22:11
DebugOk referenced this pull request in DebugOk/Delta-v Oct 8, 2023
@FluffiestFloof @DebugOk
candy (#102)
65c3a11
DebugOk referenced this pull request in DebugOk/Delta-v Oct 8, 2023
@DebugOk
Automatic Changelog Update (#102)
9320bd1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: YML Changes any yml files
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FluffiestFloof @DebugOk