Merge pull request #8663 from Cerebulon/nerffox

Nerfs Fennec

code/modules/emotes/definitions/audible.dm

@@ -204,14 +204,10 @@
 	emote_message_3p = "purrs."
 	emote_sound = 'sound/voice/cat_purr_long.ogg'
 
-/decl/emote/audible/fennecscream
-	key = "fennecscream"
+/decl/emote/audible/karikscream
+	key = "karikscream"
 	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/emotes/definitions/visible.dm

@@ -331,3 +331,7 @@
 /decl/emote/visible/tilt
 	key = "tilt"
 	emote_message_3p = "tilts USER_THEIR head."
+
+/decl/emote/visible/zoom
+	key = "zoom"
+	emote_message_3p = "zooms around the place."

code/modules/mob/holder.dm

@@ -144,7 +144,7 @@ var/global/list/holder_mob_icon_cache = list()
 /obj/item/holder/cat
 	origin_tech = list(TECH_BIO = 2)
 
-/obj/item/holder/fennec
+/obj/item/holder/karik
 	origin_tech = list(TECH_BIO = 2)
 
 /obj/item/holder/cat/runtime

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

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

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

@@ -0,0 +1,74 @@
+/datum/category_item/catalogue/fauna/karik
+	name = "Meralar Fauna - Karik"
+	desc = "Classification: M Vulpes etari \
+	<br><br>\
+	A common fox-like mammalian species originating from the cool coastal sand dunes of the Etari \
+	Archipelago on Meralar, though they are a common sight throughout Tajaran society due to the \
+	breeding of a domestic variety, the 'karik ekan' by the Njarjirii as far back as the 18th Century.\
+	<br><br>\
+	The Karik is primarily a piscivore in its natural habitat, hunting by submerging its head in \
+    shallow waters and detecting even the smallest movements of shore fish with its large, highly \
+    sensitive ears. When access to fish is limited, increasingly the case due to modern ocean pollution \
+    and loss of habitat, the Karik may survive on an omnivorous diet of opportunistic forage.\
+	<br><br>\
+	Wild Karik are rare outside of Meralar, though feral populations have proven fairly well \
+	adapted to the Sivian environment."
+	value = CATALOGUER_REWARD_MEDIUM
+
+var/global/list/_karik_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/visible/zoom,
+	/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/karikscream
+)
+
+/mob/living/simple_mob/animal/passive/karik
+	name = "karik"
+	desc = "A fox-like creature from the coastal dunes of Meralar, known for its ear-piercing cry."
+	tt_desc = "M Vulpes Etari"
+	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/karik
+	mob_size = MOB_SMALL
+
+	has_langs = list("Cat, Dog") //they're similar, why not.
+
+/mob/living/simple_mob/animal/passive/karik/tame
+	name = "karik ekan"
+	desc = "A domesticated variety of karik. Seems to like screaming just as much though."
+
+/mob/living/simple_mob/animal/passive/karik/Initialize()
+	icon_living = "[initial(icon_state)]"
+	icon_dead = "[initial(icon_state)]_dead"
+	icon_rest = "[initial(icon_state)]_rest"
+	update_icon()
+	return ..()

polaris.dme

@@ -2469,7 +2469,7 @@
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\bird.dm"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\pets\cat.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\karik.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"
 #include "code\modules\mob\living\simple_mob\subtypes\animal\sif\duck.dm"