Merge remote-tracking branch 'citadel/master' into mobility_flags

2020-02-04 16:01:25 -07:00
parent 611fd7ea89 66638a39b7
commit 6a8a606f97
1118 changed files with 49543 additions and 11522 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 ..()