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

Putting whitie and black togehter apparently breaks

Browse Source 
So its a code block of its own
This commit is contained in:
Sharkmare
2021-03-06 17:54:16 +01:00
parent 70299a1046
commit 546b39a395
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,10 +345,16 @@
pref.gross_meatbag = 0 //Just to be sure pref.gross_meatbag = 0 //Just to be sure
return TOPIC_REFRESH return TOPIC_REFRESH
if(pref.species in instance.banned_species || (LAZYLEN(instance.allowed_species) && !(pref.species in instance.allowed_species))) //CHOMPEDIT: Whitelising! if(pref.species in instance.banned_species)
alert("The trait you've selected cannot be taken by the species you've chosen!","Error") alert("The trait you've selected cannot be taken by the species you've chosen!","Error")
return TOPIC_REFRESH return TOPIC_REFRESH
//CHOMPADDITION START Adding whitelist for traits
if( LAZYLEN(instance.allowed_species) && !(pref.species in instance.allowed_species)) //Adding white list handling -shark
alert("The trait you've selected cannot be taken by the species you've chosen!","Error")
return TOPIC_REFRESH
//CHOMPADDITION END
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 conflict = instance.name