From 97c3b2eda7b9fa80b48e6eab1a9cadf13c295f9f Mon Sep 17 00:00:00 2001 From: Chayse Ramsay Date: Wed, 14 Aug 2019 18:29:35 +0100 Subject: [PATCH] Prevents runtime spam from Hugs of the North Star Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent. --- code/modules/clothing/gloves/miscellaneous.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 1af24f8e61..cc6d65b74d 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -65,6 +65,9 @@ var/warcry = "AT" /obj/item/clothing/gloves/rapid/Touch(mob/living/target,proximity = TRUE) + if(!istype(target)) + return + var/mob/living/M = loc if(M.a_intent == INTENT_HARM) @@ -87,6 +90,9 @@ warcry = "owo" //Shouldn't ever come into play /obj/item/clothing/gloves/rapid/hug/Touch(mob/living/target,proximity = TRUE) + if(!istype(target)) + return + var/mob/living/M = loc if(M.a_intent == INTENT_HELP)