diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 36f97bc43c2..1c3e24152da 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -769,6 +769,12 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine containertype = /obj/structure/closet/critter/pug containername = "pug crate" +/datum/supply_packs/organic/fox + name = "Fox Crate" + cost = 55 //Foxes are cool. + containertype = /obj/structure/closet/critter/fox + containername = "fox crate" + ////// hippy gear /datum/supply_packs/organic/hydroponics // -- Skie diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm index 44d88ac7089..56c8b30a385 100644 --- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm @@ -77,3 +77,7 @@ /obj/structure/closet/critter/pug name = "pug crate" content_mob = /mob/living/simple_animal/pug + +/obj/structure/closet/critter/fox + name = "fox crate" + content_mob = /mob/living/simple_animal/fox \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm new file mode 100644 index 00000000000..dc614d5665c --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/fox.dm @@ -0,0 +1,23 @@ +//Foxxy +/mob/living/simple_animal/fox + name = "fox" + desc = "It's a fox. I wonder what it says?" + icon_state = "fox" + icon_living = "fox" + icon_dead = "fox_dead" + speak = list("Ack-Ack","Ack-Ack-Ack-Ackawoooo","Geckers","Awoo","Tchoff") + speak_emote = list("geckers", "barks") + emote_hear = list("howls","barks") + emote_see = list("shakes its head", "shivers") + speak_chance = 1 + turns_per_move = 5 + see_in_dark = 6 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "kicks" + +//Captain fox +/mob/living/simple_animal/fox/Renault + name = "Renault" + desc = "Renault, the Captain's trustworthy fox. I wonder what it says?" \ No newline at end of file diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index d79a35219d0..aa4f32157b4 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -196,7 +196,7 @@ proc/wabbajack(mob/living/M) if("magicarp") new_mob = new /mob/living/simple_animal/hostile/carp/ranged(M.loc) if("chaosmagicarp") new_mob = new /mob/living/simple_animal/hostile/carp/ranged/chaos(M.loc) else - var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick") + var/animal = pick("parrot","corgi","crab","pug","cat","mouse","chicken","cow","lizard","chick","fox") switch(animal) if("parrot") new_mob = new /mob/living/simple_animal/parrot(M.loc) if("corgi") new_mob = new /mob/living/simple_animal/corgi(M.loc) @@ -207,6 +207,7 @@ proc/wabbajack(mob/living/M) if("chicken") new_mob = new /mob/living/simple_animal/chicken(M.loc) if("cow") new_mob = new /mob/living/simple_animal/cow(M.loc) if("lizard") new_mob = new /mob/living/simple_animal/lizard(M.loc) + if("fox") new_mob = new /mob/living/simple_animal/fox(M.loc) else new_mob = new /mob/living/simple_animal/chick(M.loc) new_mob.languages |= HUMAN if("human") diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index 05e667d2553..29d459c6260 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/tgstation.dme b/tgstation.dme index f7653dd2169..7b231a1d343 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1153,6 +1153,7 @@ #include "code\modules\mob\living\simple_animal\friendly\crab.dm" #include "code\modules\mob\living\simple_animal\friendly\drone.dm" #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm" +#include "code\modules\mob\living\simple_animal\friendly\fox.dm" #include "code\modules\mob\living\simple_animal\friendly\lizard.dm" #include "code\modules\mob\living\simple_animal\friendly\mouse.dm" #include "code\modules\mob\living\simple_animal\friendly\pug.dm"