diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm
index bacaa59f8f..6b7c0b4137 100644
--- a/code/controllers/globals.dm
+++ b/code/controllers/globals.dm
@@ -36,7 +36,7 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars)
 	if(!statclick)
 		statclick = new/obj/effect/statclick/debug(null, "Initializing...", src)
 
-	stat("GLOB:", "Button Removed Due To Crashing") //VOREStation Edit
+	stat("GLOB:", statclick.update("Edit"))
 
 /datum/controller/global_vars/vv_edit_var(var_name, var_value)
 	if(gvars_datum_protected_varlist[var_name])
diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm
index cd05296959..0a2e303712 100644
--- a/code/modules/admin/view_variables/view_variables.dm
+++ b/code/modules/admin/view_variables/view_variables.dm
@@ -15,269 +15,271 @@
 	if (!islist && !istype(D))
 		return
 
-	var/title = ""
-	var/refid = "\ref[D]"
-	var/icon/sprite
-	var/hash
+	//VOREStation Edit Start - the rest of this proc in a spawn
+	spawn(0)
+		var/title = ""
+		var/refid = "\ref[D]"
+		var/icon/sprite
+		var/hash
 
-	var/type = /list
-	if (!islist)
-		type = D.type
+		var/type = /list
+		if (!islist)
+			type = D.type
 
-	if(istype(D, /atom))
-		var/atom/AT = D
-		if(AT.icon && AT.icon_state)
-			sprite = new /icon(AT.icon, AT.icon_state)
-			hash = md5(AT.icon)
-			hash = md5(hash + AT.icon_state)
-			src << browse_rsc(sprite, "vv[hash].png")
+		if(istype(D, /atom))
+			var/atom/AT = D
+			if(AT.icon && AT.icon_state)
+				sprite = new /icon(AT.icon, AT.icon_state)
+				hash = md5(AT.icon)
+				hash = md5(hash + AT.icon_state)
+				src << browse_rsc(sprite, "vv[hash].png")
 
-	title = "[D] (\ref[D]) = [type]"
-	var/formatted_type = replacetext("[type]", "/", "<wbr>/")
+		title = "[D] (\ref[D]) = [type]"
+		var/formatted_type = replacetext("[type]", "/", "<wbr>/")
 
-	var/sprite_text
-	if(sprite)
-		sprite_text = "<img src='vv[hash].png'></td><td>"
-	var/list/header = islist(D)? list("<b>/list</b>") : D.vv_get_header()
+		var/sprite_text
+		if(sprite)
+			sprite_text = "<img src='vv[hash].png'></td><td>"
+		var/list/header = islist(D)? list("<b>/list</b>") : D.vv_get_header()
 
-	var/marked
-	if(holder && holder.marked_datum && holder.marked_datum == D)
-		marked = VV_MSG_MARKED
-	var/varedited_line = ""
-	if(!islist && (D.datum_flags & DF_VAR_EDITED))
-		varedited_line = VV_MSG_EDITED
-	var/deleted_line
-	if(!islist && D.gc_destroyed)
-		deleted_line = VV_MSG_DELETED
+		var/marked
+		if(holder && holder.marked_datum && holder.marked_datum == D)
+			marked = VV_MSG_MARKED
+		var/varedited_line = ""
+		if(!islist && (D.datum_flags & DF_VAR_EDITED))
+			varedited_line = VV_MSG_EDITED
+		var/deleted_line
+		if(!islist && D.gc_destroyed)
+			deleted_line = VV_MSG_DELETED
 
