Merge pull request #13087 from VOREStation/upstream-merge-8650

[MIRROR] 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

@@ -173,6 +173,12 @@ var/list/holder_mob_icon_cache = list()
 	item_state = "cat"
 
 /obj/item/weapon/holder/cat/runtime
+
+/obj/item/holder/fennec
+	origin_tech = list(TECH_BIO = 2)
+
+/obj/item/holder/cat/runtime
+
 	origin_tech = list(TECH_BIO = 2, TECH_DATA = 4)
 
 /obj/item/weapon/holder/cat/cak

code/modules/mob/living/carbon/human/emote.dm

@@ -143,7 +143,9 @@ var/list/_human_default_emotes = list(
 	/decl/emote/audible/coyawoo2,
 	/decl/emote/audible/coyawoo3,
 	/decl/emote/audible/coyawoo4,
-	/decl/emote/audible/coyawoo5
+	/decl/emote/audible/coyawoo5,
+	/decl/emote/audible/fennecscream,
+	/decl/emote/audible/zoom
 	//VOREStation Add End
 )
 
@@ -273,7 +275,10 @@ var/list/_simple_mob_default_emotes = list(
 	/decl/emote/visible/blep,
 	/decl/emote/audible/prbt,
 	/decl/emote/audible/gyoh,
-	/decl/emote/audible/rumble
+	/decl/emote/audible/rumble,
+	/decl/emote/audible/fennecscream,
+	/decl/emote/audible/zoom
+
 	)
 	//VOREStation Add End
 

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

@@ -0,0 +1,29 @@
+/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 ..()

vorestation.dme

@@ -3216,6 +3216,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\dog.dm"
+#include "code\modules\mob\living\simple_mob\subtypes\animal\pets\fennec.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\fox_vr.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\parrot.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\diyaab.dm"