cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1428 from CHOMPStationBot/upstream-merge-9804

Browse Source 
[MIRROR] Improved Trait Exclusion Logic v2
This commit is contained in:
cadyn
2021-02-27 15:48:34 -08:00
committed by GitHub
parent 20722857c8 52695407cc
commit 5e17d7737c
3 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,6 +292,9 @@
pref.gross_meatbag = 0 //Just to be sure
return TOPIC_REFRESH
if(pref.species in instance.banned_species)
alert("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)
conflict = instance.name