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

zero toy #36

Merged
merged 9 commits into from
Sep 27, 2023
Merged

zero toy #36

merged 9 commits into from
Sep 27, 2023

Conversation

toasterpm87
Copy link
Contributor

@toasterpm87 toasterpm87 commented Sep 20, 2023

adds a toy

About the PR

a toy

Why / Balance

Absolutely nothing will change

Technical details

yaml

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

adds a toy
@github-actions github-actions bot added Changes: Sprites Changes: YML Changes any yml files labels Sep 20, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Sep 20, 2023

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

Resources/Textures/DeltaV/Objects/Fun/Toys/zerotoy.rsi

State Old New Status
icon Added

Edit: diff updated after eaff4f2

@toasterpm87
Copy link
Contributor Author

im still setting up the github stuff, soon i will be able to get it working

@toasterpm87
Copy link
Contributor Author

to get photos of course

soup i want soup
@toasterpm87
Copy link
Contributor Author

I got all the recommendations done, I check later if it works in game my head hurts

qdfwqegwhretjrytuyhjm
@github-actions github-actions bot added the Status: Merge Conflict Fix your PR! label Sep 26, 2023
@github-actions
Copy link
Contributor

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

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
@github-actions github-actions bot removed the Status: Merge Conflict Fix your PR! label Sep 26, 2023
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@Colin-Tel Colin-Tel merged commit 9afee27 into DeltaV-Station:master Sep 27, 2023
14 checks passed
DeltaV-Bot pushed a commit that referenced this pull request Sep 27, 2023
@toasterpm87 toasterpm87 deleted the zero branch September 28, 2023 03:25
TypoChel1 pushed a commit to TypoChel1/Ifi07 that referenced this pull request Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants