Merge pull request #1156 from Fox-McCloud/spess-dogs

New Race: Canine Race--Vulpkanin

code/modules/client/preferences.dm

@@ -352,7 +352,7 @@ datum/preferences
 				dat += "<br><b>Eyes</b><br>"
 				dat += "<a href='?_src_=prefs;preference=eyes;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes, 2)]'><table  style='display:inline;' bgcolor='#[num2hex(r_eyes, 2)][num2hex(g_eyes, 2)][num2hex(b_eyes)]'><tr><td>__</td></tr></table></font><br>"
 
-				if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
+				if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People" || species == "Vulpkanin")
 					dat += "<br><b>Body Color</b><br>"
 					dat += "<a href='?_src_=prefs;preference=skin;task=input'>Change Color</a> <font face='fixedsys' size='3' color='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin, 2)]'><table style='display:inline;' bgcolor='#[num2hex(r_skin, 2)][num2hex(g_skin, 2)][num2hex(b_skin)]'><tr><td>__</td></tr></table></font>"
 
@@ -970,7 +970,7 @@ datum/preferences
 					if("age")
 						age = rand(AGE_MIN, AGE_MAX)
 					if("hair")
-						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Wryn")
+						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Wryn" || species == "Vulpkanin")
 							r_hair = rand(0,255)
 							g_hair = rand(0,255)
 							b_hair = rand(0,255)
@@ -996,7 +996,7 @@ datum/preferences
 						if(species == "Human")
 							s_tone = random_skin_tone()
 					if("s_color")
-						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People" || species == "Wryn")
+						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People" || species == "Wryn" || species == "Vulpkanin")
 							r_skin = rand(0,255)
 							g_skin = rand(0,255)
 							b_skin = rand(0,255)
@@ -1023,7 +1023,7 @@ datum/preferences
 							age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
 					if("species")
 
-						var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona")
+						var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona", "Vulpkanin")
 						var/prev_species = species
 //						var/whitelisted = 0
 
@@ -1119,7 +1119,7 @@ datum/preferences
 							b_type = new_b_type
 
 					if("hair")
-						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine")
+						if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin")
 							var/input = "Choose your character's hair colour:"
 							if(species == "Machine")
 								input = "Choose your character's frame colour:"
@@ -1202,7 +1202,7 @@ datum/preferences
 							s_tone = 35 - max(min( round(new_s_tone), 220),1)
 
 					if("skin")
-						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People")
+						if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Slime People"|| species == "Vulpkanin")
 							var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null
 							if(new_skin)
 								r_skin = hex2num(copytext(new_skin, 2, 4))

code/modules/mob/language.dm

@@ -180,6 +180,20 @@
 		new_name += ..(gender,1)
 	return new_name
 
+/datum/language/vulpkanin
+	name = "Canilunzt"
+	desc = "The guttural language spoken and utilized by the inhabitants of Vazzend system, composed of growls, barks, yaps, and heavy utilization of ears and tail movements.Vulpkanin speak this language with ease."
+	speech_verb = "rawrs"
+	ask_verb = "rurs"
+	exclaim_verb = "barks"
+	colour = "vulpkanin"
+	key = "7"
+	flags = RESTRICTED
+	syllables = list("rur","ya","cen","rawr","bar","kuk","tek","qat","uk","wu","vuh","tah","tch","schz","auch", \
+	"ist","ein","entch","zwichs","tut","mir","wo","bis","es","vor","nic","gro","lll","enem","zandt","tzch","noch", \
+	"hel","ischt","far","wa","baram","iereng","tech","lach","sam","mak","lich","gen","or","ag","eck","gec","stag","onn", \
+	"bin","ket","jarl","vulf","einech","cresthz","azunein","ghzth")
+
 /datum/language/skrell
 	name = "Skrellian"
 	desc = "A melodic and complex language spoken by the Skrell of Qerrbalak. Some of the notes are inaudible to humans."

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

@@ -62,6 +62,10 @@
 	h_style = "Tajaran Ears"
 	..(new_loc, "Tajaran")
 
+/mob/living/carbon/human/vulpkanin/New(var/new_loc)
+	h_style = "Bald"
+	..(new_loc, "Vulpkanin")
+
 /mob/living/carbon/human/unathi/New(var/new_loc)
 	h_style = "Unathi Horns"
 	..(new_loc, "Unathi")

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -24,6 +24,13 @@
 	icon_state = "tajkey1"
 	uni_append = list(0x0A0,0xE00) // 0A0E00
 
