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
@@ -34,7 +34,9 @@

 /obj/item/paperplane/handle_atom_del(atom/A)
 	if(A == internalPaper)
+		var/obj/item/paper/P = internalPaper
 		internalPaper = null
+		P.moveToNullspace() //So we're not deleting it twice when deleting our contents.
 		if(!QDELETED(src))
 			qdel(src)
 	return ..()