From ef482a0d5ded93758ce4cfa2de0249223e91219c Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 25 Jun 2018 19:39:16 -0500 Subject: [PATCH] Merge pull request #5374 from Mechoid/Commwatchbug Gloves cannot be put over Commwatches. --- code/modules/clothing/clothing.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 329f905a66f..ea616226ba4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -253,7 +253,8 @@ var/mob/living/carbon/human/H = user if(slot && slot == slot_gloves) - if(H.gloves) + var/obj/item/clothing/gloves/G = H.gloves + if(istype(G)) ring = H.gloves if(ring.glove_level >= src.glove_level) to_chat(user, "You are unable to wear \the [src] as \the [H.gloves] are in the way.")