diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 61e8983de46..2c5cd3e8c6d 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -35,8 +35,7 @@ var/global/list/underwear_m = list() //stores only underwear name
var/global/list/underwear_f = list() //stores only underwear name
//Backpacks
var/global/list/backbaglist = list("Nothing", "Backpack", "Satchel")
- //Disabilities
-var/global/list/disabilitylist = list("Epilepsy", "Near-sightedness", "Blindness", "Clumsiness", "Stammering", "Deafness", "Deaf-blind", "Mute", "None")
+
//////////////////////////
/////Initial Building/////
//////////////////////////
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 2898534e54e..77440cff8c0 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -333,32 +333,6 @@ var/global/datum/controller/occupations/job_master
var/obj/item/weapon/storage/backpack/BPK = new/obj/item/weapon/storage/backpack/satchel_norm(H)
new /obj/item/weapon/storage/box/survival(BPK)
H.equip_to_slot_or_del(BPK, slot_back,1)
- switch(H.disability)
- if(1)
- H.disabilities |= EPILEPSY
- if(2)
- var/obj/item/clothing/glasses/regular/DE = new/obj/item/clothing/glasses/regular(H)
- H.equip_to_slot(DE, slot_glasses,1)
- H.disabilities |= NEARSIGHTED
- if(3)
- var/obj/item/clothing/glasses/sunglasses/DE = new/obj/item/clothing/glasses/sunglasses(H)
- H.equip_to_slot(DE, slot_glasses,1)
- H.sdisabilities |= BLIND
- if(4)
- H.mutations |= CLUMSY
- if(5)
- H.disabilities |= NERVOUS
- if(6)
- H.sdisabilities |= DEAF
- H.ear_deaf = 1
- if(7)
- var/obj/item/clothing/glasses/sunglasses/DE = new/obj/item/clothing/glasses/sunglasses(H)
- H.equip_to_slot(DE, slot_glasses,1)
- H.sdisabilities |= BLIND
- H.sdisabilities |= DEAF
- H.ear_deaf = 1
- if(8)
- H.miming = 1
H << "You are the [rank]."
H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this."
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 5610e12fe33..dac577c2728 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -45,7 +45,6 @@ datum/preferences
var/blood_type = "A+" //blood type (not-chooseable)
var/underwear = "Nude" //underwear type
var/backbag = 2 //backpack type
- var/disability = 9 //disability type
var/hair_style = "Bald" //Hair type
var/hair_color = "000" //Hair color
var/facial_hair_style = "Shaved" //Face hair type
@@ -166,7 +165,6 @@ datum/preferences
dat += "Skin Tone:
[skin_tone]
"
dat += "Underwear:
[underwear]
"
dat += "Backpack:
[backbaglist[backbag]]
"
- dat += "Disability:
[disabilitylist[disability]]
"
dat += "
"
@@ -537,8 +535,6 @@ datum/preferences
skin_tone = random_skin_tone()
if("bag")
backbag = rand(1,3)
- if("disability")
- disability = rand(1,9)
if("all")
random_character()
@@ -624,10 +620,6 @@ datum/preferences
if(new_backbag)
backbag = backbaglist.Find(new_backbag)
- if("disability")
- var/new_disability = input(user, "Choose your disability type:", "Character Preference") as null|anything in disabilitylist
- if(new_disability)
- disability = disabilitylist.Find(new_disability)
else
switch(href_list["preference"])
if("publicity")
@@ -732,10 +724,6 @@ datum/preferences
backbag = 1 //Same as above
character.backbag = backbag
- if(disability > 9 || disability < 1)
- disability = 9 //Same as above
- character.disability = disability
-
/*
//Debugging report to track down a bug, which randomly assigned the plural gender to people.
if(character.gender in list(PLURAL, NEUTER))
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 4553573160d..29a289dd610 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -165,7 +165,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["facial_style_name"] >> facial_hair_style
S["underwear"] >> underwear
S["backbag"] >> backbag
- S["disability"] >> disability
//Jobs
S["userandomjob"] >> userandomjob
@@ -203,7 +202,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
eye_color = sanitize_hexcolor(eye_color, 3, 0)
skin_tone = sanitize_inlist(skin_tone, skin_tones)
backbag = sanitize_integer(backbag, 1, backbaglist.len, initial(backbag))
- disability = sanitize_integer(disability, 1, disabilitylist.len, initial(disability))
userandomjob = sanitize_integer(userandomjob, 0, 1, initial(userandomjob))
job_civilian_high = sanitize_integer(job_civilian_high, 0, 65535, initial(job_civilian_high))
@@ -240,7 +238,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["facial_style_name"] << facial_hair_style
S["underwear"] << underwear
S["backbag"] << backbag
- S["disability"] << disability
//Jobs
S["userandomjob"] << userandomjob
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 40a8104a333..29858713549 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -19,7 +19,6 @@
var/underwear = "Nude" //Which underwear the player wants
var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack.
- var/disability = 9 //What kind of disability the playet wants at roundstart. Epilepsy, Near-sightedness, Blindness, Clumsiness, Stammering, Deafness or None.
//Equipment slots
var/obj/item/wear_suit = null
diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm
index 8c88d681fea..ca2309473a7 100644
--- a/code/modules/mob/new_player/preferences_setup.dm
+++ b/code/modules/mob/new_player/preferences_setup.dm
@@ -13,7 +13,6 @@ datum/preferences
facial_hair_color = hair_color
eye_color = random_eye_color()
backbag = 2
- disability = 9
age = rand(AGE_MIN,AGE_MAX)
proc/update_preview_icon() //seriously. This is horrendous.
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 14c3b771983..283784b4d25 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -263,11 +263,6 @@
name = "Skinhead"
icon_state = "hair_skinhead"
- curly
- name = "Curly"
- icon_state = "hair_curly"
- gender = FEMALE
-
longbangs
name = "Long Bangs"
icon_state = "hair_lbangs"
|