Merge pull request #16996 from hal9000PR/bnuuy

Adds Bunnies.
This commit is contained in:
variableundefined
2021-10-31 22:24:31 -05:00
committed by GitHub
9 changed files with 50 additions and 0 deletions
+6
View File
@@ -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 = 20
containertype = /obj/structure/closet/critter/bunny
containername = "bunny crate"
////// hippy gear
/datum/supply_packs/organic/hydroponics // -- Skie
@@ -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
+6
View File
@@ -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"
@@ -0,0 +1,33 @@
/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 = FALSE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_biotypes = MOB_ORGANIC | MOB_BEAST
mob_size = MOB_SIZE_TINY
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
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)
..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 KiB

After

Width:  |  Height:  |  Size: 295 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 KiB

After

Width:  |  Height:  |  Size: 251 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 175 KiB

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 172 KiB

After

Width:  |  Height:  |  Size: 173 KiB

+1
View File
@@ -2011,6 +2011,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"