Whitelisting system, new karma job, new karma species

code/modules/admin/banjob.dm

@@ -16,14 +16,14 @@ var/jobban_keylist[0]		//to store the keys & ranks
 //returns a reason if M is banned from rank, returns 0 otherwise
 /proc/jobban_isbanned(mob/M, rank)
 	if(M && rank)
-		/*
-		if(_jobban_isbanned(M, rank)) return "Reason Unspecified"	//for old jobban
+
+		//if(_jobban_isbanned(M, rank)) return "Reason Unspecified"	//for old jobban
 		if (guest_jobbans(rank))
-			if(config.guest_jobban && IsGuestKey(M.key))
-				return "Guest Job-ban"
+		//	if(config.guest_jobban && IsGuestKey(M.key))
+		//		return "Guest Job-ban"
 			if(config.usewhitelist && !check_whitelist(M))
-				return "Whitelisted Job"
-		*/
+				return "Karma Job"
+
 		for (var/s in jobban_keylist)
 			if( findtext(s,"[M.ckey] - [rank]") == 1 )
 				var/startpos = findtext(s, "## ")+3

code/modules/client/preferences.dm

@@ -837,19 +837,19 @@ datum/preferences
 							age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)
 					if("species")
 
-						var/list/new_species = list("Human")
+						var/list/new_species = list("Human","Tajaran","Skrell","Unathi","Diona")
 						var/prev_species = species
-						var/whitelisted = 0
+//						var/whitelisted = 0
 
 						if(config.usealienwhitelist) //If we're using the whitelist, make sure to check it!
 							for(var/S in whitelisted_species)
 								if(is_alien_whitelisted(user,S))
 									new_species += S
-									whitelisted = 1
-							if(!whitelisted)
-								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
+//									whitelisted = 1
+//							if(!whitelisted)
+//								alert(user, "You cannot change your species as you need to be whitelisted. If you wish to be whitelisted contact an admin in-game, on the forums, or on IRC.")
 						else //Not using the whitelist? Aliens for everyone!
-							new_species = whitelisted_species
+							new_species += whitelisted_species
 
 						species = input("Please select a species", "Character Generation", null) in new_species
 

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

@@ -123,7 +123,7 @@
 
 	flags = NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB
 
-/*
+
 /datum/species/skellington // /vg/
 	name = "Skellington"
 	icobase = 'icons/mob/human_races/r_skeleton.dmi'
@@ -131,5 +131,15 @@
 	language = "Clatter"
 	attack_verb = "punch"
 
-	flags = HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED
-*/
+	flags = WHITELISTED | HAS_LIPS | HAS_TAIL | NO_EAT | NO_BREATHE | NON_GENDERED
+
+
+
+/datum/species/kidan
+	name = "Kidan"
+	icobase = 'icons/mob/human_races/r_kidan.dmi'
+	deform = 'icons/mob/human_races/r_def_kidan.dmi'
+	language = "Chittin"
+	attack_verb = "slash"
+
+	flags = WHITELISTED