diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index f117967620..0e88336c1f 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -177,6 +177,16 @@ var/global/list/holder_mob_icon_cache = list() for(var/mob/M in src.contents) M.attackby(W,user) +/obj/item/holder/chicken + origin_tech = list(TECH_BIO = 2) + +/obj/item/holder/chick + w_class = ITEMSIZE_TINY + origin_tech = list(TECH_BIO = 1) + +/obj/item/holder/lizard + w_class = ITEMSIZE_TINY + //Mob procs and vars for scooping up /mob/living/var/holder_type diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 285b3f7f4a..3cd75f9162 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -29,6 +29,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? meat_amount = 2 meat_type = /obj/item/reagent_containers/food/snacks/meat/chicken + holder_type = /obj/item/holder/chicken + var/eggsleft = 0 var/body_color @@ -131,6 +133,8 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? var/amount_grown = 0 + holder_type = /obj/item/holder/chick + /mob/living/simple_mob/animal/passive/chick/Initialize() . = ..() pixel_x = rand(-6, 6) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm index ca94f0373f..5a84056a1c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm @@ -23,6 +23,8 @@ say_list_type = /datum/say_list/lizard + holder_type = /obj/item/holder/lizard + /mob/living/simple_mob/animal/passive/lizard/large desc = "A cute, big lizard." maxHealth = 20 @@ -32,6 +34,7 @@ melee_damage_upper = 15 attack_sharp = TRUE + holder_type = null /mob/living/simple_mob/animal/passive/lizard/large/Initialize() . = ..() diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 8fe8eeef2f..46c8ca868a 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_holder.dmi b/icons/mob/items/lefthand_holder.dmi index d87d672940..d59e599e63 100644 Binary files a/icons/mob/items/lefthand_holder.dmi and b/icons/mob/items/lefthand_holder.dmi differ diff --git a/icons/mob/items/righthand_holder.dmi b/icons/mob/items/righthand_holder.dmi index 9f98dcbf31..f4c27c410f 100644 Binary files a/icons/mob/items/righthand_holder.dmi and b/icons/mob/items/righthand_holder.dmi differ diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi index 5a5244f9bf..3ff1d7c4ab 100644 Binary files a/icons/mob/species/teshari/head.dmi and b/icons/mob/species/teshari/head.dmi differ