From 91587c69046bc794a3f3fe62019792bdbb409add Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sat, 8 Aug 2020 20:48:53 -0700
Subject: [PATCH] Merge pull request #7398 from Cerebulon/stickyfixy

Stickynote tweaks
---
 code/datums/supplypacks/supply.dm      |  1 +
 code/modules/paperwork/paper_sticky.dm | 45 +++++++++++++++++---------
 code/modules/paperwork/paperbin.dm     |  2 +-
 3 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/code/datums/supplypacks/supply.dm b/code/datums/supplypacks/supply.dm
index 5c35e2ae6fd..e9fa3f2d998 100644
--- a/code/datums/supplypacks/supply.dm
+++ b/code/datums/supplypacks/supply.dm
@@ -89,6 +89,7 @@
 	name = "Stationery - sticky notes (50)"
 	contains = list(/obj/item/sticky_pad/random)
 	cost = 10
+	containertype = /obj/structure/closet/crate/ummarcar
 	containername = "\improper Sticky notes crate"
 
 /datum/supply_pack/supply/spare_pda
diff --git a/code/modules/paperwork/paper_sticky.dm b/code/modules/paperwork/paper_sticky.dm
index e2904aba374..5c1efb2a28c 100644
--- a/code/modules/paperwork/paper_sticky.dm
+++ b/code/modules/paperwork/paper_sticky.dm
@@ -1,6 +1,7 @@
 /obj/item/sticky_pad
 	name = "sticky note pad"
 	desc = "A pad of densely packed sticky notes."
+	description_info = "Click to remove a sticky note from the pile. Click-drag to yourself to pick up the stack. Sticky notes stuck to surfaces/objects will persist for 50 rounds."
 	color = COLOR_YELLOW
 	icon = 'icons/obj/stickynotes.dmi'
 	icon_state = "pad_full"
@@ -50,24 +51,38 @@
 	. = ..()
 	if(.)
 		to_chat(user, SPAN_NOTICE("It has [papers] sticky note\s left."))
-		to_chat(user, SPAN_NOTICE("You can click it on grab intent to pick it up."))
 
 /obj/item/sticky_pad/attack_hand(var/mob/user)
-	if(user.a_intent == I_GRAB)
-		..()
+	var/obj/item/weapon/paper/paper = new paper_type(get_turf(src))
+	paper.set_content(written_text, "sticky note")
+	paper.last_modified_ckey = written_by
+	paper.color = color
+	written_text = null
+	user.put_in_hands(paper)
+	to_chat(user, SPAN_NOTICE("You pull \the [paper] off \the [src]."))
+	papers--
+	if(papers <= 0)
+		qdel(src)
 	else
-		var/obj/item/weapon/paper/paper = new paper_type(get_turf(src))
-		paper.set_content(written_text, "sticky note")
-		paper.last_modified_ckey = written_by
-		paper.color = color
-		written_text = null
-		user.put_in_hands(paper)
-		to_chat(user, SPAN_NOTICE("You pull \the [paper] off \the [src]."))
-		papers--
-		if(papers <= 0)
-			qdel(src)
-		else
-			update_icon()
+		update_icon()
+
+/obj/item/sticky_pad/MouseDrop(mob/user as mob)
+	if(user == usr && !(usr.restrained() || usr.stat) && (usr.contents.Find(src) || in_range(src, usr)))
+		if(!istype(usr, /mob/living/simple_mob))
+			if( !usr.get_active_hand() )		//if active hand is empty
+				var/mob/living/carbon/human/H = user
+				var/obj/item/organ/external/temp = H.organs_by_name["r_hand"]
+
+				if (H.hand)
+					temp = H.organs_by_name["l_hand"]
+				if(temp && !temp.is_usable())
+					to_chat(user, "<span class='notice'>You try to move your [temp.name], but cannot!</span>")
+					return
+
+				to_chat(user, "<span class='notice'>You pick up the [src].</span>")
+				user.put_in_hands(src)
+
+	return
 
 /obj/item/sticky_pad/random/Initialize()
 	. = ..()
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index f7a726d60de..69c14fe8b97 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -19,7 +19,7 @@
 
 
 /obj/item/weapon/paper_bin/MouseDrop(mob/user as mob)
-	if((user == usr && (!( usr.restrained() ) && (!( usr.stat ) && (usr.contents.Find(src) || in_range(src, usr))))))
+	if(user == usr && !(usr.restrained() || usr.stat) && (usr.contents.Find(src) || in_range(src, usr)))
 		if(!istype(usr, /mob/living/simple_mob))
 			if( !usr.get_active_hand() )		//if active hand is empty
 				var/mob/living/carbon/human/H = user