diff --git a/code/__DEFINES/genetics.dm b/code/__DEFINES/genetics.dm
index 8cc7145ccd5..97f797b2718 100644
--- a/code/__DEFINES/genetics.dm
+++ b/code/__DEFINES/genetics.dm
@@ -18,8 +18,8 @@
///////////////////////////////////////
// Generic mutations:
-#define TK 1
-#define RESIST_COLD 2
+#define TK 1
+#define RESIST_COLD 2
#define XRAY 3
#define HULK 4
#define CLUMSY 5
@@ -30,78 +30,52 @@
// Extra powers:
#define LASER 9 // harm intent - click anywhere to shoot lasers from eyes
-//#define HEAL 10 // (Not implemented) healing people with hands
-//#define SHADOW 11 // (Not implemented) shadow teleportation (create in/out portals anywhere) (25%)
-//#define SCREAM 12 // (Not implemented) supersonic screaming (25%)
-//#define EXPLOSIVE 13 // (Not implemented) exploding on-demand (15%)
-//#define REGENERATION 14 // (Not implemented) superhuman regeneration (30%)
-//#define REPROCESSOR 15 // (Not implemented) eat anything (50%)
-//#define SHAPESHIFTING 16 // (Not implemented) take on the appearance of anything (40%)
-//#define PHASING 17 // (Not implemented) ability to phase through walls (40%)
-//#define SHIELD 18 // (Not implemented) shielding from all projectile attacks (30%)
-//#define SHOCKWAVE 19 // (Not implemented) attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
-//#define ELECTRICITY 20 // (Not implemented) ability to shoot electric attacks (15%)
-//bitflags for mutations
- // Extra powers:
-#define SHADOW (1<<10) // shadow teleportation (create in/out portals anywhere) (25%)
-#define SCREAM (1<<11) // supersonic screaming (25%)
-#define EXPLOSIVE (1<<12) // exploding on-demand (15%)
-#define REGENERATION (1<<13) // superhuman regeneration (30%)
-#define REPROCESSOR (1<<14) // eat anything (50%)
-#define SHAPESHIFTING (1<<15) // take on the appearance of anything (40%)
-#define PHASING (1<<16) // ability to phase through walls (40%)
-#define SHIELD (1<<17) // shielding from all projectile attacks (30%)
-#define SHOCKWAVE (1<<18) // attack a nearby tile and cause a massive shockwave, knocking most people on their asses (25%)
-#define ELECTRICITY (1<<19) // ability to shoot electric attacks (15%)
-
-
- //2spooky
+//2spooky
#define SKELETON 29
#define PLANT 30
// Other Mutations:
#define NO_BREATH 100 // no need to breathe
-#define REMOTE_VIEW 101 // remote viewing
+#define REMOTE_VIEW 101 // remote viewing
#define REGEN 102 // health regen
-#define RUN 103 // no slowdown
-#define REMOTE_TALK 104 // remote talking
+#define RUN 103 // no slowdown
+#define REMOTE_TALK 104 // remote talking
#define MORPH 105 // changing appearance
-#define RESIST_HEAT 106 // heat resistance
-#define HALLUCINATE 107 // hallucinations
+#define RESIST_HEAT 106 // heat resistance
+#define HALLUCINATE 107 // hallucinations
#define FINGERPRINTS 108 // no fingerprints
#define NO_SHOCK 109 // insulated hands
#define DWARF 110 // table climbing
// Goon muts
-#define OBESITY 200 // Decreased metabolism
-#define TOXIC_FARTS 201 // Duh
-#define STRONG 202 // (Nothing)
-#define SOBER 203 // Increased alcohol metabolism
-#define PSY_RESIST 204 // Block remoteview
-#define SUPER_FART 205 // Duh
-#define EMPATH 206 //Read minds
+#define OBESITY 200 // Decreased metabolism
+#define TOXIC_FARTS 201 // Duh
+#define STRONG 202 // (Nothing)
+#define SOBER 203 // Increased alcohol metabolism
+#define PSY_RESIST 204 // Block remoteview
+#define SUPER_FART 205 // Duh
+#define EMPATH 206 //Read minds
#define COMIC 207 //Comic Sans
// /vg/ muts
-#define LOUD 208 // CAUSES INTENSE YELLING
-//#define WHISPER 209 // causes quiet whispering
-#define DIZZY 210 // Trippy.
+#define LOUD 208 // CAUSES INTENSE YELLING
+#define DIZZY 210 // Trippy.
-#define LISP 300
-#define RADIOACTIVE 301
-#define CHAV 302
-#define SWEDISH 303
-#define SCRAMBLED 304
-#define HORNS 305
-#define IMMOLATE 306
-#define CLOAK 307
-#define CHAMELEON 308
-#define CRYO 309
-#define EATER 310
+#define LISP 300
+#define RADIOACTIVE 301
+#define CHAV 302
+#define SWEDISH 303
+#define SCRAMBLED 304
+#define HORNS 305
+#define IMMOLATE 306
+#define CLOAK 307
+#define CHAMELEON 308
+#define CRYO 309
+#define EATER 310
-#define JUMPY 400
-#define POLYMORPH 401
+#define JUMPY 400
+#define POLYMORPH 401
//disabilities
#define NEARSIGHTED 1
@@ -109,11 +83,9 @@
#define COUGHING 4
#define TOURETTES 8
#define NERVOUS 16
-
-//sdisabilities
-#define BLIND 1
-#define MUTE 2
-#define DEAF 4
+#define BLIND 32
+#define MUTE 64
+#define DEAF 128
//Nutrition levels for humans. No idea where else to put it
#define NUTRITION_LEVEL_FAT 600
diff --git a/code/_globalvars/genetics.dm b/code/_globalvars/genetics.dm
index b642b034921..73b2b7304f6 100644
--- a/code/_globalvars/genetics.dm
+++ b/code/_globalvars/genetics.dm
@@ -53,7 +53,6 @@ var/CHAMELEONBLOCK = 0
var/CRYOBLOCK = 0
var/EATBLOCK = 0
var/JUMPBLOCK = 0
-//var/MELTBLOCK = 0
var/EMPATHBLOCK = 0
var/SUPERFARTBLOCK = 0
var/IMMOLATEBLOCK = 0
@@ -63,7 +62,6 @@ var/POLYMORPHBLOCK = 0
// /vg/ Mutations
///////////////////////////////
var/LOUDBLOCK = 0
-//var/WHISPERBLOCK = 0
var/DIZZYBLOCK = 0
var/list/reg_dna = list( ) //this appears to be a list of UE == real_name correlations
diff --git a/code/datums/spells/genetic.dm b/code/datums/spells/genetic.dm
index 036e2158989..e61819dc183 100644
--- a/code/datums/spells/genetic.dm
+++ b/code/datums/spells/genetic.dm
@@ -2,7 +2,7 @@
name = "Genetic"
desc = "This spell inflicts a set of mutations and disabilities upon the target."
- var/sdisabilities = 0 //bits
+ var/disabilities = 0 //bits
var/list/mutations = list() //mutation strings
var/duration = 100 //deciseconds
/*
@@ -22,14 +22,14 @@
target.mutations.Add(x)
/* if(x == HULK && ishuman(target))
target:hulk_time=world.time + duration */
- target.sdisabilities |= sdisabilities
+ target.disabilities |= disabilities
target.update_mutations() //update target's mutation overlays
var/mob/living/carbon/human/H = target
if(ishuman(target))
H.update_body()
spawn(duration)
target.mutations.Remove(mutations)
- target.sdisabilities &= ~sdisabilities
+ target.disabilities &= ~disabilities
target.update_mutations()
if(ishuman(target))
H.update_body()
diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm
index 8a056245b16..33cc6b8d574 100644
--- a/code/datums/spells/wizard.dm
+++ b/code/datums/spells/wizard.dm
@@ -231,7 +231,7 @@
amt_eye_blurry = 20
/obj/effect/proc_holder/spell/targeted/genetic/blind
- sdisabilities = BLIND
+ disabilities = BLIND
duration = 300
/obj/effect/proc_holder/spell/dumbfire/fireball
diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm
index bbad4a7912f..a30d160fd92 100644
--- a/code/game/dna/genes/disabilities.dm
+++ b/code/game/dna/genes/disabilities.dm
@@ -1,7 +1,7 @@
/////////////////////
// DISABILITY GENES
//
-// These activate either a mutation, disability, or sdisability.
+// These activate either a mutation, disability
//
// Gene is always activated.
/////////////////////
@@ -15,9 +15,6 @@
// Disability to give (or 0)
var/disability=0
- // SDisability to give (or 0)
- var/sdisability=0
-
// Activation message
var/activation_message=""
@@ -33,8 +30,6 @@
M.mutations.Add(mutation)
if(disability)
M.disabilities|=disability
- if(sdisability)
- M.sdisabilities|=sdisability
if(activation_message)
to_chat(M, "[activation_message]")
else
@@ -46,8 +41,6 @@
M.mutations.Remove(mutation)
if(disability)
M.disabilities &= ~disability
- if(sdisability)
- M.sdisabilities &= ~sdisability
if(deactivation_message)
to_chat(M, "[deactivation_message]")
else
@@ -117,7 +110,7 @@
activation_message="You can't seem to see anything."
deactivation_message ="You can see now, in case you didn't notice..."
instability = -GENE_INSTABILITY_MAJOR
- sdisability=BLIND
+ disability=BLIND
/datum/dna/gene/disability/blindness/New()
block=BLINDBLOCK
@@ -127,7 +120,7 @@
activation_message="It's kinda quiet."
deactivation_message ="You can hear again!"
instability = -GENE_INSTABILITY_MAJOR
- sdisability=DEAF
+ disability=DEAF
/datum/dna/gene/disability/deaf/New()
block=DEAFBLOCK
diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm
index 2afb9b7bd83..cac55d7d317 100644
--- a/code/game/dna/genes/goon_disabilities.dm
+++ b/code/game/dna/genes/goon_disabilities.dm
@@ -13,7 +13,7 @@
activation_message = "You feel unable to express yourself at all."
deactivation_message = "You feel able to speak freely again."
instability = -GENE_INSTABILITY_MODERATE
- sdisability = MUTE
+ disability = MUTE
/datum/dna/gene/disability/mute/New()
..()
diff --git a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
index c7a858d7be7..83c29ed9109 100644
--- a/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
+++ b/code/game/gamemodes/changeling/powers/augmented_eyesight.dm
@@ -47,7 +47,7 @@
/obj/item/organ/internal/cyberimp/eyes/shield/ling/on_life()
..()
var/obj/item/organ/internal/eyes/E = owner.get_int_organ(/obj/item/organ/internal/eyes)
- if(owner.eye_blind || owner.eye_blurry || (owner.sdisabilities & BLIND) || (owner.disabilities & NEARSIGHTED) || (E.damage > 0))
+ if(owner.eye_blind || owner.eye_blurry || (owner.disabilities & BLIND) || (owner.disabilities & NEARSIGHTED) || (E.damage > 0))
owner.reagents.add_reagent("oculine", 1)
/obj/item/organ/internal/cyberimp/eyes/shield/ling/prepare_eat()
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 28511c9c6f5..3f24e090ed0 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -844,7 +844,7 @@ var/list/sacrificed = list()
C.show_message("\red The world around you suddenly becomes quiet.", 3)
affected++
if(prob(1))
- C.sdisabilities |= DEAF
+ C.disabilities |= DEAF
if(affected)
usr.say("Sti[pick("'","`")] kaliedir!")
to_chat(usr, "\red The world becomes quiet as the deafening rune dissipates into fine dust.")
@@ -885,7 +885,7 @@ var/list/sacrificed = list()
if(prob(5))
C.disabilities |= NEARSIGHTED
if(prob(10))
- C.sdisabilities |= BLIND
+ C.disabilities |= BLIND
C.show_message("\red Suddenly you see red flash that blinds you.", 3)
affected++
if(affected)
diff --git a/code/game/gamemodes/setupgame.dm b/code/game/gamemodes/setupgame.dm
index e570ea6fc8b..5c509c2d26d 100644
--- a/code/game/gamemodes/setupgame.dm
+++ b/code/game/gamemodes/setupgame.dm
@@ -86,7 +86,6 @@
CRYOBLOCK = getAssignedBlock("CRYO", numsToAssign, DNA_HARD_BOUNDS, good=1)
EATBLOCK = getAssignedBlock("EAT", numsToAssign, DNA_HARD_BOUNDS, good=1)
JUMPBLOCK = getAssignedBlock("JUMP", numsToAssign, DNA_HARD_BOUNDS, good=1)
-// MELTBLOCK = getAssignedBlock("MELT", numsToAssign, good=1)
IMMOLATEBLOCK = getAssignedBlock("IMMOLATE", numsToAssign)
EMPATHBLOCK = getAssignedBlock("EMPATH", numsToAssign, DNA_HARD_BOUNDS, good=1)
SUPERFARTBLOCK = getAssignedBlock("SUPERFART", numsToAssign, DNA_HARDER_BOUNDS, good=1)
@@ -98,7 +97,6 @@
// Disabilities
LOUDBLOCK = getAssignedBlock("LOUD", numsToAssign)
- //WHISPERBLOCK = getAssignedBlock("WHISPER", numsToAssign) BROKEN WITH NEW SAYCODE
DIZZYBLOCK = getAssignedBlock("DIZZY", numsToAssign)
diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm
index decb7fc5922..8ea98b53c8b 100644
--- a/code/game/machinery/adv_med.dm
+++ b/code/game/machinery/adv_med.dm
@@ -444,7 +444,7 @@
occupantData["intOrgan"] = intOrganData
- occupantData["blind"] = (H.sdisabilities & BLIND)
+ occupantData["blind"] = (H.disabilities & BLIND)
occupantData["nearsighted"] = (H.disabilities & NEARSIGHTED)
data["occupant"] = occupantData
@@ -636,7 +636,7 @@
dat += "| [i.name] | N/A | [i.damage] | [infection]:[mech] | | "
dat += ""
dat += ""
- if(occupant.sdisabilities & BLIND)
+ if(occupant.disabilities & BLIND)
dat += "Cataracts detected.
"
if(occupant.disabilities & NEARSIGHTED)
dat += "Retinal misalignment detected.
"
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 74da1ee9187..ea96938ca95 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -71,7 +71,7 @@
"You direct [src] to [M]'s eyes.")
if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected
- if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind
+ if(M.stat == DEAD || M.disabilities & BLIND) //mob is dead or fully blind
to_chat(user, "[M] pupils does not react to the light!")
else if(XRAY in M.mutations) //mob has X-RAY vision
to_chat(user, "[M] pupils give an eerie glow!")
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 005caf3256d..3f49d3e3bde 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -22,7 +22,7 @@
L.client.perspective = EYE_PERSPECTIVE
L.client.eye = src
L.loc = src
- L.sdisabilities += MUTE
+ L.disabilities += MUTE
health = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
intialTox = L.getToxLoss()
intialFire = L.getFireLoss()
@@ -77,7 +77,7 @@
for(var/mob/living/M in src)
M.loc = src.loc
- M.sdisabilities -= MUTE
+ M.disabilities -= MUTE
M.take_overall_damage((M.health - health - 100),0) //any new damage the statue incurred is transfered to the mob
if(M.client)
M.client.eye = M.client.mob
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index e375b09b329..c28f472020d 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -1920,15 +1920,15 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(disabilities & DISABILITY_FLAG_DEAF)
character.dna.SetSEState(DEAFBLOCK,1,1)
- character.sdisabilities|=DEAF
+ character.disabilities|=DEAF
if(disabilities & DISABILITY_FLAG_BLIND)
character.dna.SetSEState(BLINDBLOCK,1,1)
- character.sdisabilities|=BLIND
+ character.disabilities|=BLIND
if(disabilities & DISABILITY_FLAG_MUTE)
character.dna.SetSEState(MUTEBLOCK,1,1)
- character.sdisabilities |= MUTE
+ character.disabilities |= MUTE
S.handle_dna(character)
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 7a67345bc6c..af1dab9098c 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -28,7 +28,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
- if(sdisabilities & BLIND || blinded) //blind people can't see dumbass
+ if(disabilities & BLIND || blinded) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -65,7 +65,7 @@
if(client.prefs.toggles & CHAT_GHOSTEARS && speaker in view(src))
message = "[message]"
- if(sdisabilities & DEAF || ear_deaf)
+ if(disabilities & DEAF || ear_deaf)
if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set
if(speaker == src)
to_chat(src, "You cannot hear yourself speak!")
@@ -95,7 +95,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
- if(sdisabilities & BLIND || blinded) //blind people can't see dumbass
+ if(disabilities & BLIND || blinded) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -182,7 +182,7 @@
formatted = language.format_message_radio(message, verb)
else
formatted = "[verb], \"[message]\""
- if(sdisabilities & DEAF || ear_deaf)
+ if(disabilities & DEAF || ear_deaf)
if(prob(20))
to_chat(src, "You feel your headset vibrate but can hear nothing from it!")
else if(track)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 31a484a0c3b..565f8b7e2e1 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -95,7 +95,7 @@
move_delay_add = max(0, move_delay_add - rand(1, 2))
//Eyes
- if(sdisabilities & BLIND) //disabled-blind, doesn't get better on its own
+ if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
@@ -104,7 +104,7 @@
eye_blurry = max(eye_blurry-1, 0)
//Ears
- if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
+ if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index de750349237..8ddca5b89b7 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -54,7 +54,7 @@
move_delay_add = max(0, move_delay_add - rand(1, 2))
//Eyes
- if(sdisabilities & BLIND) //disabled-blind, doesn't get better on its own
+ if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
@@ -63,7 +63,7 @@
eye_blurry = max(eye_blurry-1, 0)
//Ears
- if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
+ if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
ear_deaf = max(ear_deaf-1, 0)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 40c935188cf..ef5768fcb0e 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -10,7 +10,7 @@
act = copytext(act, 1, t1)
var/muzzled = is_muzzled()
- if(sdisabilities & MUTE || silent)
+ if(disabilities & MUTE || silent)
muzzled = 1
//var/m_type = 1
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 5af70425d50..54d83ca7344 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -861,7 +861,7 @@
else
//blindness
- if(sdisabilities & BLIND) // Disabled-blind, doesn't get better on its own
+ if(disabilities & BLIND) // Disabled-blind, doesn't get better on its own
blinded = 1
else if(eye_blind) // Blindness, heals slowly over time
@@ -881,7 +881,7 @@
//Ears
- if(sdisabilities & DEAF) //disabled-deaf, doesn't get better on its own
+ if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own
ear_deaf = max(ear_deaf, 1)
else if(ear_deaf) //deafness, heals slowly over time
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 138e15d72a1..72e6ff63314 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -106,7 +106,7 @@
var/list/returns[3]
var/speech_problem_flag = 0
- if(silent || (sdisabilities & MUTE))
+ if(silent || (disabilities & MUTE))
message = ""
speech_problem_flag = 1
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index 1582ccb2bd8..b51e0084ee3 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -217,9 +217,9 @@
src.density = !( src.lying )
- if(src.sdisabilities & BLIND)
+ if(src.disabilities & BLIND)
src.blinded = 1
- if(src.sdisabilities & DEAF)
+ if(src.disabilities & DEAF)
src.ear_deaf = 1
if(src.eye_blurry > 0)
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index 93103fc2cae..c568b1b5c6c 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -174,7 +174,7 @@
/mob/living/proc/handle_disabilities()
//Eyes
- if(sdisabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
+ if(disabilities & BLIND || stat) //blindness from disability or unconsciousness doesn't get better on its own
eye_blind = max(eye_blind, 1)
else if(eye_blind) //blindness, heals slowly over time
eye_blind = max(eye_blind-1,0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 93c5dbf871f..5d4155f67e2 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -373,7 +373,6 @@
hallucination = 0
nutrition = 400
bodytemperature = 310
- sdisabilities = 0
disabilities = 0
blinded = 0
eye_blind = 0
@@ -646,7 +645,7 @@
//called when the mob receives a bright flash
/mob/living/proc/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash)
- if(check_eye_prot() < intensity && (override_blindness_check || !(sdisabilities & BLIND)))
+ if(check_eye_prot() < intensity && (override_blindness_check || !(disabilities & BLIND)))
overlay_fullscreen("flash", type)
addtimer(src, "clear_fullscreen", 25, FALSE, "flash", 25)
return 1
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 76e5d03f4fd..0bb9c2ad4a8 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -62,19 +62,19 @@
if(!client) return
if(type)
- if(type & 1 && (sdisabilities & BLIND || blinded || paralysis) )//Vision related
+ if(type & 1 && (disabilities & BLIND || blinded || paralysis) )//Vision related
if(!( alt ))
return
else
msg = alt
type = alt_type
- if(type & 2 && (sdisabilities & DEAF || ear_deaf))//Hearing related
+ if(type & 2 && (disabilities & DEAF || ear_deaf))//Hearing related
if(!( alt ))
return
else
msg = alt
type = alt_type
- if((type & 1 && sdisabilities & BLIND))
+ if((type & 1 && disabilities & BLIND))
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2))
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 777ac70c109..37bb39b7754 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -33,7 +33,6 @@
var/obj/machinery/machine = null
var/other_mobs = null
var/memory = ""
- var/sdisabilities = 0 //Carbon
var/disabilities = 0 //Carbon
var/atom/movable/pulling = null
var/next_move = null
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index ff29bda1d9d..f78f6ba314f 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -63,7 +63,7 @@ proc/iscuffed(A)
proc/isdeaf(A)
if(istype(A, /mob))
var/mob/M = A
- return (M.sdisabilities & DEAF) || M.ear_deaf
+ return (M.disabilities & DEAF) || M.ear_deaf
return 0
proc/hassensorlevel(A, var/level)
@@ -358,7 +358,7 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM)
/proc/is_blind(A)
if(iscarbon(A))
var/mob/living/carbon/C = A
- if(C.sdisabilities & BLIND || C.blinded)
+ if(C.disabilities & BLIND || C.blinded)
return 1
return 0
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index def65e1859d..9c6c8f2fa73 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -15,10 +15,10 @@ var/global/image/typing_indicator
if(ishuman(src))
var/mob/living/carbon/human/H = src
- if(H.sdisabilities & MUTE || H.silent)
+ if(H.disabilities & MUTE || H.silent)
overlays -= typing_indicator
return
-
+
if(client)
if((client.prefs.toggles & SHOW_TYPING) || stat != CONSCIOUS || is_muzzled())
overlays -= typing_indicator
diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm
index 5d4fb8ef6bc..3b5f4f6f06e 100644
--- a/code/modules/reagents/newchem/medicine.dm
+++ b/code/modules/reagents/newchem/medicine.dm
@@ -482,7 +482,7 @@
if(prob(50))
M.disabilities &= ~NEARSIGHTED
if(prob(30))
- M.sdisabilities &= ~BLIND
+ M.disabilities &= ~BLIND
M.eye_blind = 0
if(M.ear_damage <= 25)
if(prob(30))
@@ -696,7 +696,7 @@
/datum/reagent/mutadone/on_mob_life(mob/living/carbon/human/M)
M.jitteriness = 0
- var/needs_update = M.mutations.len > 0 || M.disabilities > 0 || M.sdisabilities > 0
+ var/needs_update = M.mutations.len > 0 || M.disabilities > 0
if(needs_update)
for(var/block=1;block<=DNA_SE_LENGTH;block++)
diff --git a/code/modules/reagents/oldchem/reagents/reagents_admin.dm b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
index fa2f661f648..ccc617d2aaa 100644
--- a/code/modules/reagents/oldchem/reagents/reagents_admin.dm
+++ b/code/modules/reagents/oldchem/reagents/reagents_admin.dm
@@ -25,7 +25,6 @@
if(E.mend_fracture())
E.perma_injury = 0
M.disabilities = 0
- M.sdisabilities = 0
M.eye_blurry = 0
M.eye_blind = 0
M.SetWeakened(0)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index b7eba792060..a33846bcb17 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -357,7 +357,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
- owner.sdisabilities &= ~BLIND
+ owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index 8277be6f241..0f75fe9f80f 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -170,7 +170,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
- owner.sdisabilities &= ~BLIND
+ owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 1249a58c0d0..d64fbf70e3d 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -150,7 +150,7 @@
if(!owner)
return
owner.disabilities &= ~NEARSIGHTED
- owner.sdisabilities &= ~BLIND
+ owner.disabilities &= ~BLIND
owner.eye_blurry = 0
owner.eye_blind = 0