From 1a1da84d0ad279b444348197d6e093c1bc6924c3 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Mon, 13 Mar 2023 23:57:27 -0800
Subject: [PATCH 1/2] Click catchers no longer display as Darkness

---
 code/_onclick/click.dm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 2164dbe5dd2..c6b0cb3e064 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -353,7 +353,10 @@
 		facedir(direction)
 
 /obj/screen/click_catcher
+<<<<<<< HEAD
 	name = "" // Empty string names don't show up in context menu clicks
+=======
+>>>>>>> 36201e517c2... Merge pull request #9045 from Ilysen/click-catcher-by-sa
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "click_catcher"
 	plane = CLICKCATCHER_PLANE
@@ -361,6 +364,10 @@
 	mouse_opacity = 2
 	screen_loc = "SOUTHWEST to NORTHEAST"
 
+/obj/screen/click_catcher/Initialize(mapload, ...)
+	. = ..()
+	verbs.Cut()
+
 /obj/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
 	if(modifiers["middle"] && istype(usr, /mob/living/carbon))

From 8429597f6c1a8d796e24ac6e81027036be38da92 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Tue, 14 Mar 2023 18:05:48 +1000
Subject: [PATCH 2/2] Update click.dm

---
 code/_onclick/click.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index c6b0cb3e064..7892b91a55c 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -353,10 +353,7 @@
 		facedir(direction)
 
 /obj/screen/click_catcher
-<<<<<<< HEAD
 	name = "" // Empty string names don't show up in context menu clicks
-=======
->>>>>>> 36201e517c2... Merge pull request #9045 from Ilysen/click-catcher-by-sa
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "click_catcher"
 	plane = CLICKCATCHER_PLANE