diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index ecbac32ed1c..956e6be2557 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -17,9 +17,10 @@ var/global/list/landmarks_list = list() //list of all landmarks created var/global/list/surgery_steps = list() //list of all surgery steps |BS12 var/global/list/mechas_list = list() //list of all mechs. Used by hostile mobs target tracking. -//Languages/species +//Languages/species/whitelist. var/global/list/all_species[0] var/global/list/all_languages[0] +var/global/list/whitelisted_species = list("Human") //Preferences stuff //Hairstyles @@ -85,6 +86,9 @@ var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel", "Satchel Al var/datum/species/S = new T all_species[S.name] = S + if(S.flags & WHITELISTED) + whitelisted_species += S.name + /* // Uncomment to debug chemical reaction list. /client/verb/debug_chemical_list() diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 6d5ec719c10..5d193fb4ec2 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -1,17 +1,3 @@ -#define NO_EAT 1 -#define NO_BREATHE 2 -#define NO_SLEEP 4 -#define NO_SHOCK 8 -#define NO_SCAN 16 -#define NON_GENDERED 32 -#define REQUIRE_LIGHT 64 -#define WHITELISTED 128 -#define HAS_SKIN_TONE 256 -#define HAS_LIPS 512 -#define HAS_UNDERWEAR 1024 -#define HAS_TAIL 2048 -#define IS_PLANT 4096 - /* Datum-based species. Should make for much cleaner and easier to maintain mutantrace code. */ @@ -63,7 +49,7 @@ flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL /datum/species/tajaran - name = "Tajara" + name = "Tajaran" icobase = 'icons/mob/human_races/r_tajaran.dmi' deform = 'icons/mob/human_races/r_def_tajaran.dmi' language = "Siik'mas" diff --git a/code/setup.dm b/code/setup.dm index 91e83bfad2d..7e6f0cb7a98 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -701,4 +701,19 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse "thunder", "ERT", "NUKE" - ) \ No newline at end of file + ) + +//Species flags. +#define NO_EAT 1 +#define NO_BREATHE 2 +#define NO_SLEEP 4 +#define NO_SHOCK 8 +#define NO_SCAN 16 +#define NON_GENDERED 32 +#define REQUIRE_LIGHT 64 +#define WHITELISTED 128 +#define HAS_SKIN_TONE 256 +#define HAS_LIPS 512 +#define HAS_UNDERWEAR 1024 +#define HAS_TAIL 2048 +#define IS_PLANT 4096 \ No newline at end of file