improved trait exclusion logic

code/modules/client/preference_setup/vore/07_traits.dm

@@ -2,6 +2,9 @@
 #define NEUTRAL_MODE 2
 #define NEGATIVE_MODE 3
 
+#define ORGANICS	1
+#define SYNTHETICS	2
+
 /datum/preferences
 	var/custom_species	// Custom species name, can't be changed due to it having been used in savefiles already.
 	var/custom_base		// What to base the custom species on
@@ -15,6 +18,7 @@
 	var/starting_trait_points = STARTING_SPECIES_POINTS
 	var/max_traits = MAX_SPECIES_TRAITS
 	var/dirty_synth = 0		//Are you a synth
+	var/gross_meatbag = 0		//Where'd I leave my Voight-Kampff test kit?
 
 // Definition of the stuff for Ears
 /datum/category_item/player_setup_item/vore/traits
@@ -85,6 +89,10 @@
 
 	if(character.isSynthetic())	//Checking if we have a synth on our hands, boys.
 		pref.dirty_synth = 1
+		pref.gross_meatbag = 0
+	else
+		pref.gross_meatbag = 1
+		pref.dirty_synth = 0
 
 	var/datum/species/S = character.species
 	var/SB
@@ -268,13 +276,16 @@
 
 			var/conflict = FALSE
 
-			user.isSynthetic()	//Recheck just to be sure
-			if(pref.dirty_synth && instance.not_for_synths)//if you are a synth you can't take this trait.
-				alert("You cannot take this trait as a SYNTH.\
-				Please remove that trait, or pick another trait to add.","Error")
+			if(pref.dirty_synth && !(instance.can_take & SYNTHETICS))
+				alert("The trait you've selected can only be taken by organic characters!","Error")
 				pref.dirty_synth = 0	//Just to be sure
 				return TOPIC_REFRESH
 
+			if(pref.gross_meatbag && !(instance.can_take & ORGANICS))
+				alert("The trait you've selected can only be taken by synthetic characters!","Error")
+				pref.gross_meatbag = 0	//Just to be sure
+				return TOPIC_REFRESH
+
 
 			if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits)
 				conflict = instance.name