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

Melee Toy, Sprites - Dino Grabber #19900

Merged
merged 12 commits into from
Oct 14, 2024

Conversation

courierbravo
Copy link
Contributor

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.

@BotBOREALIS BotBOREALIS added the Sprites Adds new or changes existing sprites. label Sep 14, 2024
@courierbravo
Copy link
Contributor Author

!review

@github-actions github-actions bot removed the Sprites Adds new or changes existing sprites. label Sep 14, 2024
@BotBOREALIS BotBOREALIS added Sprites Adds new or changes existing sprites. and removed Changelog Required labels Sep 14, 2024
@BotBOREALIS 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 NonQueueingMatt added the Changes Required The PR requires changes before it can be approved and/or merged. label Sep 21, 2024
@NonQueueingMatt NonQueueingMatt removed the Changes Required The PR requires changes before it can be approved and/or merged. label Oct 13, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Oct 13, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 13, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Oct 14, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 14, 2024
@NonQueueingMatt NonQueueingMatt added this pull request to the merge queue Oct 14, 2024
Merged via the queue into Aurorastation:master with commit 86d7e82 Oct 14, 2024
25 checks passed
@courierbravo courierbravo deleted the dinograbber branch October 18, 2024 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting Merge Sprites Adds new or changes existing sprites.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants