From f25ed2503e5a3c9ea2831dac3b188b2a62299284 Mon Sep 17 00:00:00 2001
From: vuonojenmustaturska <naksu@youzen.ext.b2.fi>
Date: Fri, 9 Mar 2018 18:27:45 +0200
Subject: [PATCH 1/2] Merge pull request #36290 from
 tgstation/Cyberboss-patch-5

[s] Guards client.holder
---
 code/modules/client/client_procs.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 9181945ebd..66a7cc8343 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -158,6 +158,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
 GLOBAL_LIST_EMPTY(external_rsc_urls)
 #endif
 
+/client/can_vv_get(var_name)
+	return var_name != NAMEOF(src, holder) && ..()
+
+/client/vv_edit_var(var_name, var_value)
+	return var_name != NAMEOF(src, holder) && ..()
 
 /client/New(TopicData)
 	var/tdata = TopicData //save this for later use