From b0f951d0a719dd7a1c296756e67abdd99a8bb937 Mon Sep 17 00:00:00 2001
From: Hockaa <69127651+Hockaa@users.noreply.github.com>
Date: Sat, 7 Nov 2020 18:32:39 +0000
Subject: [PATCH] cures noticeboard clumsiness (#10455)

---
 code/game/objects/structures/noticeboard.dm | 4 ++--
 html/changelogs/hockaa-noticeboardhands.yml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/hockaa-noticeboardhands.yml

diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 04379b10712..48f97776d80 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -53,8 +53,8 @@
 		if((usr.stat || usr.restrained()))	//For when a player is handcuffed while they have the notice window open
 			return
 		var/obj/item/P = locate(href_list["remove"])
-		if(P && P.loc == src)
-			P.forceMove(get_turf(src))	//dump paper on the floor because you're a clumsy fuck
+		if(P && P.loc == src && Adjacent(usr))
+			usr.put_in_hands(P) // we are no longer clumsy fucks
 			P.add_fingerprint(usr)
 			add_fingerprint(usr)
 			notices--
diff --git a/html/changelogs/hockaa-noticeboardhands.yml b/html/changelogs/hockaa-noticeboardhands.yml
new file mode 100644
index 00000000000..2fb1061d7b9
--- /dev/null
+++ b/html/changelogs/hockaa-noticeboardhands.yml
@@ -0,0 +1,6 @@
+author: Hocka
+
+delete-after: True
+
+changes: 
+  - tweak: "Noticeboards now try to put paper directly into your hands instead of immediately on the floor."