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] [MODULAR] Pet Code Improvements + Donator item for Centralsmith #2289

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: NovaSector/NovaSector#1136

About The Pull Request

This PR adds Centralsmith's requested donator item - a happy mothroach by the name of Mr. Fluff - alongside support for bespoke, ckey-restricted pets granted through the Loadout given through a mob_holder item subtype that spawns a pet in & adds the owner as a friend, and some QOL changes to the Pet Owner quirk.

While I was at fixing things, Pet Owners can now pick the gender of their pet, and are added as the pets' Friends, meaning associated AI functionality is now enabled.

How This Contributes To The Nova Sector Roleplay Experience

Donator item was requested, and the Pet Owner quirk is shaping up to be a fan favorite - so I wanted to give it some love!

Proof of Testing

Screenshots/Videos (image not showing the ckey restrictions in place yet)

image

image

Space.Station.13.2024-02-25.17-20-47.mp4

Changelog

🆑 CliffracerX
add: added central's donator item
qol: you can pick your pet's gender now
code: support for donator pets as inhand loadout items
code: Pet Owner pets actually consider you a friend now
/:cl:

* Initial commit: functional Mr. Fluff for Central

* Renamable inhand pets + gib protection

* Pet quirk expansion, Pt 1

All pets from the Pet Owner quirk will consider you a Friend.  Mothroaches, cats/kittens, and all types of dogs from the Pet Owner quirk are gib-protected.  Mothroaches, cats/kittens, and foxes from the quirk now have unique lists of pet commands - though beware, hungry kittens will prioritize mooching off you over any commands you give them!  You can now pick your pet's gender.  The dropdown for picking pet type is no longer labelled "Pet Owner."

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <[email protected]>

* Applying Golden's suggestions, Pt 2

* Splitting pet owner subtypes into a separate PR

Leaving the code improvements for gender selection & the dropdown name though

* Apply suggestions from code review

Co-authored-by: Bloop <[email protected]>

* Fixing compile error

* Probably don't need the sanity checks in init

* Removing snowflake code from loadout_datum

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Co-authored-by: Bloop <[email protected]>
@Steals-The-PRs Steals-The-PRs added Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror labels Mar 7, 2024
@Iajret Iajret merged commit 7bae88a into master Mar 7, 2024
23 checks passed
@Iajret Iajret deleted the upstream-mirror-1136 branch March 7, 2024 10:18
AnywayFarus added a commit that referenced this pull request Mar 7, 2024
Iajret pushed a commit that referenced this pull request May 3, 2024
* adds pharmacist labcoat to chemvendor & loadout

* taur crop flags

* taur flags

* Update modular_nova/master_files/code/modules/clothing/suits/labcoat.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* Update modular_nova/modules/loadouts/loadout_items/loadout_datum_suit.dm

Co-authored-by: GoldenAlpharex <[email protected]>

* modular

---------

Co-authored-by: GoldenAlpharex <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Mirroring conflict git cherry-pick во что-то уткнулся. Не ставить вручную, только для бота Nova Mirror Sprites
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants