From a5f09e103e1264ccde99f21e48314c7e7b52b3c4 Mon Sep 17 00:00:00 2001
From: Bjorn Neergaard <bjorn@neersighted.com>
Date: Tue, 2 Feb 2016 17:46:07 -0600
Subject: [PATCH] Remove eroneous code; click catcher define; bygex path fix

---
 code/__HELPERS/510.dm                      | 2 +-
 code/_onclick/_defines.dm                  | 1 +
 code/_onclick/click.dm                     | 2 +-
 code/modules/mob/living/silicon/silicon.dm | 1 -
 code/modules/tgui/tgui.dm                  | 1 -
 tgstation.dme                              | 1 +
 6 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 code/_onclick/_defines.dm

diff --git a/code/__HELPERS/510.dm b/code/__HELPERS/510.dm
index f448ae3df54..6bca2a51721 100644
--- a/code/__HELPERS/510.dm
+++ b/code/__HELPERS/510.dm
@@ -1,6 +1,6 @@
 // Helpers for running 510 code on older versions of BYOND.
 #if DM_VERSION < 510
-#define BYGEX "code/__HELPERS/bygex.dll"
+#define BYGEX "code/__HELPERS/bygex"
 /proc/replacetext(text, replace, replacement)
 	if(istype(replace, /regex))
 		var/regex/R = replace
diff --git a/code/_onclick/_defines.dm b/code/_onclick/_defines.dm
new file mode 100644
index 00000000000..3c76c35e807
--- /dev/null
+++ b/code/_onclick/_defines.dm
@@ -0,0 +1 @@
+#define CLICKCATCHER_PLANE -99
\ No newline at end of file
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 014e8f6e379..e8297662c85 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -331,7 +331,7 @@
 /obj/screen/click_catcher
 	icon = 'icons/mob/screen_full.dmi'
 	icon_state = "passage0"
-	plane = -99
+	plane = CLICKCATCHER_PLANE
 	mouse_opacity = 2
 	screen_loc = "CENTER-7,CENTER-7"
 
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 1db83a085ed..9e811857caf 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -135,7 +135,6 @@
 			src.take_organ_damage(20)
 		if(2)
 			src.take_organ_damage(10)
-			Stun(3)
 	src << "<span class='userdanger'>*BZZZT*</span>"
 	src << "<span class='danger'>Warning: Electromagnetic pulse detected.</span>"
 	flash_eyes(affect_silicon = 1)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 97a6dbc9022..93cfd9de04b 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -246,7 +246,6 @@
 
 	// Generate the JSON.
 	var/json = json_encode(json_data)
-	//var/json = JSON.stringify(json_data)
 	// Strip #255/improper.
 	json = replacetext(json, "\improper", "")
 	json = replacetext(json, "\proper", "")
diff --git a/tgstation.dme b/tgstation.dme
index daceb5e9337..214b72ac933 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -83,6 +83,7 @@
 #include "code\_globalvars\lists\mobs.dm"
 #include "code\_globalvars\lists\names.dm"
 #include "code\_globalvars\lists\objects.dm"
+#include "code\_onclick\_defines.dm"
 #include "code\_onclick\adjacent.dm"
 #include "code\_onclick\ai.dm"
 #include "code\_onclick\click.dm"