diff --git a/code/citadel/organs/genitals.dm b/code/citadel/organs/genitals.dm index 1f46778aaf..79784a1eb8 100644 --- a/code/citadel/organs/genitals.dm +++ b/code/citadel/organs/genitals.dm @@ -260,7 +260,7 @@ for(var/L in relevant_layers) //Less hardcode H.remove_overlay(L) - if(H.disabilities & HUSK) + if(H.has_disability(DISABILITY_HUSK)) return //start scanning for genitals //var/list/worn_stuff = H.get_equipped_items()//cache this list so it's not built again diff --git a/code/modules/mob/living/carbon/status_procs.dm b/code/modules/mob/living/carbon/status_procs.dm index e0743e2815..efde375227 100644 --- a/code/modules/mob/living/carbon/status_procs.dm +++ b/code/modules/mob/living/carbon/status_procs.dm @@ -64,43 +64,8 @@ /mob/living/carbon/set_disgust(amount) disgust = CLAMP(amount, 0, DISGUST_LEVEL_MAXEDOUT) -/mob/living/carbon/cure_blind() - if(disabilities & BLIND) - disabilities &= ~BLIND - adjust_blindness(-1) - return 1 -/mob/living/carbon/become_blind() - if(!(disabilities & BLIND)) - disabilities |= BLIND - blind_eyes(1) - return 1 -/mob/living/carbon/cure_nearsighted() - if(disabilities & NEARSIGHT) - disabilities &= ~NEARSIGHT - clear_fullscreen("nearsighted") - return 1 - -/mob/living/carbon/become_nearsighted() - if(!(disabilities & NEARSIGHT)) - disabilities |= NEARSIGHT - overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1) - return 1 - -/mob/living/carbon/cure_husk() - if(disabilities & HUSK) - disabilities &= ~HUSK - status_flags &= ~DISFIGURED - update_body() - return 1 - -/mob/living/carbon/become_husk() - if(disabilities & HUSK) - return - disabilities |= HUSK - status_flags |= DISFIGURED //makes them unknown - update_body() - return 1 +////////////////////////////////////////TRAUMAS///////////////////////////////////////// /mob/living/carbon/proc/get_traumas() . = list() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index b1a5e7f640..fa315068ac 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -72,7 +72,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list( /mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE) var/static/list/crit_allowed_modes = list(MODE_WHISPER = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) - var/key = get_key(message) + var/talk_key = get_key(message) var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE) diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 86719ebb84..95033b1459 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -212,4 +212,4 @@ if(!has_disability(DISABILITY_HUSK)) status_flags |= DISFIGURED //makes them unknown update_body() - add_disability(DISABILITY_HUSK, source) + add_disability(DISABILITY_HUSK, source) \ No newline at end of file diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index 2b86a8c6a4..591498c084 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -160,7 +160,7 @@ overlay_fullscreen("blind", /obj/screen/fullscreen/blind) else if(eye_blind) var/blind_minimum = 0 - if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) + if((stat != CONSCIOUS && stat != SOFT_CRIT)) blind_minimum = 1 if(isliving(src)) var/mob/living/L = src @@ -181,7 +181,7 @@ overlay_fullscreen("blind", /obj/screen/fullscreen/blind) else if(eye_blind) var/blind_minimum = 0 - if((stat != CONSCIOUS && stat != SOFT_CRIT) || (disabilities & BLIND)) + if(stat != CONSCIOUS && stat != SOFT_CRIT) blind_minimum = 1 if(isliving(src)) var/mob/living/L = src @@ -235,31 +235,6 @@ /mob/proc/set_disgust(amount) return -/////////////////////////////////// BLIND DISABILITY //////////////////////////////////// - -/mob/proc/cure_blind() //when we want to cure the BLIND disability only. - return - -/mob/proc/become_blind() - return - -/////////////////////////////////// NEARSIGHT DISABILITY //////////////////////////////////// - -/mob/proc/cure_nearsighted() - return - -/mob/proc/become_nearsighted() - return - - -//////////////////////////////// HUSK DISABILITY ///////////////////////////: - -/mob/proc/cure_husk() - return - -/mob/proc/become_husk() - return -