cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 11:32:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1591 from VOREStation/aro-SPECIES

Browse Source 
Properly hide traits already selected
This commit is contained in:
Arokha Sieyes
2017-05-30 17:08:22 -04:00
committed by GitHub
parent d66238c559 a8a668b7b3
commit ece202d777
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -196,10 +196,10 @@
picklist = positive_traits.Copy() - pref.pos_traits
mylist = pref.pos_traits
if(NEUTRAL_MODE)
picklist = neutral_traits.Copy() - pref.pos_traits
picklist = neutral_traits.Copy() - pref.neu_traits
mylist = pref.neu_traits
if(NEGATIVE_MODE)
picklist = negative_traits.Copy() - pref.pos_traits
picklist = negative_traits.Copy() - pref.neg_traits
mylist = pref.neg_traits
else
@@ -224,7 +224,9 @@
var/done = FALSE
while(!done)
var/message = "\[Remaining: [points_left] points, [traits_left] traits\] Select a trait to read the description and see the cost."
trait_choice = input(message,"Positive Traits") in nicelist
trait_choice = input(message,"Trait List") as null|anything in nicelist
if(!trait_choice)
done = TRUE
if(trait_choice in nicelist)
var/datum/trait/path = nicelist[trait_choice]
var/choice = alert("\[Cost:[initial(path.cost)]\] [initial(path.desc)]",initial(path.name),"Take Trait","Cancel","Go Back")
@@ -241,6 +243,9 @@
var/conflict = FALSE
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)
var/datum/trait/instance_test = all_traits[P]