From c86433449fb1328e37d00e6a8a4f549c32ad3376 Mon Sep 17 00:00:00 2001
From: nemvar <haukeschuemann@outlook.de>
Date: Sat, 2 May 2020 02:38:27 +0200
Subject: [PATCH] Borgruntime

---
 code/modules/mob/living/silicon/robot/robot.dm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 06448eb091c..b94aff4e674 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -872,7 +872,8 @@
 /mob/living/silicon/robot/Exited(atom/A)
 	if(hat && hat == A)
 		hat = null
-	update_icons()
+		if(!QDELETED(src)) //Don't update icons if we are deleted.
+			update_icons()
 	. = ..()
 
 /**