diff --git a/code/modules/mob/living/basic/farm_animals/chicken/chick.dm b/code/modules/mob/living/basic/farm_animals/chicken/chick.dm index 3c888145005..44d2c4a00ee 100644 --- a/code/modules/mob/living/basic/farm_animals/chicken/chick.dm +++ b/code/modules/mob/living/basic/farm_animals/chicken/chick.dm @@ -27,6 +27,8 @@ maxHealth = 3 pass_flags = PASSTABLE | PASSGRILLE | PASSMOB mob_size = MOB_SIZE_TINY + held_lh = 'icons/mob/inhands/pets_held_lh.dmi' + held_rh = 'icons/mob/inhands/pets_held_rh.dmi' gold_core_spawnable = FRIENDLY_SPAWN ai_controller = /datum/ai_controller/basic_controller/chick @@ -56,6 +58,7 @@ AddElement(/datum/element/pet_bonus, "chirp") AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW) + AddElement(/datum/element/can_be_held) if(!isnull(grow_as)) // we don't have a set time to grow up beyond whatever RNG dictates, and if we somehow get a client, all growth halts. AddComponent(\ @@ -71,7 +74,7 @@ /// We don't grow into a chicken if we're not conscious. /mob/living/basic/chick/proc/ready_to_grow() - return (stat == CONSCIOUS) + return (stat == CONSCIOUS) && !istype(loc, /obj/item/mob_holder) /// Variant of chick that just spawns in the holodeck so you can pet it. Doesn't grow up. /mob/living/basic/chick/permanent diff --git a/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm b/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm index 533f1c1a75b..b8dbefd78ab 100644 --- a/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm +++ b/code/modules/mob/living/basic/farm_animals/chicken/chicken.dm @@ -31,6 +31,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) maxHealth = 15 pass_flags = PASSTABLE | PASSMOB mob_size = MOB_SIZE_SMALL + held_lh = 'icons/mob/inhands/pets_held_lh.dmi' + held_rh = 'icons/mob/inhands/pets_held_rh.dmi' gold_core_spawnable = FRIENDLY_SPAWN ai_controller = /datum/ai_controller/basic_controller/chicken @@ -60,6 +62,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) AddElement(/datum/element/footstep, FOOTSTEP_MOB_CLAW) AddElement(/datum/element/swabable, CELL_LINE_TABLE_CHICKEN, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) AddElement(/datum/element/animal_variety, "chicken", pick("brown", "black", "white"), modify_pixels = TRUE) + AddElement(/datum/element/can_be_held) + AddComponent(\ /datum/component/egg_layer,\ /obj/item/food/egg/organic,\ diff --git a/icons/mob/inhands/pets_held_lh.dmi b/icons/mob/inhands/pets_held_lh.dmi index 1a864db1341..ec564d01fc2 100644 Binary files a/icons/mob/inhands/pets_held_lh.dmi and b/icons/mob/inhands/pets_held_lh.dmi differ diff --git a/icons/mob/inhands/pets_held_rh.dmi b/icons/mob/inhands/pets_held_rh.dmi index 39332a7e18e..77b4b8a00e4 100644 Binary files a/icons/mob/inhands/pets_held_rh.dmi and b/icons/mob/inhands/pets_held_rh.dmi differ