diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index 6f8bd0feabf..4cbe2a9e5f1 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -13,7 +13,12 @@
#define DISABILITY_FLAG_BLIND 16
#define DISABILITY_FLAG_MUTE 32
#define DISABILITY_FLAG_COLOURBLIND 64
-
+#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
///////////////////////////////////////
// MUTATIONS
///////////////////////////////////////
@@ -134,4 +139,4 @@
#define RADIMMUNE 11
#define NOGUNS 12
#define NOTRANSSTING 13
-#define VIRUSIMMUNE 14
\ No newline at end of file
+#define VIRUSIMMUNE 14
diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
index 116aa0797cb..3ff80f3376c 100644
--- a/code/_globalvars/genetics.dm
+++ b/code/_globalvars/genetics.dm
@@ -66,4 +66,4 @@ var/LOUDBLOCK = 0
var/DIZZYBLOCK = 0
var/list/reg_dna = list( ) //this appears to be a list of UE == real_name correlations
-var/list/global_mutations = list() // list of hidden mutation things
\ No newline at end of file
+var/list/global_mutations = list() // list of hidden mutation things
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index 7b48da8a9c8..4b7fb81287a 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -819,13 +819,18 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/HTML = "
"
HTML += ""
- HTML += ShowDisabilityState(user,DISABILITY_FLAG_NEARSIGHTED,"Needs Glasses")
+ 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_LISP,"Lisp")
+ HTML += ShowDisabilityState(user,DISABILITY_FLAG_DIZZY,"Suffers from dizziness")
HTML += {"
@@ -2174,6 +2179,24 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(disabilities & DISABILITY_FLAG_MUTE)
character.dna.SetSEState(MUTEBLOCK,1,1)
+ if(disabilities & DISABILITY_FLAG_TOURETTES)
+ character.dna.SetSEState(TWITCHBLOCK,1,1)
+
+ if(disabilities & DISABILITY_FLAG_NERVOUS)
+ character.dna.SetSEState(NERVOUSBLOCK,1,1)
+
+ if(disabilities & DISABILITY_FLAG_SWEDISH)
+ character.dna.SetSEState(SWEDEBLOCK,1,1)
+
+ if(disabilities & DISABILITY_FLAG_SCRAMBLED)
+ character.dna.SetSEState(SCRAMBLEBLOCK,1,1)
+
+ if(disabilities & DISABILITY_FLAG_LISP)
+ character.dna.SetSEState(LISPBLOCK,1,1)
+
+ if(disabilities & DISABILITY_FLAG_DIZZY)
+ character.dna.SetSEState(DIZZYBLOCK,1,1)
+
S.handle_dna(character)
if(character.dna.dirtySE)