From 9c546aeeca74cd968faad59dbf68b9310fc5d46c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 5 Sep 2022 13:52:52 +0200 Subject: [PATCH] [MIRROR] Removes-blind_eyes [MDB IGNORE] (#16061) * Removes-blind_eyes (#69652) * Removes blind_eyes, replaces it with adjust_blindness. * Removes-blind_eyes Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com> --- code/datums/brain_damage/phobia.dm | 2 +- code/datums/elements/light_eaten.dm | 2 +- code/game/objects/items/crayons.dm | 2 +- code/game/objects/items/granters/magic/blind.dm | 2 +- code/modules/antagonists/changeling/powers/tiny_prick.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 2 +- .../modules/antagonists/heretic/structures/carving_knife.dm | 2 +- code/modules/clothing/glasses/_glasses.dm | 2 +- code/modules/mob/living/brain/status_procs.dm | 3 --- code/modules/mob/living/carbon/carbon_defense.dm | 2 +- code/modules/mob/living/silicon/ai/life.dm | 2 +- code/modules/mob/living/simple_animal/hostile/statue.dm | 2 +- code/modules/mob/living/simple_animal/status_procs.dm | 3 --- code/modules/mob/status_procs.dm | 5 ----- code/modules/reagents/chemistry/reagents/food_reagents.dm | 6 +++--- code/modules/spells/spell_types/pointed/blind.dm | 2 +- 16 files changed, 15 insertions(+), 26 deletions(-) diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm index 7e8f0d1ab99..a33ba62c9d5 100644 --- a/code/datums/brain_damage/phobia.dm +++ b/code/datums/brain_damage/phobia.dm @@ -121,7 +121,7 @@ if(3) to_chat(owner, span_warning("You shut your eyes in terror!")) owner.set_timed_status_effect(10 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) - owner.blind_eyes(10) + owner.adjust_blindness(10) if(4) owner.adjust_timed_status_effect(20 SECONDS, /datum/status_effect/dizziness) owner.adjust_timed_status_effect(10 SECONDS, /datum/status_effect/confusion) diff --git a/code/datums/elements/light_eaten.dm b/code/datums/elements/light_eaten.dm index 3183fef1efd..e32e21dd79f 100644 --- a/code/datums/elements/light_eaten.dm +++ b/code/datums/elements/light_eaten.dm @@ -67,6 +67,6 @@ if(isliving(examiner) && prob(20)) var/mob/living/target = examiner examine_text += span_danger("You can feel something in [eaten_light.p_them()] gnash at your eyes!") - target.blind_eyes(5) + target.adjust_blindness(5) target.blur_eyes(10) return NONE diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index c2ec947c118..00d123ca34c 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -686,7 +686,7 @@ if(C.client) C.blur_eyes(3) - C.blind_eyes(1) + C.adjust_blindness(1) if(C.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. Warning: don't add a stun here. It's a roundstart item with some quirks. C.apply_effects(eyeblur = 5, jitter = 10) flash_color(C, flash_color=paint_color, flash_time=40) diff --git a/code/game/objects/items/granters/magic/blind.dm b/code/game/objects/items/granters/magic/blind.dm index 2107af802c7..ee79de3565f 100644 --- a/code/game/objects/items/granters/magic/blind.dm +++ b/code/game/objects/items/granters/magic/blind.dm @@ -16,4 +16,4 @@ /obj/item/book/granter/action/spell/blind/recoil(mob/living/user) . = ..() to_chat(user, span_warning("You go blind!")) - user.blind_eyes(10) + user.adjust_blindness(10) diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index 6cb348b679a..052b7043516 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -209,7 +209,7 @@ log_combat(user, target, "stung", "blind sting") to_chat(target, span_danger("Your eyes burn horrifically!")) target.become_nearsighted(EYE_DAMAGE) - target.blind_eyes(20) + target.adjust_blindness(20) target.blur_eyes(40) return TRUE diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 57fef0b41f3..2ee2519495b 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -515,7 +515,7 @@ Striking a noncultist, however, will tear their flesh."} user.dropItemToGround(src, TRUE) user.set_timed_status_effect(1 MINUTES, /datum/status_effect/dizziness, only_if_higher = TRUE) user.Paralyze(100) - user.blind_eyes(30) + user.adjust_blindness(30) /obj/item/reagent_containers/cup/beaker/unholywater name = "flask of unholy water" diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm index ec743a2abce..58bb1502f88 100644 --- a/code/modules/antagonists/heretic/structures/carving_knife.dm +++ b/code/modules/antagonists/heretic/structures/carving_knife.dm @@ -243,6 +243,6 @@ carbon_victim.adjust_timed_status_effect(5 SECONDS, /datum/status_effect/confusion) carbon_victim.set_timed_status_effect(20 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE) carbon_victim.set_timed_status_effect(40 SECONDS, /datum/status_effect/dizziness, only_if_higher = TRUE) - carbon_victim.blind_eyes(2) + carbon_victim.adjust_blindness(2) carbon_victim.add_mood_event("gates_of_mansus", /datum/mood_event/gates_of_mansus) playsound(src, 'sound/magic/blind.ogg', 75, TRUE) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index b01819f6ab8..212ca6d9d7b 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -61,7 +61,7 @@ if(H.glasses == src) to_chat(H, span_danger("[src] overloads and blinds you!")) H.flash_act(visual = 1) - H.blind_eyes(3) + H.adjust_blindness(3) H.blur_eyes(5) eyes.applyOrganDamage(5) diff --git a/code/modules/mob/living/brain/status_procs.dm b/code/modules/mob/living/brain/status_procs.dm index 88cd14591b9..f977c8506bf 100644 --- a/code/modules/mob/living/brain/status_procs.dm +++ b/code/modules/mob/living/brain/status_procs.dm @@ -4,9 +4,6 @@ /////////////////////////////////// EYE_BLIND //////////////////////////////////// -/mob/living/brain/blind_eyes() // no eyes to damage or heal - return - /mob/living/brain/adjust_blindness() return diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 853146686ed..23ac333de02 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -624,7 +624,7 @@ eyes.applyOrganDamage(rand(12, 16)) if(eyes.damage > 10) - blind_eyes(damage) + adjust_blindness(damage) blur_eyes(damage * rand(3, 6)) if(eyes.damage > 20) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 635042926b7..f32fc139915 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -165,7 +165,7 @@ /mob/living/silicon/ai/proc/ai_lose_power() disconnect_shell() setAiRestorePowerRoutine(POWER_RESTORATION_START) - blind_eyes(1) + adjust_blindness(1) update_sight() to_chat(src, span_alert("You've lost power!")) addtimer(CALLBACK(src, .proc/start_RestorePowerRoutine), 20) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index bbf80d5659a..3d383f91af9 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -195,4 +195,4 @@ return things /datum/action/cooldown/spell/aoe/blindness/cast_on_thing_in_aoe(mob/living/victim, atom/caster) - victim.blind_eyes(4) + victim.adjust_blindness(4) diff --git a/code/modules/mob/living/simple_animal/status_procs.dm b/code/modules/mob/living/simple_animal/status_procs.dm index c5f0c8cb4b9..41673952951 100644 --- a/code/modules/mob/living/simple_animal/status_procs.dm +++ b/code/modules/mob/living/simple_animal/status_procs.dm @@ -1,7 +1,4 @@ -/mob/living/simple_animal/blind_eyes() - return - /mob/living/simple_animal/adjust_blindness() return diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index aa617e5face..174b130b802 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -12,11 +12,6 @@ /mob/proc/adjust_drowsyness(amount) drowsyness = max(drowsyness + amount, 0) - -///Blind a mobs eyes by amount -/mob/proc/blind_eyes(amount) - adjust_blindness(amount) - /** * Adjust a mobs blindness by an amount * diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 634b277aca8..a5237b9f61e 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -386,7 +386,7 @@ victim.emote("scream") victim.emote("cry") victim.blur_eyes(5) // 10 seconds - victim.blind_eyes(3) // 6 seconds + victim.adjust_blindness(3) // 6 seconds victim.set_timed_status_effect(5 SECONDS, /datum/status_effect/confusion, only_if_higher = TRUE) victim.Knockdown(3 SECONDS) victim.add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray) @@ -715,7 +715,7 @@ else if(!exposed_mob.eye_blurry) to_chat(exposed_mob, span_warning("Tears well up in your eyes!")) - exposed_mob.blind_eyes(2) + exposed_mob.adjust_blindness(2) exposed_mob.blur_eyes(5) /datum/reagent/consumable/tearjuice/on_mob_life(mob/living/carbon/M, delta_time, times_fired) @@ -724,7 +724,7 @@ M.blur_eyes(4 * REM * delta_time) if(DT_PROB(5, delta_time)) to_chat(M, span_warning("Your eyes sting!")) - M.blind_eyes(2) + M.adjust_blindness(2) /datum/reagent/consumable/nutriment/stabilized diff --git a/code/modules/spells/spell_types/pointed/blind.dm b/code/modules/spells/spell_types/pointed/blind.dm index cd044e5cb40..2c01da24b6d 100644 --- a/code/modules/spells/spell_types/pointed/blind.dm +++ b/code/modules/spells/spell_types/pointed/blind.dm @@ -40,7 +40,7 @@ return FALSE to_chat(cast_on, span_warning("Your eyes cry out in pain!")) - cast_on.blind_eyes(eye_blind_amount) + cast_on.adjust_blindness(eye_blind_amount) cast_on.blur_eyes(eye_blurry_amount) if(cast_on.dna && blind_mutation_duration > 0 SECONDS) cast_on.dna.add_mutation(/datum/mutation/human/blind)