Merge pull request #1129 from Citadel-Station-13/upstream-merge-27531

[MIRROR] Fixes paper bins and moves paper to initialize
2017-05-23 04:59:39 -05:00
parent 3cf30f3a6b 2ea155e6a7
commit f155251cf2
2 changed files with 3 additions and 3 deletions
@@ -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()
@@ -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