Stationbound Bugfix Bundle (#12025)

code/modules/paperwork/paper_bundle.dm

@@ -174,7 +174,14 @@
 
 		if(pages.len <= 1)
 			var/obj/item/paper/P = src[1]
-			usr.put_in_hands(P)
+			if(istype(loc, /obj/item/gripper)) //Hacky but without it there's a ghost icon with grippers and it all spills on the floor.
+				var/obj/item/gripper/G = loc
+				G.drop(get_turf(src), FALSE)
+				G.grip_item(P, usr, FALSE)
+			else
+				usr.put_in_hands(P)
+			usr.unset_machine(src)
+			usr << browse(null, "window=[name]")
 			qdel(src)
 			return
 

code/modules/paperwork/papershredder.dm

@@ -127,7 +127,6 @@
 			add_overlay("papershredder4")
 		if(10)
 			add_overlay("papershredder5")
-	update_icon()
 
 /obj/item/shreddedp/attackby(var/obj/item/W as obj, var/mob/user)
 	if(istype(W, /obj/item/flame/lighter))