From e09a00fe0e37c920f3a37adc38e71e94a780d8fe Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sun, 5 Jan 2014 23:36:16 +1030 Subject: [PATCH] Fixed a duplicate definition bug with WHITELISTED. Conflicts: code/modules/client/preferences.dm code/modules/mob/living/carbon/species.dm code/modules/mob/new_player/new_player.dm code/setup.dm --- code/modules/client/preferences.dm | 2 +- code/modules/mob/living/carbon/species.dm | 19 ++++++++++++++----- code/modules/mob/new_player/new_player.dm | 4 ++-- code/setup.dm | 4 ++-- 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7f195f01f4c..3cccef2482b 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -957,7 +957,7 @@ datum/preferences if(config.usealienwhitelist) for(var/L in all_languages) var/datum/language/lang = all_languages[L] - if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & WHITELISTED )))) + if((!(lang.flags & RESTRICTED)) && (is_alien_whitelisted(user, L)||(!( lang.flags & IS_WHITELISTED )))) new_languages += lang languages_available = 1 diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 954b2ee22d1..4bb4c48f36c 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -67,6 +67,14 @@ flags = HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL bodyflags = FEET_CLAWS + cold_level_1 = 280 //Default 260 - Lower is better + cold_level_2 = 220 //Default 200 + cold_level_3 = 130 //Default 120 + + heat_level_1 = 420 //Default 360 - Higher is better + heat_level_2 = 480 //Default 400 + heat_level_3 = 1100 //Default 1000 + /datum/species/tajaran name = "Tajaran" icobase = 'icons/mob/human_races/r_tajaran.dmi' @@ -117,7 +125,7 @@ eyes = "vox_eyes_s" breath_type = "nitrogen" - flags = NO_SCAN | WHITELISTED + flags = NO_SCAN | IS_WHITELISTED /datum/species/diona name = "Diona" @@ -139,9 +147,10 @@ heat_level_2 = 350 heat_level_3 = 700 - flags = NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW + flags = NO_BREATHE | REQUIRE_LIGHT | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW | NO_PAIN bloodflags = BLOOD_GREEN + /datum/species/kidan name = "Kidan" icobase = 'icons/mob/human_races/r_kidan.dmi' @@ -150,7 +159,7 @@ language = "Chittin" attack_verb = "slash" - flags = WHITELISTED | HAS_CHITTIN + flags = IS_WHITELISTED | HAS_CHITTIN bloodflags = BLOOD_GREEN bodyflags = FEET_CLAWS @@ -163,7 +172,7 @@ path = /mob/living/carbon/human/slime primitive = /mob/living/carbon/slime/adult - flags = WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS + flags = IS_WHITELISTED | NO_BREATHE | HAS_LIPS | NO_INTORGANS bloodflags = BLOOD_SLIME bodyflags = FEET_NOSLIP abilities = list(/mob/living/carbon/human/slime/proc/slimepeople_ventcrawl) @@ -180,4 +189,4 @@ max_hurt_damage = 3 // From 5 (for humans) // default_mutations=list(mRemotetalk) // TK is also another candidate, but TK is overpowered as fuck. - flags = WHITELISTED | HAS_LIPS | CAN_BE_FAT \ No newline at end of file + flags = IS_WHITELISTED | HAS_LIPS | CAN_BE_FAT diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index b2e76fa8f90..8b4cfc748e5 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -374,7 +374,7 @@ if(client.prefs.species) chosen_species = all_species[client.prefs.species] if(chosen_species) - if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though. + if(is_alien_whitelisted(src, client.prefs.species) || !config.usealienwhitelist || !(chosen_species.flags & IS_WHITELISTED) || (client.holder.rights & R_ADMIN) )// Have to recheck admin due to no usr at roundstart. Latejoins are fine though. switch(chosen_species.name) if("Slime People") new_character = new /mob/living/carbon/human/slime(loc) @@ -468,4 +468,4 @@ src << browse(null, "window=playersetup") //closes the player setup window src << browse(null, "window=preferences") //closes job selection src << browse(null, "window=mob_occupation") - src << browse(null, "window=latechoices") //closes late job selection \ No newline at end of file + src << browse(null, "window=latechoices") //closes late job selection diff --git a/code/setup.dm b/code/setup.dm index e3d9b0def1b..6b2ba7221d8 100644 --- a/code/setup.dm +++ b/code/setup.dm @@ -739,9 +739,9 @@ var/list/RESTRICTED_CAMERA_NETWORKS = list( //Those networks can only be accesse #define IS_SLOW 4 #define RAD_ABSORB 8 #define NO_SCAN 16 -#define NON_GENDERED 32 +#define NO_PAIN 32 #define REQUIRE_LIGHT 64 -#define WHITELISTED 128 +#define IS_WHITELISTED 128 #define HAS_SKIN_TONE 256 #define HAS_LIPS 512 #define HAS_UNDERWEAR 1024