+/mob/living/carbon/monkey/vulpkanin
+	name = "wolpin"
+	voice_name = "wolpin"
+	speak_emote = list("yaps")
+	icon_state = "tajkey1"
+	uni_append = list(0x066,0x4FE)
+
 /mob/living/carbon/monkey/skrell
 	name = "neaera"
 	voice_name = "neaera"
@@ -106,6 +113,13 @@
 	dna.species = "Tajaran"
 	add_language("Siik'tajr")
 
+/mob/living/carbon/monkey/vulpkanin/New()
+
+	..()
+	greaterform = "Vulpkanin"
+	dna.species = "Vulpkanin"
+	add_language("Canilunzt")
+
 /mob/living/carbon/monkey/diona/New()
 
 	..()

code/modules/mob/living/carbon/species.dm

@@ -410,6 +410,35 @@
 
 	H.stop_tail_wagging(1)
 
+/datum/species/vulpkanin
+	name = "Vulpkanin"
+	icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
+	deform = 'icons/mob/human_races/r_vulpkanin.dmi'
+	path = /mob/living/carbon/human/vulpkanin
+	default_language = "Galactic Common"
+	language = "Canilunzt"
+	primitive = /mob/living/carbon/monkey/vulpkanin
+	tail = "vulptail"
+	unarmed_type = /datum/unarmed_attack/claws
+	darksight = 8
+
+	blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \
+	dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \
+	culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \
+	to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \
+    which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent."
+
+	flags = HAS_LIPS | HAS_UNDERWEAR
+	bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
+	dietflags = DIET_OMNI
+
+	flesh_color = "#966464"
+	base_color = "#BE8264"
+
+/datum/species/vulpkanin/handle_death(var/mob/living/carbon/human/H)
+
+	H.stop_tail_wagging(1)
+
 /datum/species/skrell
 	name = "Skrell"
 	icobase = 'icons/mob/human_races/r_skrell.dmi'

code/modules/mob/living/silicon/ai/ai.dm

