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.

Sign up for GitHub

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] Re-adds some cat things that got lost in their refactor as basic pets. #1718

Merged
merged 1 commit into from
Jan 29, 2024
Merged

[MIRROR] Re-adds some cat things that got lost in their refactor as basic pets. #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/modules/mob/living/basic/pets/cat/cat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@
. = ..()
AddElement(/datum/element/ai_retaliate)
AddElement(/datum/element/pet_bonus, "purrs!")
AddElement(/datum/element/footstep, footstep_type = FOOTSTEP_MOB_CLAW)
add_cell_sample()
add_verb(src, /mob/living/proc/toggle_resting)
add_traits(list(TRAIT_CATLIKE_GRACE, TRAIT_VENTCRAWLER_ALWAYS), INNATE_TRAIT)
ai_controller.set_blackboard_key(BB_HUNTABLE_PREY, typecacheof(huntable_items))
Expand All @@ -64,6 +66,9 @@
if(can_interact_with_stove)
RegisterSignal(src, COMSIG_LIVING_EARLY_UNARMED_ATTACK, PROC_REF(pre_unarmed_attack))

/mob/living/basic/pet/cat/proc/add_cell_sample()
AddElement(/datum/element/swabable, CELL_LINE_TABLE_CAT, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5)

/mob/living/basic/pet/cat/proc/pre_attack(mob/living/source, atom/movable/target)
SIGNAL_HANDLER
if(!is_type_in_list(target, huntable_items) || held_food)
Expand Down Expand Up @@ -150,6 +155,8 @@
/obj/item/food/breadslice/plain = 1
)

/mob/living/basic/pet/cat/breadcat/add_cell_sample()
return

/mob/living/basic/pet/cat/original
name = "Batsy"
Expand All @@ -162,6 +169,9 @@
unique_pet = TRUE
held_state = "original"

/mob/living/basic/pet/cat/original/add_cell_sample()
return

/mob/living/basic/pet/cat/kitten
name = "kitten"
desc = "D'aaawwww."
Expand Down
3 changes: 3 additions & 0 deletions code/modules/mob/living/basic/pets/cat/keeki.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@
)
AddElement(/datum/element/consumable_mob, reagents_list = on_consume)

/mob/living/basic/pet/cat/cak/add_cell_sample()
return

/mob/living/basic/pet/cat/cak/CheckParts(list/parts)
. = ..()
var/obj/item/organ/internal/brain/candidate = locate(/obj/item/organ/internal/brain) in contents
Expand Down
Loading