mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com>
This commit is contained in:
@@ -553,7 +553,6 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_
|
||||
else
|
||||
picklist = everyone_traits_negative.Copy() - pref.neg_traits
|
||||
mylist = pref.neg_traits
|
||||
else
|
||||
|
||||
if(isnull(picklist))
|
||||
return TOPIC_REFRESH
|
||||
@@ -620,11 +619,11 @@ var/global/list/valid_bloodreagents = list("default",REAGENT_ID_IRON,REAGENT_ID_
|
||||
tgui_alert_async(user, "The trait you've selected cannot be taken by the species you've chosen!", "Error")
|
||||
return TOPIC_REFRESH
|
||||
|
||||
if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits)
|
||||
if(trait_choice in (pref.pos_traits + pref.neu_traits + pref.neg_traits))
|
||||
conflict = instance.name
|
||||
|
||||
varconflict:
|
||||
for(var/P in pref.pos_traits + pref.neu_traits + pref.neg_traits)
|
||||
for(var/P in (pref.pos_traits + pref.neu_traits + pref.neg_traits))
|
||||
var/datum/trait/instance_test = all_traits[P]
|
||||
if(path in instance_test.excludes)
|
||||
conflict = instance_test.name
|
||||
|
||||
Reference in New Issue
Block a user