From e9ff5e00e024e496ae81e1ab2ce06261b37ea40a Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Wed, 11 Jan 2023 20:49:26 -0600 Subject: [PATCH] works on my machine --- .../clothing/glasses/prescription_kit.dm | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/glasses/prescription_kit.dm b/code/modules/clothing/glasses/prescription_kit.dm index 8c6d2274bb..9e324d34f0 100644 --- a/code/modules/clothing/glasses/prescription_kit.dm +++ b/code/modules/clothing/glasses/prescription_kit.dm @@ -10,13 +10,23 @@ /obj/item/prescription_kit/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/clothing/glasses) && I.Adjacent(user)) var/obj/item/clothing/glasses/target_glasses = I - if(target_glasses.vision_correction) - to_chat(user, span_notice("These are already fitted with prescription lenses or otherwise already correct vision!")) - return - playsound(src, 'sound/items/screwdriver.ogg', 50, 1) - user.visible_message(span_notice("[user] fits \the [target_glasses] with a prescription overlay device."), span_notice("You fit \the [target_glasses] with a prescription overlay device.")) - target_glasses.prescribe() - target_glasses.balloon_alert(user, "prescription fitted!") - qdel(src) + prescribe(target_glasses, user) else return ..() + +/obj/item/prescription_kit/afterattack(atom/target, mob/user, proximity_flag, click_parameters) + if(istype(target, /obj/item/clothing/glasses) && target.Adjacent(user)) + var/obj/item/clothing/glasses/target_glasses = target + prescribe(target_glasses, user) + else + . = ..() + +/obj/item/prescription_kit/proc/prescribe(obj/item/clothing/glasses/target_glasses, mob/user) + if(target_glasses.vision_correction) + to_chat(user, span_notice("These are already fitted with prescription lenses or otherwise already correct vision!")) + return + playsound(src, 'sound/items/screwdriver.ogg', 50, 1) + user.visible_message(span_notice("[user] fits \the [target_glasses] with a prescription overlay device."), span_notice("You fit \the [target_glasses] with a prescription overlay device.")) + target_glasses.prescribe() + target_glasses.balloon_alert(user, "prescription fitted!") + qdel(src)