-	var/list/dropdownoptions = list()
-	var/autoconvert_dropdown = FALSE
-	if (islist)
-		dropdownoptions = list(
-			"---",
-			"Add Item" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ADD]=TRUE;target=[refid]",
-			"Remove Nulls" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ERASE_NULLS]=TRUE;target=[refid]",
-			"Remove Dupes" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ERASE_DUPES]=TRUE;target=[refid]",
-			"Set len" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_SET_LENGTH]=TRUE;target=[refid]",
-			"Shuffle" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_SHUFFLE]=TRUE;target=[refid]",
-			// "Show VV To Player" = "?_src_=vars;[HrefToken()];[VV_HK_EXPOSE]=TRUE;target=[refid]" // TODO - Not yet implemented for lists
-			)
-		autoconvert_dropdown = TRUE
-	else
-		dropdownoptions = D.vv_get_dropdown()
-	var/list/dropdownoptions_html = list()
-	if(autoconvert_dropdown)
-		for (var/name in dropdownoptions)
-			var/link = dropdownoptions[name]
-			if (link)
-				dropdownoptions_html += "<option value='[link]'>[name]</option>"
-			else
-				dropdownoptions_html += "<option value>[name]</option>"
-	else
-		dropdownoptions_html = dropdownoptions + D.get_view_variables_options()
+		var/list/dropdownoptions = list()
+		var/autoconvert_dropdown = FALSE
+		if (islist)
+			dropdownoptions = list(
+				"---",
+				"Add Item" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ADD]=TRUE;target=[refid]",
+				"Remove Nulls" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ERASE_NULLS]=TRUE;target=[refid]",
+				"Remove Dupes" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_ERASE_DUPES]=TRUE;target=[refid]",
+				"Set len" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_SET_LENGTH]=TRUE;target=[refid]",
+				"Shuffle" = "?_src_=vars;[HrefToken()];[VV_HK_LIST_SHUFFLE]=TRUE;target=[refid]",
+				// "Show VV To Player" = "?_src_=vars;[HrefToken()];[VV_HK_EXPOSE]=TRUE;target=[refid]" // TODO - Not yet implemented for lists
+				)
+			autoconvert_dropdown = TRUE
+		else
+			dropdownoptions = D.vv_get_dropdown()
+		var/list/dropdownoptions_html = list()
+		if(autoconvert_dropdown)
+			for (var/name in dropdownoptions)
+				var/link = dropdownoptions[name]
+				if (link)
+					dropdownoptions_html += "<option value='[link]'>[name]</option>"
+				else
+					dropdownoptions_html += "<option value>[name]</option>"
+		else
+			dropdownoptions_html = dropdownoptions + D.get_view_variables_options()
 
-	var/list/names = list()
-	if (!islist)
-		names = D.get_variables()
-	sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
+		var/list/names = list()
+		if (!islist)
+			names = D.get_variables()
+		//sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. //VOREStation edit - commented out, replaced with spawn(0) above
 
-	var/list/variable_html = list()
-	if (islist)
-		var/list/L = D
-		for (var/i in 1 to L.len)
-			var/key = L[i]
-			var/value
-			if (IS_NORMAL_LIST(L) && IS_VALID_ASSOC_KEY(key))
-				value = L[key]
-			variable_html += debug_variable(i, value, 0, D)
-	else
+		var/list/variable_html = list()
+		if (islist)
+			var/list/L = D
+			for (var/i in 1 to L.len)
+				var/key = L[i]
+				var/value
+				if (IS_NORMAL_LIST(L) && IS_VALID_ASSOC_KEY(key))
+					value = L[key]
+				variable_html += debug_variable(i, value, 0, D)
+		else
 
-		names = sortList(names)
-		for (var/V in names)
-			if(D.can_vv_get(V))
-				variable_html += D.vv_get_var(V)
+			names = sortList(names)
+			for (var/V in names)
+				if(D.can_vv_get(V))
+					variable_html += D.vv_get_var(V)
 
