diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index acc8b793ea8..663c8020f6a 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -47,7 +47,7 @@ Bonus return var/mob/living/carbon/M = A.affected_mob var/list/healthy_messages = list("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.",\ - "Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.") + "Your eyes feel great.", "Your ears feel great.", "You don't feel the need to blink.") switch(A.stage) if(1, 2) if(prob(base_message_chance)) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 4e01756f5fc..e7c6c78bf9f 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -80,30 +80,25 @@ if(!..()) return var/mob/living/M = A.affected_mob - var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) - if (!eyes) - return switch(A.stage) if(4, 5) - M.restoreEars() - + M.restoreEars() //this is mostly just copy+pasted from oculine and inacusiate + M.adjust_blindness(-2) + M.adjust_blurriness(-2) + var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) + if(!eyes) + return + eyes.applyOrganDamage(-2) if(HAS_TRAIT_FROM(M, TRAIT_BLIND, EYE_DAMAGE)) if(prob(20)) - to_chat(M, "Your vision slowly returns...") + to_chat(M, "Your vision slowly returns...") M.cure_blind(EYE_DAMAGE) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) - - else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE)) - to_chat(M, "You can finally focus your eyes on distant objects.") - M.cure_nearsighted(EYE_DAMAGE) - M.blur_eyes(10) - - else if(M.eye_blind || M.eye_blurry) - M.set_blindness(0) - M.set_blurriness(0) - else if(eyes.damage > 0) - eyes.applyOrganDamage(-1) + else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE)) + to_chat(M, "The blackness in your peripheral vision fades.") + M.cure_nearsighted(EYE_DAMAGE) + M.blur_eyes(10) else if(prob(base_message_chance)) - to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your healing feels more acute.")]") + to_chat(M, "[pick("Your eyes feel great.","You feel like your eyes can focus more clearly.", "You don't feel the need to blink.","Your ears feel great.","Your hearing feels more acute.")]") diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index 16e45f22f92..af0ba84621d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -639,6 +639,8 @@ /datum/reagent/medicine/oculine/on_mob_life(mob/living/carbon/M) var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES) + M.adjust_blindness(-2) + M.adjust_blurriness(-2) if (!eyes) return eyes.applyOrganDamage(-2) @@ -648,19 +650,15 @@ M.cure_blind(EYE_DAMAGE) M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(35) - else if(HAS_TRAIT_FROM(M, TRAIT_NEARSIGHT, EYE_DAMAGE)) to_chat(M, "The blackness in your peripheral vision fades.") M.cure_nearsighted(EYE_DAMAGE) M.blur_eyes(10) - else if(M.eye_blind || M.eye_blurry) - M.set_blindness(0) - M.set_blurriness(0) ..() /datum/reagent/medicine/inacusiate name = "Inacusiate" - description = "Instantly restores all hearing to the patient, but does not cure deafness." + description = "Instantly restores all hearing to the patient, but does not work on patients without ears, cure genetic deafness, or cure chronic deafness." //by "chronic" deafness, we mean people with the "deaf" quirk color = "#606060" // ditto /datum/reagent/medicine/inacusiate/on_mob_life(mob/living/carbon/M)