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

Merge pull request #6683 from Novacat/nova-heterochromia

Browse Source 
Species consolidation
This commit is contained in:
Novacat
2020-03-19 18:55:54 -04:00
committed by GitHub
parent 935b2baca5 db16b17224
commit 4cd077019f
14 changed files with 141 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/_helpers/global_lists_vr.dm
View File

@@ -470,6 +470,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
// Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well.
var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //Include these anyway
for(var/species_name in GLOB.playable_species)
if(species_name in blacklisted_icons)
continue
@@ -477,5 +478,7 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
if(S.spawn_flags & SPECIES_IS_WHITELISTED)
continue
custom_species_bases += species_name
for(var/species_name in whitelisted_icons)
custom_species_bases += species_name
return 1 // Hooks must return 1