From ae25cc1db97676404459fc757efb7b2607b985ff Mon Sep 17 00:00:00 2001 From: Cameron653 Date: Tue, 5 Jul 2016 13:28:16 -0400 Subject: [PATCH] Makes whitelist not be stupid for the moment --- code/game/jobs/whitelist.dm | 4 ++-- .../living/carbon/human/species/station/prometheans.dm | 2 +- .../mob/living/carbon/human/species/station/seromi.dm | 2 +- .../mob/living/carbon/human/species/station/station.dm | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 440cf2e22e8..4e7871b444c 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -34,10 +34,10 @@ var/list/whitelist = list() /proc/is_alien_whitelisted(mob/M, var/species) if(!config.usealienwhitelist) return 1 - if(species == "human" || species == "Human") - return 1 if(check_rights(R_ADMIN, 0)) return 1 + if(species != "xenochimera" || species != "Xenochimera") //VORESTATION EDIT + return 1 //VORESTATION EDIT if(!alien_whitelist) return 0 if(M && species) diff --git a/code/modules/mob/living/carbon/human/species/station/prometheans.dm b/code/modules/mob/living/carbon/human/species/station/prometheans.dm index 8c937aeb2d0..d645e9ee890 100644 --- a/code/modules/mob/living/carbon/human/species/station/prometheans.dm +++ b/code/modules/mob/living/carbon/human/species/station/prometheans.dm @@ -22,7 +22,7 @@ var/datum/species/shapeshifter/promethean/prometheans push_flags = MONKEY|SLIME|SIMPLE_ANIMAL flags = NO_SCAN | NO_SLIP | NO_MINOR_CUT appearance_flags = HAS_SKIN_COLOR | HAS_EYE_COLOR | HAS_HAIR_COLOR | RADIATION_GLOWS - spawn_flags = SPECIES_CAN_JOIN //VOREStation Edit + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED //VOREStation Edit breath_type = null poison_type = null diff --git a/code/modules/mob/living/carbon/human/species/station/seromi.dm b/code/modules/mob/living/carbon/human/species/station/seromi.dm index 3fbd1dad55b..4361720a293 100644 --- a/code/modules/mob/living/carbon/human/species/station/seromi.dm +++ b/code/modules/mob/living/carbon/human/species/station/seromi.dm @@ -36,7 +36,7 @@ blood_volume = 400 hunger_factor = 0.2 - spawn_flags = SPECIES_CAN_JOIN //VORESTATION EDIT + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED appearance_flags = HAS_HAIR_COLOR | HAS_SKIN_COLOR | HAS_EYE_COLOR bump_flag = MONKEY swap_flags = MONKEY|SLIME|SIMPLE_ANIMAL diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index a6dbefd863c..66ffba4ee1a 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -55,7 +55,7 @@ heat_level_2 = 480 //Default 400 heat_level_3 = 1100 //Default 1000 */ - spawn_flags = SPECIES_CAN_JOIN //VORESTATION EDIT + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR flesh_color = "#34AF10" @@ -117,7 +117,7 @@ */ primitive_form = "Farwa" - spawn_flags = SPECIES_CAN_JOIN //VORESTATION EDIT + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR flesh_color = "#AFA59E" @@ -156,7 +156,7 @@ min_age = 19 max_age = 80 - spawn_flags = SPECIES_CAN_JOIN //VORESTATION EDIT + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR flesh_color = "#8CD7A3" @@ -247,7 +247,7 @@ body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not flags = NO_SCAN | IS_PLANT | NO_PAIN | NO_SLIP | NO_MINOR_CUT - spawn_flags = SPECIES_CAN_JOIN //VORESTATION EDIT + spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED blood_color = "#004400" flesh_color = "#907E4A"