Merge pull request #9131 from jakeramsay007/Runtime-Fixes

Prevents runtime spam from Hugs of the North Star
2019-08-16 16:59:11 -07:00
parent dea9ea4b3f 97c3b2eda7
commit cf55151f04
1 changed files with 6 additions and 0 deletions
@@ -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)