From 76ba3741b7f0b18bed89f19fa019e6bcb9180c69 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Sun, 3 Jan 2021 15:20:32 -0800
Subject: [PATCH 1/2] Fixes dark click catcher

---
 code/_onclick/click.dm              |  15 +++++----------
 code/modules/client/client procs.dm |   1 -
 icons/mob/screen_gen.dmi            | Bin 466 -> 948 bytes
 vorestation.dme                     |   4 ++++
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 6a4579f1919..b29a1192d9b 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -354,19 +354,13 @@
 		facedir(direction)
 
 /obj/screen/click_catcher
+	name = "Darkness"
 	icon = 'icons/mob/screen_gen.dmi'
 	icon_state = "click_catcher"
 	plane = CLICKCATCHER_PLANE
+	layer = LAYER_HUD_UNDER
 	mouse_opacity = 2
-	screen_loc = "CENTER-7,CENTER-7"
-
-/obj/screen/click_catcher/proc/MakeGreed()
-	. = list()
-	for(var/i = 0, i<15, i++)
-		for(var/j = 0, j<15, j++)
-			var/obj/screen/click_catcher/CC = new()
-			CC.screen_loc = "NORTH-[i],EAST-[j]"
-			. += CC
+	screen_loc = "SOUTHWEST to NORTHEAST"
 
 /obj/screen/click_catcher/Click(location, control, params)
 	var/list/modifiers = params2list(params)
@@ -374,7 +368,8 @@
 		var/mob/living/carbon/C = usr
 		C.swap_hand()
 	else
-		var/turf/T = screen_loc2turf(screen_loc, get_turf(usr))
+		var/list/P = params2list(params)
+		var/turf/T = screen_loc2turf(P["screen-loc"], get_turf(usr))
 		if(T)
 			T.Click(location, control, params)
 	. = 1
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index dd84f559820..83164afd3c3 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -227,7 +227,6 @@
 
 	if(!void)
 		void = new()
-		void.MakeGreed()
 	screen += void
 
 	if((prefs.lastchangelog != changelog_hash) && isnewplayer(src.mob)) //bolds the changelog button on the interface so we know there are updates.
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 2071c634d1327ea703d95f89ab82c0c31e0a2aa8..75ba00f026d35529e5182fd9d91b9d6e7f4d488f 100644
GIT binary patch
delta 922
zcmV;L17-Zu1GEQ_84Lyh0063Kaozv`0FaS!6MvnHy9&ZE7)Iy(Pw~<2;%&_$DUzXm
zg%EP_57rctRA1kr;3k6GIdD#o%W%~b)TrqhN=-|K#Cf+T@k+iiBu+;X9MX;3CbiiX
zAklRsd@2<Z2NJQ^N7(oi6vH-q!>c!Jvv+HZ_2)GIGr2jryK%NT4&__jW0(}wsOb$R
z*ndY@X3#In0008tNkl<Zc%1E;PfP1S6va<k2?UI2B38mIx)F5Y#KnNi;#SB$AHWai
zR*-I8D+RG`lqzm!QPf(ri$Dv#Z}ZIaNn=56CTZ^v3IkK7Cui>b>Ae9MhG7_nVdfO2
z6n$>TaZK-R%apL+L@7n1(FmUB0RRSr0e=8sI2@wgZd*bKl2W4CY+7L$Qm@y8*4m1q
zh)QjMQi@#HMXgo?03=BQ$8oT_x{A}&Q*3Q*q1Wr7-ELb-De88+006DEC4?ZYwN+XJ
z!Z4(rogF+qJ>m8B6~o~$?c3hoMx|20#>NJ&udh=RK93=Upru?@{}N#sQoUZs!+*mA
z&d<*$O(F>)P_0(c>2$EUxjAtht+iE31BeJGCnuTF`**ep02+-3Zf|ch$10@(lfpUU
zJCr2Jf6L=DmEROrL>$L~@B5kkb8kQp1nIFjiMcl*NfNlOYg$JBNGa*)=!ibv1Se6-
zO>i2AhljMbwubxrd$d}u(%yBxjenGqq?BLIJi{;y!!QiPEI38@qhM6S+~)(P!3LNX
zU>Y{Sv;fnv0q+f^6h%?Am}#W<%&8E9lu{JOah^t4CO=DY9Mkdfaat}0K&@8GilT@v
zFE8PF9&FnNfHc4U^6~=D^Kf={R)mYxkEq<;-QmN-r?qnc@H`K`@1xu8LVqcRTCIka
zl@-+MbvTX#Ddp6>d(p|9K`ABqzK`AAT|7QMVmuz>=H@2tw{08MY8A`N%Xof%#?{r;
zccZ~*6lE4hY}-bs(?Jjfczb(;)_P)9c7K1L*4Nh&h9UjH1Y>+z8EP~d==b}X4-X)H
zL7}XLh^b2;>-Ca6G~_|%MSsZmeK?Mjrxqh*8Za0P5ClP<T8xlsfa|(Qk|a+pM)-35
zDWzy{Zx0t27qi?4jP3zbfBfL!fPx@Ezu!l**_?&gVjBSbJK|;(1;saD#uW1yTol*<
w(*jJx2ACFL8aBYR0MoDmrUjU0;SKl$6-WoA-t+fT00000NkvXXt^-0~g1l<8TmS$7

delta 451
zcmV;!0X+V+2hszO8Gi!+005o0f$RVP05ecbR7C&)05mi-SXfvuFE2qsK`t&X92^`<
zN=i*lO;1lxXlQ6dLqk?pR&H)?H#aw1TU%sgWGhcL_W%F@0d!JMQvg8b*k%9#0DO8>
zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1<SI)oD$dN$Q-82kFwryM;w;ZhDainG
zjE%TBGg33tGfE(w;*!LYR3KAHiHkEOv#1!zH00t;D@x2wg|OiYisCa8^HSn7N>jj$
z<kGaXVuG4-NYJFL;OgfBb~^w^UO9UqRu=UD006~FL_t(oh3%Hf3d1lAL?u~EoXz?F
zuWj7Y5_)K{M1N1!!;l<2<1qnE0FopC_C@GX7G^{NH7E+xu$+l1&B_9(3OcGUw4jKr
zw4Dx}L5EWJ`%|o`=lUS87i%tqixtcFO&<-6g9b<R3N4l(8o+|*g9JZ8k|fEmz~P2{
z(}N-f^aQ=6Cly5I;uyBr3tA^(ovBt6=e!r*Xg!M`_dKPz3{aarX1&t^pL)3b1dI@_
td$ynf9?=9XT9@GnX9f#8WalUU%?-ZM18tvnmTCY1002ovPDHLkV1i$_yKn#i

diff --git a/vorestation.dme b/vorestation.dme
index effeef8fc06..2caf2061854 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3798,6 +3798,7 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
+<<<<<<< HEAD:vorestation.dme
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
@@ -3806,6 +3807,9 @@
 #include "maps\southern_cross\loadout\loadout_head.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
+=======
+#include "maps\southern_cross\southern_Cross.dm"
+>>>>>>> 692a8c2... Fixes dark click catcher (#7803):polaris.dme
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"

From c66cd083e4e1e8b5cb327310ca54a9607f8f3cf5 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sun, 24 Jan 2021 01:48:48 -0500
Subject: [PATCH 2/2] Update vorestation.dme

---
 vorestation.dme | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vorestation.dme b/vorestation.dme
index 2caf2061854..effeef8fc06 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3798,7 +3798,6 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
-<<<<<<< HEAD:vorestation.dme
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
@@ -3807,9 +3806,6 @@
 #include "maps\southern_cross\loadout\loadout_head.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
-=======
-#include "maps\southern_cross\southern_Cross.dm"
->>>>>>> 692a8c2... Fixes dark click catcher (#7803):polaris.dme
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"