From c262be4d30b34fd60e4ba6697a605bbd4ee1ba05 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Mon, 25 May 2015 03:42:24 -0400
Subject: [PATCH] dun dun dun

---
 code/modules/client/client procs.dm       | 7 -------
 code/modules/client/preferences.dm        | 2 +-
 code/modules/karma/karma.dm               | 1 -
 code/modules/mob/living/carbon/species.dm | 4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index d2159243dad..67bf068d604 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -164,13 +164,6 @@
 						else
 							src.DB_species_unlock("Plasmaman",100)
 							return
-					if("7")
-						if(karma <15)
-							usr << "You do not have enough karma!"
-							return
-						else
-							src.DB_species_unlock("Vulpkanin",15)
-							return
 			if(href_list["KarmaRefund"])
 				var/type = href_list["KarmaRefundType"]
 				var/job = href_list["KarmaRefund"]
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 3a5c0bb6357..6f0f19b0b31 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -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
 
diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm
index dbb89ff27a6..ed00a84e97c 100644
--- a/code/modules/karma/karma.dm
+++ b/code/modules/karma/karma.dm
@@ -202,7 +202,6 @@ You've gained <b>[totalkarma]</b> total karma in your time here.<br>"}
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=4'>Unlock Vox -- 45KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=5'>Unlock Slime People -- 45KP</a><br>
 			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=6'>Unlock Plasmaman -- 100KP</a><br>
-			<a href='?src=\ref[src];karmashop=shop;KarmaBuy2=7'>Unlock Vulpkanin -- 15KP</a><br>
 			"}
 
 		if (2) // Karma Refunds
diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm
index dad0e746dfb..af066547923 100644
--- a/code/modules/mob/living/carbon/species.dm
+++ b/code/modules/mob/living/carbon/species.dm
@@ -422,13 +422,13 @@
 	unarmed_type = /datum/unarmed_attack/claws
 	darksight = 8
 
-	blurb = "Vulpkanin are a species of extremely quick canine-pideds residing on the planet Altam just barely within the \
+	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 | IS_WHITELISTED
+	flags = HAS_LIPS | HAS_UNDERWEAR
 	bodyflags = FEET_PADDED | HAS_TAIL | HAS_SKIN_COLOR | TAIL_WAGGING
 	dietflags = DIET_OMNI