From 2de751a8ee7d66402b93ddb7e54d6b523d7a4f98 Mon Sep 17 00:00:00 2001
From: Richard D'angelo <orbisanima@gmail.com>
Date: Sat, 18 Jun 2016 16:39:21 -0300
Subject: [PATCH] Readded the click Catcher

To avoid losing the click catcher on the reloging

there we go, proper credits to
https://github.com/PsiOmegaDelta
---
 code/_onclick/hud/ai.dm             | 2 +-
 code/_onclick/hud/alien_larva.dm    | 2 +-
 code/_onclick/hud/hud.dm            | 8 ++++----
 code/_onclick/hud/human.dm          | 1 +
 code/_onclick/hud/other_mobs.dm     | 2 +-
 code/_onclick/hud/robot.dm          | 2 +-
 code/modules/client/client procs.dm | 2 +-
 code/modules/mob/login.dm           | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index ecba579159f..37d9616ea5b 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -132,6 +132,6 @@
 
 	mymob.client.screen = list()
 	mymob.client.screen += adding + other
-//	mymob.client.screen += mymob.client.void
+	mymob.client.screen += mymob.client.void
 
 	return
\ No newline at end of file
diff --git a/code/_onclick/hud/alien_larva.dm b/code/_onclick/hud/alien_larva.dm
index ad525dc81ca..1f0df801414 100644
--- a/code/_onclick/hud/alien_larva.dm
+++ b/code/_onclick/hud/alien_larva.dm
@@ -30,4 +30,4 @@
 	mymob.client.screen = list()
 	mymob.client.screen += list( mymob.healths, mymob.fire) //, mymob.rest, mymob.sleep, mymob.mach )
 	mymob.client.screen += src.adding + src.other
-//	mymob.client.screen += mymob.client.void
\ No newline at end of file
+	mymob.client.screen += mymob.client.void
\ No newline at end of file
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index a75c4b01964..16c601ecb75 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -383,8 +383,8 @@ datum/hud/New(mob/owner)
 	hud_used.persistant_inventory_update()
 	update_action_buttons()
 
-///mob/proc/add_click_catcher()
-//	client.screen += client.void
+/mob/proc/add_click_catcher()
+	client.screen += client.void
 
-///mob/new_player/add_click_catcher()
-//	return
\ No newline at end of file
+/mob/new_player/add_click_catcher()
+	return
\ No newline at end of file
diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm
index dd947c9d3b1..d38b3acc5f2 100644
--- a/code/_onclick/hud/human.dm
+++ b/code/_onclick/hud/human.dm
@@ -339,6 +339,7 @@
 
 	mymob.client.screen += hud_elements
 	mymob.client.screen += src.adding + src.hotkeybuttons
+	mymob.client.screen += mymob.client.void
 	inventory_shown = 0
 
 	return
diff --git a/code/_onclick/hud/other_mobs.dm b/code/_onclick/hud/other_mobs.dm
index 30d4940c1f3..cab3e3bfca0 100644
--- a/code/_onclick/hud/other_mobs.dm
+++ b/code/_onclick/hud/other_mobs.dm
@@ -141,4 +141,4 @@
 	mymob.client.screen = list()
 
 	mymob.client.screen += list(mymob.fire, mymob.healths, mymob.pullin, mymob.zone_sel, mymob.purged)
-//	mymob.client.screen += mymob.client.void
+	mymob.client.screen += mymob.client.void
diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm
index c33eb9edf27..ff0d8cdd5b0 100644
--- a/code/_onclick/hud/robot.dm
+++ b/code/_onclick/hud/robot.dm
@@ -197,7 +197,7 @@ var/obj/screen/robot_inventory
 
 	mymob.client.screen += list( mymob.throw_icon, mymob.zone_sel, mymob.oxygen, mymob.fire, mymob.hands, mymob.healths, mymob:cells, mymob.pullin, robot_inventory, mymob.gun_setting_icon)
 	mymob.client.screen += src.adding + src.other
-//	mymob.client.screen += mymob.client.void
+	mymob.client.screen += mymob.client.void
 
 	return
 
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index a32b65e519d..336231e530b 100644
--- a/code/modules/client/client procs.dm	
+++ b/code/modules/client/client procs.dm	
@@ -157,7 +157,7 @@
 	nanomanager.send_resources(src)
 
 	if(!void)
-		void = void.MakeGreed()
+		void = new()
 	screen += void
 
 	if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 90b2cb2866a..e29f6cdffa4 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -45,6 +45,6 @@
 		client.eye = src
 		client.perspective = MOB_PERSPECTIVE
 	reload_fullscreen() // Reload any fullscreen overlays this mob has.
-//	add_click_catcher()
+	add_click_catcher()
 	//set macro to normal incase it was overriden (like cyborg currently does)
 	winset(src, null, "mainwindow.macro=macro hotkey_toggle.is-checked=false input.focus=true input.background-color=#D3B5B5")