mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-28 01:51:46 +00:00
ebc0227176
About The Pull Request
Made a basic version of the pet base called /mob/living/basic/pet. It's significantly more stripped down from the old simple_animal one, because its half collar stuff and...
Made the collar slot a component that you could theoretically remove from a pet to disable the behavior, or add to any other living mob as long as you set up the icon states for the collar (or not, the visuals are optional).
The corgi's collar strippable slot is now generally the pet collar slot, and in theory could be used for other pet stripping screens.
I also gutted the extra access card code from /mob/living/basic/pet as it's only being used by corgis. Having a physical ID is now just inherent to corgis, as they're the only ones that could equip it anyway.
Ported the make_babies() function from simple_animals to a new subtree and associated behavior, called /datum/ai_planning_subtree/make_babies that uses blackboards to know the animal-specific info.
Note that it's marginally improved, as the female walks to the male first instead of bluespace reproduction.
Tweaked and improved the dog AI to work as a basic mob, including making /datum/idle_behavior/idle_dog fully functional.
Made a /datum/ai_planning_subtree/random_speech/dog that pulls the dynamic speech and emotes to support dog fashion.
I've tested base collars across multiple pet types.
For dogs, I've tested general behavior, fetching, reproduction, dog fashion, and deadchat_plays, covering all the oddities I'm aware of.
image
Why It's Good For The Game
Very big mob converted to a basic mob.
Changelog
cl
fix: Lisa no longer uses bluespace when interacting with Ian.
refactor: A large portion of dog code was re-written; please report any strange bugs.
/cl
32 lines
1.1 KiB
Plaintext
32 lines
1.1 KiB
Plaintext
// All of these must be matched in StripMenu.js.
|
|
#define STRIPPABLE_ITEM_HEAD "head"
|
|
#define STRIPPABLE_ITEM_BACK "back"
|
|
#define STRIPPABLE_ITEM_MASK "mask"
|
|
#define STRIPPABLE_ITEM_NECK "neck"
|
|
#define STRIPPABLE_ITEM_EYES "eyes"
|
|
#define STRIPPABLE_ITEM_EARS "ears"
|
|
#define STRIPPABLE_ITEM_JUMPSUIT "jumpsuit"
|
|
#define STRIPPABLE_ITEM_SUIT "suit"
|
|
#define STRIPPABLE_ITEM_GLOVES "gloves"
|
|
#define STRIPPABLE_ITEM_FEET "shoes"
|
|
#define STRIPPABLE_ITEM_SUIT_STORAGE "suit_storage"
|
|
#define STRIPPABLE_ITEM_ID "id"
|
|
#define STRIPPABLE_ITEM_BELT "belt"
|
|
#define STRIPPABLE_ITEM_LPOCKET "left_pocket"
|
|
#define STRIPPABLE_ITEM_RPOCKET "right_pocket"
|
|
#define STRIPPABLE_ITEM_LHAND "left_hand"
|
|
#define STRIPPABLE_ITEM_RHAND "right_hand"
|
|
#define STRIPPABLE_ITEM_HANDCUFFS "handcuffs"
|
|
#define STRIPPABLE_ITEM_LEGCUFFS "legcuffs"
|
|
#define STRIPPABLE_ITEM_PET_COLLAR "pet_collar"
|
|
#define STRIPPABLE_ITEM_PARROT_HEADSET "parrot_headset"
|
|
|
|
/// This slot is not obscured.
|
|
#define STRIPPABLE_OBSCURING_NONE 0
|
|
|
|
/// This slot is completely obscured, and cannot be accessed.
|
|
#define STRIPPABLE_OBSCURING_COMPLETELY 1
|
|
|
|
/// This slot can't be seen, but can be accessed.
|
|
#define STRIPPABLE_OBSCURING_HIDDEN 2
|