diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index c48b518fa19..163dd8ca170 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1216,6 +1216,12 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY containertype = /obj/structure/closet/critter/deer containername = "deer crate" +/datum/supply_packs/organic/bunny + name = "Bunny Crate" + cost = 1 // for testin init bruv + containertype = /obj/structure/closet/critter/bunny + containername = "bunny crate" + ////// hippy gear /datum/supply_packs/organic/hydroponics // -- Skie diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 69067bf740a..4c8e415cdda 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -89,3 +89,7 @@ /obj/structure/closet/critter/deer name = "deer crate" content_mob = /mob/living/simple_animal/deer + +/obj/structure/closet/critter/bunny + name = "bunny crate" + content_mob = /mob/living/simple_animal/bunny diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 3103b1609ec..110220c0f80 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -104,3 +104,9 @@ desc = "It's a small, disease-ridden rodent." icon = 'icons/mob/animal.dmi' icon_state = "mouse_gray" + +/obj/item/holder/bunny + name = "bunny" + desc = "Awww a cute bunny" + icon = 'icons/mob/animal.dmi' + icon_state = "m_bunny" diff --git a/code/modules/mob/living/simple_animal/friendly/bunny.dm b/code/modules/mob/living/simple_animal/friendly/bunny.dm new file mode 100644 index 00000000000..0e665c4222e --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/bunny.dm @@ -0,0 +1,35 @@ +/mob/living/simple_animal/bunny + name = "bunny" + real_name = "bunny" + desc = "Awww a cute bunny" + icon_state = "m_bunny" + icon_living = "m_bunny" + icon_dead = "bunny_dead" + icon_resting = "bunny_stretch" + emote_see = list("thumps", "sniffs at something", "hops around", "flips their ears up") + turns_per_move = 5 + see_in_dark = 6 + maxHealth = 10 + health = 10 + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat = 1) + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" + density = 0 + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_biotypes = MOB_ORGANIC | MOB_BEAST + mob_size = MOB_SIZE_TINY + layer = MOB_LAYER + atmos_requirements = list("min_oxy" = 16, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 223 //Below -50 Degrees Celcius + maxbodytemp = 323 //Above 50 Degrees Celcius + universal_speak = 0 + can_hide = TRUE + holder_type = /obj/item/holder/bunny + can_collar = TRUE + gold_core_spawnable = FRIENDLY_SPAWN + +/mob/living/simple_animal/bunny/attack_hand(mob/living/carbon/human/M) + if(M.a_intent == INTENT_HELP) + get_scooped(M) + ..() diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 549304a43f3..04b935e9722 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 8109e23d3cf..60b664f7596 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index a0b551e83bd..2e25a7e77e5 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 39636bd7bab..d5d071bc72d 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/paradise.dme b/paradise.dme index b6861bb6feb..c45fdec39e6 100644 --- a/paradise.dme +++ b/paradise.dme @@ -1990,6 +1990,7 @@ #include "code\modules\mob\living\simple_animal\bot\mulebot.dm" #include "code\modules\mob\living\simple_animal\bot\secbot.dm" #include "code\modules\mob\living\simple_animal\bot\syndicate.dm" +#include "code\modules\mob\living\simple_animal\friendly\bunny.dm" #include "code\modules\mob\living\simple_animal\friendly\butterfly.dm" #include "code\modules\mob\living\simple_animal\friendly\cat.dm" #include "code\modules\mob\living\simple_animal\friendly\cockroach.dm"