cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes whitelist not be stupid for the moment

Browse Source
This commit is contained in:
Cameron653
2016-07-05 13:28:16 -04:00
parent f0a2f5e13e
commit ae25cc1db9
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/whitelist.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/carbon/human/species/station/prometheans.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/human/species/station/seromi.dm
+1 -1
View File
@@ -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
code/modules/mob/living/carbon/human/species/station/station.dm
+4 -4
View File
@@ -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"