-	var/html = {"
-<html>
-	<head>
-		<title>[title]</title>
-		<style>
-			body {
-				font-family: Verdana, sans-serif;
-				font-size: 9pt;
-			}
-			.value {
-				font-family: "Courier New", monospace;
-				font-size: 8pt;
-			}
-		</style>
-	</head>
-	<body onload='selectTextField()' onkeydown='return handle_keydown()' onkeyup='handle_keyup()'>
-		<script type="text/javascript">
-			// onload
-			function selectTextField() {
-				var filter_text = document.getElementById('filter');
-				filter_text.focus();
-				filter_text.select();
-				var lastsearch = getCookie("[refid][cookieoffset]search");
-				if (lastsearch) {
-					filter_text.value = lastsearch;
+		var/html = {"
+	<html>
+		<head>
+			<title>[title]</title>
+			<style>
+				body {
+					font-family: Verdana, sans-serif;
+					font-size: 9pt;
+				}
+				.value {
+					font-family: "Courier New", monospace;
+					font-size: 8pt;
+				}
+			</style>
+		</head>
+		<body onload='selectTextField()' onkeydown='return handle_keydown()' onkeyup='handle_keyup()'>
+			<script type="text/javascript">
+				// onload
+				function selectTextField() {
+					var filter_text = document.getElementById('filter');
+					filter_text.focus();
+					filter_text.select();
+					var lastsearch = getCookie("[refid][cookieoffset]search");
+					if (lastsearch) {
+						filter_text.value = lastsearch;
+						updateSearch();
+					}
+				}
+				function getCookie(cname) {
+					var name = cname + "=";
+					var ca = document.cookie.split(';');
+					for(var i=0; i<ca.length; i++) {
+						var c = ca\[i];
+						while (c.charAt(0)==' ') c = c.substring(1,c.length);
+						if (c.indexOf(name)==0) return c.substring(name.length,c.length);
+					}
+					return "";
+				}
+
+				// main search functionality
+				var last_filter = "";
+				function updateSearch() {
+					var filter = document.getElementById('filter').value.toLowerCase();
+					var vars_ol = document.getElementById("vars");
+
+					if (filter === last_filter) {
+						// An event triggered an update but nothing has changed.
+						return;
+					} else if (filter.indexOf(last_filter) === 0) {
+						// The new filter starts with the old filter, fast path by removing only.
+						var children = vars_ol.childNodes;
+						for (var i = children.length - 1; i >= 0; --i) {
+							try {
+								var li = children\[i];
+								if (li.innerText.toLowerCase().indexOf(filter) == -1) {
+									vars_ol.removeChild(li);
+								}
+							} catch(err) {}
+						}
+					} else {
+						// Remove everything and put back what matches.
+						while (vars_ol.hasChildNodes()) {
+							vars_ol.removeChild(vars_ol.lastChild);
+						}
+
+						for (var i = 0; i < complete_list.length; ++i) {
+							try {
+								var li = complete_list\[i];
+								if (!filter || li.innerText.toLowerCase().indexOf(filter) != -1) {
+									vars_ol.appendChild(li);
+								}
+							} catch(err) {}
+						}
+					}
+
+					last_filter = filter;
+					document.cookie="[refid][cookieoffset]search="+encodeURIComponent(filter);
+
+				}
+
+				// onkeydown
+				function handle_keydown() {
+					if(event.keyCode == 116) {  //F5 (to refresh properly)
+						document.getElementById("refresh_link").click();
+						event.preventDefault ? event.preventDefault() : (event.returnValue = false);
+						return false;
+					}
+					return true;
+				}
+
+				// onkeyup
+				function handle_keyup() {
 					updateSearch();
 				}
-			}
-			function getCookie(cname) {
-				var name = cname + "=";
-				var ca = document.cookie.split(';');
-				for(var i=0; i<ca.length; i++) {
-					var c = ca\[i];
-					while (c.charAt(0)==' ') c = c.substring(1,c.length);
-					if (c.indexOf(name)==0) return c.substring(name.length,c.length);
-				}
-				return "";
-			}
 
-			// main search functionality
-			var last_filter = "";
-			function updateSearch() {
-				var filter = document.getElementById('filter').value.toLowerCase();
-				var vars_ol = document.getElementById("vars");
-
-				if (filter === last_filter) {
-					// An event triggered an update but nothing has changed.
-					return;
-				} else if (filter.indexOf(last_filter) === 0) {
-					// The new filter starts with the old filter, fast path by removing only.
-					var children = vars_ol.childNodes;
-					for (var i = children.length - 1; i >= 0; --i) {
-						try {
-							var li = children\[i];
-							if (li.innerText.toLowerCase().indexOf(filter) == -1) {
-								vars_ol.removeChild(li);
-							}
-						} catch(err) {}
-					}
-				} else {
-					// Remove everything and put back what matches.
-					while (vars_ol.hasChildNodes()) {
-						vars_ol.removeChild(vars_ol.lastChild);
-					}
-
-					for (var i = 0; i < complete_list.length; ++i) {
-						try {
-							var li = complete_list\[i];
-							if (!filter || li.innerText.toLowerCase().indexOf(filter) != -1) {
-								vars_ol.appendChild(li);
-							}
-						} catch(err) {}
+				// onchange
+				function handle_dropdown(list) {
+					var value = list.options\[list.selectedIndex].value;
+					if (value !== "") {
+						location.href = value;
 					}
+					list.selectedIndex = 0;
+					document.getElementById('filter').focus();
 				}
 
-				last_filter = filter;
-				document.cookie="[refid][cookieoffset]search="+encodeURIComponent(filter);
-
-			}
-
-			// onkeydown
-			function handle_keydown() {
-				if(event.keyCode == 116) {  //F5 (to refresh properly)
-					document.getElementById("refresh_link").click();
-					event.preventDefault ? event.preventDefault() : (event.returnValue = false);
-					return false;
+				// byjax
+				function replace_span(what) {
+					var idx = what.indexOf(':');
+					document.getElementById(what.substr(0, idx)).innerHTML = what.substr(idx + 1);
 				}
-				return true;
-			}
-
-			// onkeyup
-			function handle_keyup() {
-				updateSearch();
-			}
-
-			// onchange
-			function handle_dropdown(list) {
-				var value = list.options\[list.selectedIndex].value;
-				if (value !== "") {
-					location.href = value;
-				}
-				list.selectedIndex = 0;
-				document.getElementById('filter').focus();
-			}
-
-			// byjax
-			function replace_span(what) {
-				var idx = what.indexOf(':');
-				document.getElementById(what.substr(0, idx)).innerHTML = what.substr(idx + 1);
-			}
-		</script>
-		<div align='center'>
+			</script>
+			<div align='center'>
+				<table width='100%'>
+					<tr>
+						<td width='50%'>
+							<table align='center' width='100%'>
+								<tr>
+									<td>
+										[sprite_text]
+										<div align='center'>
+											[header.Join()]
+										</div>
+									</td>
+								</tr>
+							</table>
+							<div align='center'>
+								<b><font size='1'>[formatted_type]</font></b>
+								<span id='marked'>[marked]</span>
+								<span id='varedited'>[varedited_line]</span>
+								<span id='deleted'>[deleted_line]</span>
+							</div>
+						</td>
+						<td width='50%'>
+							<div align='center'>
+								<a id='refresh_link' href='?_src_=vars;
+	datumrefresh=[refid]'>Refresh</a>
+								<form>
+									<select name="file" size="1"
+										onchange="handle_dropdown(this)"
+										onmouseclick="this.focus()">
+										<option value selected>Select option</option>
+										[dropdownoptions_html.Join()]
+									</select>
+								</form>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</div>
+			<hr>
+			<font size='1'>
+				<b>E</b> - Edit, tries to determine the variable type by itself.<br>
+				<b>C</b> - Change, asks you for the var type first.<br>
+				<b>M</b> - Mass modify: changes this variable for all objects of this type.<br>
+			</font>
+			<hr>
 			<table width='100%'>
 				<tr>
-					<td width='50%'>
-						<table align='center' width='100%'>
-							<tr>
-								<td>
-									[sprite_text]
-									<div align='center'>
-										[header.Join()]
-									</div>
-								</td>
-							</tr>
-						</table>
+					<td width='20%'>
 						<div align='center'>
-							<b><font size='1'>[formatted_type]</font></b>
-							<span id='marked'>[marked]</span>
-							<span id='varedited'>[varedited_line]</span>
-							<span id='deleted'>[deleted_line]</span>
+							<b>Search:</b>
 						</div>
 					</td>
-					<td width='50%'>
-						<div align='center'>
-							<a id='refresh_link' href='?_src_=vars;
-datumrefresh=[refid]'>Refresh</a>
-							<form>
-								<select name="file" size="1"
-									onchange="handle_dropdown(this)"
-									onmouseclick="this.focus()">
-									<option value selected>Select option</option>
-									[dropdownoptions_html.Join()]
-								</select>
-							</form>
-						</div>
+					<td width='80%'>
+						<input type='text' id='filter' name='filter_text' value='' style='width:100%;'>
 					</td>
 				</tr>
 			</table>
-		</div>
-		<hr>
-		<font size='1'>
-			<b>E</b> - Edit, tries to determine the variable type by itself.<br>
-			<b>C</b> - Change, asks you for the var type first.<br>
-			<b>M</b> - Mass modify: changes this variable for all objects of this type.<br>
-		</font>
-		<hr>
-		<table width='100%'>
-			<tr>
-				<td width='20%'>
-					<div align='center'>
-						<b>Search:</b>
-					</div>
-				</td>
-				<td width='80%'>
-					<input type='text' id='filter' name='filter_text' value='' style='width:100%;'>
-				</td>
-			</tr>
-		</table>
-		<hr>
-		<ol id='vars'>
-			[variable_html.Join()]
-		</ol>
-		<script type='text/javascript'>
-			var complete_list = \[\];
-			var lis = document.getElementById("vars").children;
-			for(var i = lis.length; i--;) complete_list\[i\] = lis\[i\];
-		</script>
-	</body>
-</html>
-"}
-	src << browse(html, "window=variables[refid];size=475x650")
+			<hr>
+			<ol id='vars'>
+				[variable_html.Join()]
+			</ol>
+			<script type='text/javascript'>
+				var complete_list = \[\];
+				var lis = document.getElementById("vars").children;
+				for(var i = lis.length; i--;) complete_list\[i\] = lis\[i\];
+			</script>
+		</body>
+	</html>
+	"}
+		src << browse(html, "window=variables[refid];size=475x650") //VOREStation edit end
 
 /client/proc/vv_update_display(datum/D, span, content)
 	src << output("[span]:[content]", "variables\ref[D].browser:replace_span")