Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-08-17 05:43:05 -05:00
parent 725a8046e1 c2dd7111d0
commit 2d40733ff7
29 changed files with 146 additions and 103 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)