Merge branch 'master' into Ghommie-cit367

2019-12-31 22:37:59 +00:00
parent edd05cebea a3ee3fe826
commit b651bbcdb3
244 changed files with 3041 additions and 1886 deletions
@@ -91,6 +91,8 @@
 		var/obj/item/clothing/gloves/G = gloves
 		if(istype(G) && G.Touch(A,0)) // for magic gloves
 			return
+	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)