From 3c2f36759b479482df141b193aca1eec9bbc4e87 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Wed, 6 Feb 2019 18:50:23 -0700 Subject: [PATCH] Readds deaf --- code/__DEFINES/genetics.dm | 1 + code/game/jobs/job/job.dm | 2 +- code/modules/client/preference/preferences.dm | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index 389b96f6a57..f2323622960 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -17,6 +17,7 @@ #define DISABILITY_FLAG_LISP 256 #define DISABILITY_FLAG_DIZZY 512 #define DISABILITY_FLAG_CHAV 1024 +#define DISABILITY_FLAG_BLIND 2048 /////////////////////////////////////// // MUTATIONS diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 9d6b8d8927c..61e458927e9 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -118,7 +118,7 @@ return 0 if(disabilities_allowed) return 0 - var/list/prohibited_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) + var/list/prohibited_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) for(var/i = 1, i < prohibited_disabilities.len, i++) var/this_disability = prohibited_disabilities[i] if(C.prefs.disabilities & this_disability) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index be3ea2907e3..0a09f4504bb 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -842,11 +842,12 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if(CAN_WINGDINGS in S.species_traits) HTML += ShowDisabilityState(user, DISABILITY_FLAG_WINGDINGS, "Speak in Wingdings") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_NEARSIGHTED, "Needs glasses") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_FAT, "Obese") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_BLIND, "Blind") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_NEARSIGHTED, "Nearsighted") HTML += ShowDisabilityState(user, DISABILITY_FLAG_COLOURBLIND, "Colourblind") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_BLIND, "Blind") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_DEAF, "Deaf") HTML += ShowDisabilityState(user, DISABILITY_FLAG_MUTE, "Mute") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_FAT, "Obese") HTML += ShowDisabilityState(user, DISABILITY_FLAG_NERVOUS, "Stutter") HTML += ShowDisabilityState(user, DISABILITY_FLAG_SWEDISH, "Swedish accent") HTML += ShowDisabilityState(user, DISABILITY_FLAG_CHAV, "Chav accent") @@ -2205,6 +2206,10 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.dna.SetSEState(BLINDBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(BLINDBLOCK) + if(disabilities & DISABILITY_FLAG_DEAF) + character.dna.SetSEState(DEAFBLOCK, TRUE, TRUE) + character.dna.default_blocks.Add(DEAFBLOCK) + if(disabilities & DISABILITY_FLAG_COLOURBLIND) character.dna.SetSEState(COLOURBLINDBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(COLOURBLINDBLOCK)