diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 26b9d64c80..6ee7d51091 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -91,10 +91,8 @@
 		var/obj/item/clothing/gloves/G = gloves
 		if(istype(G) && G.Touch(A,0)) // for magic gloves
 			return
-	if (glasses)
-		var/obj/item/clothing/glasses/Gl = glasses
-		if (istype(Gl))
-			Gl.ranged_attack(src,A,mouseparams)
+	if (istype(glasses) && glasses.ranged_attack(src,A,mouseparams))
+		return
 
 	for(var/datum/mutation/human/HM in dna.mutations)
 		HM.on_ranged_attack(src, A, mouseparams)
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 7d1ca624e3..969af341ed 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -55,7 +55,7 @@
 		eyes.applyOrganDamage(5)
 
 /obj/item/clothing/glasses/proc/ranged_attack(mob/living/carbon/human/user,atom/A, params)
-	return
+	return FALSE
 
 /obj/item/clothing/glasses/meson
 	name = "optical meson scanner"
diff --git a/code/modules/clothing/glasses/disablerglasses.dm b/code/modules/clothing/glasses/disablerglasses.dm
index a349642d6c..a46e4c8339 100644
--- a/code/modules/clothing/glasses/disablerglasses.dm
+++ b/code/modules/clothing/glasses/disablerglasses.dm
@@ -5,11 +5,11 @@
 
 /obj/item/clothing/glasses/hud/security/sunglasses/disablers/ranged_attack(mob/living/carbon/human/user,atom/A, params)
 	user.changeNext_move(CLICK_CD_RANGE)
-
 	var/obj/item/projectile/beam/disabler/LE = new beamtype( loc )
 	playsound(usr.loc, 'sound/weapons/taser2.ogg', 75, 1)
 	LE.firer = src
 	LE.def_zone = user.get_organ_target()
 	LE.preparePixelProjectile(A, src, params)
 	LE.fire()
+	return TRUE
 	//shamelessly copied
\ No newline at end of file