Merge branch 'master' into pawnch_2_the_pawnchening

2020-04-06 12:29:14 +10:00
parent a6bd6d23fe 70cd562b36
commit 33a056b373
11 changed files with 60 additions and 30 deletions
@@ -31,4 +31,5 @@

 /datum/antagonist/abductee/remove_innate_effects(mob/living/mob_override)
 	update_abductor_icons_removed(mob_override ? mob_override.mind : owner)
-	qdel(brain_trauma)
+	if(!QDELETED(brain_trauma))
+		qdel(brain_trauma)