Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494

[MIRROR] Fixes two unrelated runtimes
2017-12-14 03:54:08 +00:00
parent a4fafb2b51 2e83779018
commit fb492b5a14
2 changed files with 6 additions and 4 deletions
@@ -137,8 +137,9 @@
 	. = ..()
 	if(.)
 		var/mob/living/L = target
-		L.adjust_fire_stacks(0.1)
-		L.IgniteMob()
+		if (istype(L))
+			L.adjust_fire_stacks(0.1)
+			L.IgniteMob()

 /obj/item/projectile/temp/basilisk/icewing
 	damage = 5