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

Boxing Drobe #34

Merged
merged 5 commits into from
Sep 25, 2023
Merged

Boxing Drobe #34

merged 5 commits into from
Sep 25, 2023

Conversation

FluffiestFloof
Copy link
Contributor

@FluffiestFloof FluffiestFloof commented Sep 19, 2023

About the PR

Adds Boxing Drobe.

Why / Balance

Technical details

Media

ss (2023-09-19 at 05 08 49)

Breaking changes

Changelog

I should probably make sure I get everything related to a job at once. Oh well.

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

github-actions bot commented Sep 19, 2023

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

Resources/Textures/Nyanotrasen/Structures/Machines/VendingMachines/boxingdrobe.rsi

State Old New Status
broken Added
normal-unshaded Added
off Added
panel Added

Edit: diff updated after 103ba64

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

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

Signed-off-by: Fluffiest Floofers <[email protected]>
@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Sep 21, 2023
@Colin-Tel Colin-Tel enabled auto-merge (squash) September 25, 2023 17:24
@Colin-Tel Colin-Tel merged commit 70ee516 into DeltaV-Station:master Sep 25, 2023
@FluffiestFloof FluffiestFloof deleted the boxingdrobe branch September 27, 2023 08:52
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
Changes: YML Changes any yml files
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants