From 953f7847d96ab0c83913fe32af47f8933adae510 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Tue, 17 Dec 2019 17:52:35 +0100
Subject: [PATCH 1/3] Airlock note QOL

---
 code/game/machinery/doors/airlock.dm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 610bbb73b06..9b100909226 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -983,6 +983,15 @@ About the new airlock wires panel:
 		if(note)
 			to_chat(user, "<span class='warning'>There's already something pinned to this airlock! Use wirecutters or your hands to remove it.</span>")
 			return
+
+		if(!user.canUnEquip(C))
+			to_chat(user, "<span class='warning'>For some reason, you can't attach [C]!</span>")
+			return
+		
+		// QOL for cultists
+		if(!do_after_once(user, 10, target = src))
+			return
+		
 		if(!user.unEquip(C))
 			to_chat(user, "<span class='warning'>For some reason, you can't attach [C]!</span>")
 			return
@@ -1349,7 +1358,8 @@ About the new airlock wires panel:
 		else
 			user.visible_message("<span class='notice'>[user] cuts down [note] from [src].</span>", "<span class='notice'>You remove [note] from [src].</span>")
 			playsound(src, 'sound/items/wirecutter.ogg', 50, 1)
-		note.forceMove(get_turf(user))
+		if(!user.put_in_active_hand(note) && !user.put_in_inactive_hand(note))
+			note.forceMove(get_turf(user))
 		note = null
 		update_icon()
 		return TRUE

From c7c5b5a89920e25b2c48e8587f155de1a2b30a65 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Wed, 18 Dec 2019 23:04:18 +0100
Subject: [PATCH 2/3] Cult papers can't be placed on airlocks

---
 code/game/machinery/doors/airlock.dm | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 9b100909226..fb07debfe7b 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -979,19 +979,10 @@ About the new airlock wires panel:
 	else if(istype(C, /obj/item/pai_cable))	// -- TLE
 		var/obj/item/pai_cable/cable = C
 		cable.plugin(src, user)
-	else if(istype(C, /obj/item/paper) || istype(C, /obj/item/photo))
+	else if((istype(C, /obj/item/paper) && !istype(C, /obj/item/paper/talisman)) || istype(C, /obj/item/photo))
 		if(note)
 			to_chat(user, "<span class='warning'>There's already something pinned to this airlock! Use wirecutters or your hands to remove it.</span>")
 			return
-
-		if(!user.canUnEquip(C))
-			to_chat(user, "<span class='warning'>For some reason, you can't attach [C]!</span>")
-			return
-		
-		// QOL for cultists
-		if(!do_after_once(user, 10, target = src))
-			return
-		
 		if(!user.unEquip(C))
 			to_chat(user, "<span class='warning'>For some reason, you can't attach [C]!</span>")
 			return

From 821d00f04cd5e135a88011eb6d64bd48e58fea32 Mon Sep 17 00:00:00 2001
From: joep van der velden <joepvelden@hotmail.com>
Date: Fri, 10 Jan 2020 13:00:32 +0100
Subject: [PATCH 3/3] put_in_hands instead of the other check

---
 code/game/machinery/doors/airlock.dm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index fb07debfe7b..3f27fa26239 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1349,8 +1349,7 @@ About the new airlock wires panel:
 		else
 			user.visible_message("<span class='notice'>[user] cuts down [note] from [src].</span>", "<span class='notice'>You remove [note] from [src].</span>")
 			playsound(src, 'sound/items/wirecutter.ogg', 50, 1)
-		if(!user.put_in_active_hand(note) && !user.put_in_inactive_hand(note))
-			note.forceMove(get_turf(user))
+		user.put_in_hands(note)
 		note = null
 		update_icon()
 		return TRUE