-
Notifications
You must be signed in to change notification settings - Fork 518
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
Melee Toy, Sprites - Dino Grabber #19900
Merged
NonQueueingMatt
merged 12 commits into
Aurorastation:master
from
courierbravo:dinograbber
Oct 14, 2024
Merged
Melee Toy, Sprites - Dino Grabber #19900
NonQueueingMatt
merged 12 commits into
Aurorastation:master
from
courierbravo:dinograbber
Oct 14, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
courierbravo
requested review from
Arrow768 and
alsoandanswer
as code owners
September 14, 2024 20:15
!review |
courierbravo
force-pushed
the
dinograbber
branch
from
September 14, 2024 23:55
bbe0036
to
181b673
Compare
BotBOREALIS
added
Sprites
Adds new or changes existing sprites.
and removed
Changelog Required
labels
Sep 14, 2024
Co-authored-by: Fluffy <[email protected]> Signed-off-by: courierbravo <[email protected]>
FluffyGhoster
approved these changes
Sep 15, 2024
Geevies
approved these changes
Sep 15, 2024
BotBOREALIS
added
Waiting Period
The PR has the required number of reviews, but is still in the waiting period
Awaiting Merge
and removed
Review Required
Waiting Period
The PR has the required number of reviews, but is still in the waiting period
labels
Sep 15, 2024
NonQueueingMatt
requested changes
Sep 21, 2024
NonQueueingMatt
added
the
Changes Required
The PR requires changes before it can be approved and/or merged.
label
Sep 21, 2024
NonQueueingMatt
approved these changes
Oct 13, 2024
NonQueueingMatt
removed
the
Changes Required
The PR requires changes before it can be approved and/or merged.
label
Oct 13, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Oct 13, 2024
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
Oct 14, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds a dino grabber toy to the game. It counts as a weapon, and uses modified whip code to have a chance of disarming people. Its also now in the warehouse spawn pool as a rare item, with the weight of 1.75. It should only show up every 2-3 rounds.
Also adds an object sprite and in hand sprites.