From ee73a9d51983a79d6695ee8a5b3aed1b98c7df8e Mon Sep 17 00:00:00 2001
From: Arokha Sieyes <arokha@arokha.com>
Date: Fri, 13 Apr 2018 11:51:25 -0400
Subject: [PATCH] Probably fixes #3457 - Paper plane creation weirdness with
 paper

---
 code/modules/paperwork/paperplane.dm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index bb37a380b6..3b4833a533 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -19,7 +19,11 @@
 		internalPaper = newPaper
 		flags = newPaper.flags
 		color = newPaper.color
-		newPaper.forceMove(src)
+		if(isstorage(newPaper.loc))
+			var/obj/item/weapon/storage/S = newPaper.loc
+			S.remove_from_storage(newPaper, src)
+		else
+			newPaper.forceMove(src)
 	else
 		internalPaper = new /obj/item/weapon/paper(src)
 	update_icon()