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

Carry-able chickens (and lizards) #9263

Merged
merged 1 commit into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,6 +34,7 @@
melee_damage_upper = 15

attack_sharp = TRUE
holder_type = null

/mob/living/simple_mob/animal/passive/lizard/large/Initialize()
. = ..()
Expand Down
Binary file modified icons/mob/head.dmi
Binary file not shown.
Binary file modified icons/mob/items/lefthand_holder.dmi
Binary file not shown.
Binary file modified icons/mob/items/righthand_holder.dmi
Binary file not shown.
Binary file modified icons/mob/species/teshari/head.dmi
Binary file not shown.