Merge pull request #10701 from Ghommie/Ghommie-cit527

Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
parent a00d1fb05e f6beadb494
commit 3bf0e1d5c4
13 changed files with 35 additions and 18 deletions
@@ -42,8 +42,9 @@
 	if(.)
 		return
 	to_chat(user, "<span class='notice'>You take down [src].</span>")
-	victim.forceMove(drop_location())
-	victim = null
+	if(victim)
+		victim.forceMove(drop_location())
+		victim = null
 	spear.forceMove(drop_location())
 	spear = null
 	qdel(src)