Merge pull request #5429 from Citadel-Station-13/upstream-merge-35519

[MIRROR] Highlander antag datum
2018-02-11 23:31:06 +00:00
parent 38479da184 0b56129932
commit cfc52b01de
4 changed files with 89 additions and 54 deletions
@@ -109,7 +109,8 @@

 /obj/item/claymore/highlander/dropped(mob/living/user)
 	user.remove_trait(TRAIT_IGNORESLOWDOWN, HIGHLANDER)
-	qdel(src) //If this ever happens, it's because you lost an arm
+	if(!QDELETED(src))
+		qdel(src) //If this ever happens, it's because you lost an arm

 /obj/item/claymore/highlander/examine(mob/user)
 	..()