@@ -147,6 +147,7 @@ var/list/ai_verbs_default = list(
 	add_language("Gutter", 0)
 	add_language("Sinta'unathi", 0)
 	add_language("Siik'tajr", 0)
+	add_language("Canilunzt", 0)
 	add_language("Skrellian", 0)
 	add_language("Vox-pidgin", 0)
 	add_language("Rootspeak", 0)

code/modules/mob/living/silicon/pai/software_modules.dm

@@ -484,6 +484,7 @@
 		if(user.translator_on)
 			user.add_language("Sinta'unathi")
 			user.add_language("Siik'tajr")
+			user.add_language("Canilunzt")
 			user.add_language("Skrellian")
 			user.add_language("Vox-pidgin")
 			user.add_language("Rootspeak")
@@ -493,6 +494,7 @@
 		else
 			user.remove_language("Sinta'unathi")
 			user.remove_language("Siik'tajr")
+			user.remove_language("Canilunzt")
 			user.remove_language("Skrellian")
 			user.remove_language("Vox-pidgin")
 			user.remove_language("Rootspeak")

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -65,6 +65,7 @@
 	R.add_language("Gutter", 0)
 	R.add_language("Sinta'unathi", 0)
 	R.add_language("Siik'tajr", 0)
+	R.add_language("Canilunzt", 0)
 	R.add_language("Skrellian", 0)
 	R.add_language("Vox-pidgin", 0)
 	R.add_language("Rootspeak", 0)
@@ -275,6 +276,7 @@
 	R.add_language("Gutter", 1)
 	R.add_language("Sinta'unathi", 1)
 	R.add_language("Siik'tajr", 1)
+	R.add_language("Canilunzt", 1)
 	R.add_language("Skrellian", 1)
 	R.add_language("Vox-pidgin", 1)
 	R.add_language("Rootspeak", 1)

code/modules/mob/new_player/preferences_setup.dm

@@ -10,11 +10,11 @@ datum/preferences
 			s_tone = random_skin_tone()
 		h_style = random_hair_style(gender, species)
 		f_style = random_facial_hair_style(gender, species)
-		if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine")
+		if(species == "Human" || species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine" || species == "Vulpkanin")
 			randomize_hair_color("hair")
 		randomize_hair_color("facial")
 		randomize_eyes_color()
-		if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
+		if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Vulpkanin")
 			randomize_skin_color()
 		underwear = rand(1,underwear_m.len)
 		undershirt = rand(1,undershirt_t.len)

code/modules/mob/new_player/sprite_accessories.dm

@@ -434,7 +434,7 @@
 		name = "Shaved"
 		icon_state = "bald"
 		gender = NEUTER
-		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Kidan","Greys","Machine")
+		species_allowed = list("Human","Unathi","Tajaran","Skrell","Vox","Diona","Kidan","Greys","Machine", "Vulpkanin")
 
 
 	watson
@@ -659,6 +659,85 @@
 		icon_state = "hair_messy"
 		species_allowed = list("Tajaran")
 
+//Vulpkanin
+
+	vulp_hair_none
+		name = "None"
+		icon_state = "bald"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_kajam
+		name = "Kajam"
+		icon_state = "kajam"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_keid
+		name = "Keid"
+		icon_state = "keid"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_adhara
+		name = "Adhara"
+		icon_state = "adhara"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_kleeia
+		name = "Kleeia"
+		icon_state = "kleeia"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_mizar
+		name = "Mizar"
+		icon_state = "mizar"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_apollo
+		name = "Apollo"
+		icon_state = "apollo"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_belle
+		name = "Belle"
+		icon_state = "belle"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_bun
+		name = "Bun"
+		icon_state = "bun"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_jagged
+		name = "Jagged"
+		icon_state = "jagged"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_curl
+		name = "Curl"
+		icon_state = "curl"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_hawk
+		name = "Hawk"
+		icon_state = "hawk"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_anita
+		name = "Anita"
+		icon_state = "anita"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_short
+		name = "Short"
+		icon_state = "short"
+		species_allowed = list("Vulpkanin")
+
+	vulp_hair_spike
+		name = "Spike"
+		icon_state = "spike"
+		species_allowed = list("Vulpkanin")
+
+//Vox
+
 	vox_quills_short
 		name = "Short Vox Quills"
 		icon_state = "vox_shortquills"
@@ -767,6 +846,48 @@
 		icon_state = "facial_smallstache"
 		species_allowed = list("Tajaran")
 
+//Vulpkanin
+
+	vulp_blaze
+		name = "Blaze"
+		icon_state = "vulp_facial_blaze"
+		species_allowed = list("Vulpkanin")
+
+	vulp_vulpine
+		name = "Vulpine"
+		icon_state = "vulp_facial_vulpine"
+		species_allowed = list("Vulpkanin")
+
+	vulp_earfluff
+		name = "Earfluff"
+		icon_state = "vulp_facial_earfluff"
+		species_allowed = list("Vulpkanin")
+
+	vulp_mask
+		name = "Mask"
+		icon_state = "vulp_facial_mask"
+		species_allowed = list("Vulpkanin")
+
+	vulp_patch
+		name = "Patch"
+		icon_state = "vulp_facial_patch"
+		species_allowed = list("Vulpkanin")
+
+	vulp_ruff
+		name = "Ruff"
+		icon_state = "vulp_facial_ruff"
+		species_allowed = list("Vulpkanin")
+
+	vulp_kita
+		name = "Kita"
+		icon_state = "vulp_facial_kita"
+		species_allowed = list("Vulpkanin")
+
+	vulp_swift
+		name = "Swift"
+		icon_state = "vulp_facial_swift"
+		species_allowed = list("Vulpkanin")
+
 //skin styles - WIP
 //going to have to re-integrate this with surgery
 //let the icon_state hold an icon preview for now
@@ -789,6 +910,12 @@
 		icon = 'icons/mob/human_races/r_tajaran.dmi'
 		species_allowed = list("Tajaran")
 
+	vulpkanin
+		name = "Default Vulpkanin skin"
+		icon_state = "default"
+		icon = 'icons/mob/human_races/r_vulpkanin.dmi'
+		species_allowed = list("Vulpkanin")
+
 	unathi
 		name = "Default Unathi skin"
 		icon_state = "default"

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1751,6 +1751,13 @@
 	name = "farwa cube"
 	monkey_type =/mob/living/carbon/monkey/tajara
 
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wolpincube
+	name = "wolpin cube"
+	monkey_type = /mob/living/carbon/monkey/vulpkanin
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/wolpincube
+	name = "wolpin cube"
+	monkey_type = /mob/living/carbon/monkey/vulpkanin
+
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
 	name = "stok cube"
 	monkey_type = /mob/living/carbon/monkey/unathi

code/modules/virus2/disease2.dm

@@ -10,7 +10,7 @@
 	var/list/datum/disease2/effectholder/effects = list()
 	var/antigen = 0 // 16 bits describing the antigens, when one bit is set, a cure with that bit can dock here
 	var/max_stage = 4
-	var/list/affected_species = list("Human","Unathi","Skrell","Tajaran","Vox","Kidan","Slime People","Grey","Diona")
+	var/list/affected_species = list("Human","Unathi","Skrell","Tajaran","Vox","Kidan","Slime People","Grey","Diona", "Vulpkanin")
 
 /datum/disease2/disease/New()
 	uniqueID = rand(0,10000)