From 0c0e4a02af9492f72fd5b5242e0a986dbb75aba9 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Mon, 4 Feb 2019 20:25:43 -0700 Subject: [PATCH 1/5] Removes several disabilities, adds chav. --- code/__DEFINES/genetics.dm | 21 +++++++-------- code/modules/client/preference/preferences.dm | 27 +++---------------- 2 files changed, 13 insertions(+), 35 deletions(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index 5076a65db47..389b96f6a57 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -8,18 +8,15 @@ // Used in preferences. #define DISABILITY_FLAG_NEARSIGHTED 1 #define DISABILITY_FLAG_FAT 2 -#define DISABILITY_FLAG_EPILEPTIC 4 -#define DISABILITY_FLAG_DEAF 8 -#define DISABILITY_FLAG_BLIND 16 -#define DISABILITY_FLAG_MUTE 32 -#define DISABILITY_FLAG_COLOURBLIND 64 -#define DISABILITY_FLAG_WINGDINGS 128 -#define DISABILITY_FLAG_TOURETTES 512 -#define DISABILITY_FLAG_NERVOUS 1024 -#define DISABILITY_FLAG_SWEDISH 2048 -#define DISABILITY_FLAG_SCRAMBLED 4096 // incoherent speech -#define DISABILITY_FLAG_LISP 8192 -#define DISABILITY_FLAG_DIZZY 16384 +#define DISABILITY_FLAG_BLIND 4 +#define DISABILITY_FLAG_MUTE 8 +#define DISABILITY_FLAG_COLOURBLIND 16 +#define DISABILITY_FLAG_WINGDINGS 32 +#define DISABILITY_FLAG_NERVOUS 64 +#define DISABILITY_FLAG_SWEDISH 128 +#define DISABILITY_FLAG_LISP 256 +#define DISABILITY_FLAG_DIZZY 512 +#define DISABILITY_FLAG_CHAV 1024 /////////////////////////////////////// // MUTATIONS diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index e6c569c35c5..e84703d4cad 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -844,17 +844,14 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts 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_EPILEPTIC, "Seizures") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_DEAF, "Deaf") HTML += ShowDisabilityState(user, DISABILITY_FLAG_BLIND, "Blind") HTML += ShowDisabilityState(user, DISABILITY_FLAG_COLOURBLIND, "Colourblind") HTML += ShowDisabilityState(user, DISABILITY_FLAG_MUTE, "Mute") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_TOURETTES, "Tourettes syndrome") // this will / can not be abused. It also SEVERELY stuns. It's just for fun. HTML += ShowDisabilityState(user, DISABILITY_FLAG_NERVOUS, "Stutter") HTML += ShowDisabilityState(user, DISABILITY_FLAG_SWEDISH, "Swedish accent") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_SWEDISH, "Chav accent") HTML += ShowDisabilityState(user, DISABILITY_FLAG_LISP, "Lisp") HTML += ShowDisabilityState(user, DISABILITY_FLAG_DIZZY, "Dizziness") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_SCRAMBLED, "Can't speak properly") HTML += {" @@ -2204,14 +2201,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.dna.SetSEState(GLASSESBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(GLASSESBLOCK) - if(disabilities & DISABILITY_FLAG_EPILEPTIC) - character.dna.SetSEState(EPILEPSYBLOCK, TRUE, TRUE) - character.dna.default_blocks.Add(EPILEPSYBLOCK) - - if(disabilities & DISABILITY_FLAG_DEAF) - character.dna.SetSEState(DEAFBLOCK, TRUE, TRUE) - character.dna.default_blocks.Add(DEAFBLOCK) - if(disabilities & DISABILITY_FLAG_BLIND) character.dna.SetSEState(BLINDBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(BLINDBLOCK) @@ -2224,10 +2213,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.dna.SetSEState(MUTEBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(MUTEBLOCK) - if(disabilities & DISABILITY_FLAG_TOURETTES) - character.dna.SetSEState(TWITCHBLOCK, TRUE, TRUE) - character.dna.default_blocks.Add(TWITCHBLOCK) - if(disabilities & DISABILITY_FLAG_NERVOUS) character.dna.SetSEState(NERVOUSBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(NERVOUSBLOCK) @@ -2236,9 +2221,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.dna.SetSEState(SWEDEBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(SWEDEBLOCK) - if(disabilities & DISABILITY_FLAG_SCRAMBLED) - character.dna.SetSEState(SCRAMBLEBLOCK, TRUE, TRUE) - character.dna.default_blocks.Add(SCRAMBLEBLOCK) + if(disabilities & DISABILITY_FLAG_CHAV) + character.dna.SetSEState(CHAVBLOCK, TRUE, TRUE) + character.dna.default_blocks.Add(CHAVBLOCK) if(disabilities & DISABILITY_FLAG_LISP) character.dna.SetSEState(LISPBLOCK, TRUE, TRUE) @@ -2248,10 +2233,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts character.dna.SetSEState(DIZZYBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(DIZZYBLOCK) - if(disabilities & DISABILITY_FLAG_SCRAMBLED) - character.dna.SetSEState(SCRAMBLEBLOCK, TRUE, TRUE) - character.dna.default_blocks.Add(SCRAMBLEBLOCK) - if(disabilities & DISABILITY_FLAG_WINGDINGS && (CAN_WINGDINGS in character.dna.species.species_traits)) character.dna.SetSEState(WINGDINGSBLOCK, TRUE, TRUE) character.dna.default_blocks.Add(WINGDINGSBLOCK) From 0638fb599ddec61ea1e37128b9c3a317d0c22c3c Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Mon, 4 Feb 2019 20:35:57 -0700 Subject: [PATCH 2/5] Woopwoop. --- code/modules/client/preference/preferences.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm index e84703d4cad..be3ea2907e3 100644 --- a/code/modules/client/preference/preferences.dm +++ b/code/modules/client/preference/preferences.dm @@ -849,7 +849,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts HTML += ShowDisabilityState(user, DISABILITY_FLAG_MUTE, "Mute") HTML += ShowDisabilityState(user, DISABILITY_FLAG_NERVOUS, "Stutter") HTML += ShowDisabilityState(user, DISABILITY_FLAG_SWEDISH, "Swedish accent") - HTML += ShowDisabilityState(user, DISABILITY_FLAG_SWEDISH, "Chav accent") + HTML += ShowDisabilityState(user, DISABILITY_FLAG_CHAV, "Chav accent") HTML += ShowDisabilityState(user, DISABILITY_FLAG_LISP, "Lisp") HTML += ShowDisabilityState(user, DISABILITY_FLAG_DIZZY, "Dizziness") From fffe081a8f271a128e65370123a05292f3356e2c Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Mon, 4 Feb 2019 20:58:34 -0700 Subject: [PATCH 3/5] Adjusts restrictions to remove deprecated options. --- code/game/jobs/job/job.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index 68b06b8e000..9d6b8d8927c 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_DEAF, DISABILITY_FLAG_BLIND, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_SCRAMBLED, DISABILITY_FLAG_EPILEPTIC, DISABILITY_FLAG_TOURETTES, DISABILITY_FLAG_DIZZY) + var/list/prohibited_disabilities = list(DISABILITY_FLAG_BLIND, 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) From 3c2f36759b479482df141b193aca1eec9bbc4e87 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Wed, 6 Feb 2019 18:50:23 -0700 Subject: [PATCH 4/5] 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) From 4764f1eeabb48a1e10d3745a88b9851cac999a07 Mon Sep 17 00:00:00 2001 From: Shadeykins Date: Wed, 6 Feb 2019 19:43:53 -0700 Subject: [PATCH 5/5] Woop woop Travis --- code/__DEFINES/genetics.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm index f2323622960..0fb9253a083 100644 --- a/code/__DEFINES/genetics.dm +++ b/code/__DEFINES/genetics.dm @@ -17,7 +17,7 @@ #define DISABILITY_FLAG_LISP 256 #define DISABILITY_FLAG_DIZZY 512 #define DISABILITY_FLAG_CHAV 1024 -#define DISABILITY_FLAG_BLIND 2048 +#define DISABILITY_FLAG_DEAF 2048 /////////////////////////////////////// // MUTATIONS