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

[MIRROR] Bring Your Pet to Work Day (Veteran Quirk) #851

Merged
merged 1 commit into from
Nov 28, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25142

About The Pull Request

It's 2 am and I'm coding so I expect a lot of bugs, please yell them at me so I can fix :3

Veteran players can now choose a quirk that spawns them with a pet carrier in their hand, containing a simplemob/basic animal.

They can choose their pet from the quirks menu.

Some of the animals are TOO BIG to fit in the carriers and can't be put back in once taken out, but I really like the idea of some cowboy spaceman riding their horse into work, so I left in the big animals for the time being.

How This Contributes To The Skyrat Roleplay Experience

Who doesn't love pets? A lot of roleplay opportunities show up from pets, such as: hunting down and suing somebody because their pet duct spider killed your pet chinchilla (rest in peace to the chinchillas that died in testing this PR). There was a lot of discussion about more veteran perks in the discord and this seemed to be the most popular one.

Proof of Testing

Screenshots/Videos

image
image
(And upon discovering that horses reasonably aggro on you if you try to shove them back into a carrier, here is me getting beat to death on the Interlink by a pony)
image

Changelog

🆑 Thlumyn
add: Added pet owner quirk to spawn with a pet in a pet carrier.
/:cl:

* add pet owner quirk

* add mini pet carrier

* alphabetize and fix carrier

* fix parrot typepath

* remove rare/dangerous animals

* Fixing this merge conflict for you

merry thanksgiving

---------

Co-authored-by: Giz <[email protected]>
@Iajret Iajret merged commit 2f027b1 into master Nov 28, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25142 branch November 28, 2023 22:40
AnywayFarus added a commit that referenced this pull request Nov 28, 2023
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