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
This commit is contained in:
Zuhayr
2014-01-06 23:59:21 -05:00
committed by ZomgPonies
parent f66b5a3ccc
commit e09a00fe0e
4 changed files with 19 additions and 10 deletions
+2 -2
View File
@@ -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