From 2ea155e6a7b13e361ec9f6b837ad3b58cd0c3516 Mon Sep 17 00:00:00 2001
From: CitadelStationBot <CitadelStationBot>
Date: Mon, 22 May 2017 22:51:23 -0500
Subject: [PATCH] Fixes paper bins and moves paper to initialize

---
 code/modules/paperwork/paper.dm    | 4 ++--
 code/modules/paperwork/paperbin.dm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 0dc080bd19..976e48707b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -44,8 +44,8 @@
 	..()
 
 
-/obj/item/weapon/paper/New()
-	..()
+/obj/item/weapon/paper/Initialize()
+	. = ..()
 	pixel_y = rand(-8, 8)
 	pixel_x = rand(-9, 9)
 	update_icon()
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index cf7c28d2ba..0818c7c32f 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -110,7 +110,7 @@
 		papers.Add(P)
 		total_paper++
 		update_icon()
-	else if(istype(I, /obj/item/weapon/pen))
+	else if(istype(I, /obj/item/weapon/pen) && !bin_pen)
 		var/obj/item/weapon/pen/P = I
 		if(!user.transferItemToLoc(P, src))
 			return