Adds fennec

code/modules/emotes/definitions/audible.dm

@@ -205,6 +205,14 @@
 	emote_message_3p = "purrs."
 	emote_sound = 'sound/voice/cat_purr_long.ogg'
 
+/decl/emote/audible/fennecscream
+	key = "fennecscream"
+	emote_message_3p = "screeches!"
+
+/decl/emote/audible/zoom
+	key = "zoom"
+	emote_message_3p = "zooms."
+
 /decl/emote/audible/teshsqueak
 	key = "surprised"
 	emote_message_1p = "You chirp in surprise!"

code/modules/mob/holder.dm

@@ -172,7 +172,14 @@ var/list/holder_mob_icon_cache = list()
 	origin_tech = list(TECH_BIO = 2)
 	item_state = "cat"
 
+<<<<<<< HEAD
 /obj/item/weapon/holder/cat/runtime
+=======
+/obj/item/holder/fennec
+	origin_tech = list(TECH_BIO = 2)
+
+/obj/item/holder/cat/runtime
+>>>>>>> e5b61683790... Merge pull request #8650 from Ketrai/fennec
 	origin_tech = list(TECH_BIO = 2, TECH_DATA = 4)
 
 /obj/item/weapon/holder/cat/cak

code/modules/mob/living/simple_mob/subtypes/animal/pets/fennec.dm

@@ -0,0 +1,57 @@
+var/global/list/_fennec_default_emotes = list(
+	/decl/emote/visible,
+	/decl/emote/visible/scratch,
+	/decl/emote/visible/drool,
+	/decl/emote/visible/nod,
+	/decl/emote/visible/sway,
+	/decl/emote/visible/sulk,
+	/decl/emote/visible/twitch,
+	/decl/emote/visible/twitch_v,
+	/decl/emote/visible/dance,
+	/decl/emote/visible/roll,
+	/decl/emote/visible/shake,
+	/decl/emote/visible/jump,
+	/decl/emote/visible/shiver,
+	/decl/emote/visible/collapse,
+	/decl/emote/visible/spin,
+	/decl/emote/visible/sidestep,
+	/decl/emote/audible,
+	/decl/emote/audible/whimper,
+	/decl/emote/audible/gasp,
+	/decl/emote/audible/scretch,
+	/decl/emote/audible/choke,
+	/decl/emote/audible/moan,
+	/decl/emote/audible/gnarl,
+	/decl/emote/audible/fennecscream,
+	/decl/emote/audible/zoom
+)
+
+/mob/living/simple_mob/animal/passive/fennec
+	name = "fennec"
+	desc = "A fox preferring arid climates, also known as a dingler, or a goob."
+	tt_desc = "Vulpes Zerda"
+	icon_state = "fennec"
+	item_state = "fennec"
+
+	movement_cooldown = 0.5 SECONDS
+
+	see_in_dark = 6
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+
+	holder_type = /obj/item/holder/fennec
+	mob_size = MOB_SMALL
+
+	has_langs = list("Cat, Dog") //they're similar, why not.
+
+/mob/living/simple_mob/animal/passive/fennec/faux
+	name = "faux"
+	desc = "Domesticated fennec. Seems to like screaming just as much though."
+
+/mob/living/simple_mob/animal/passive/fennec/Initialize()
+	icon_living = "[initial(icon_state)]"
+	icon_dead = "[initial(icon_state)]_dead"
+	icon_rest = "[initial(icon_state)]_rest"
+	update_icon()
+	return ..()