From a4a27204aec36f13284bca9c1cb3e4d16bab54c1 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 19 Jun 2018 14:46:26 -0700
Subject: [PATCH] Update robot.dm

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

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 40ec50d67e..d00a7d122c 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -164,8 +164,8 @@
 
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 /mob/living/silicon/robot/Destroy()
+	var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
 	if(mmi && mind)//Safety for when a cyborg gets dust()ed. Or there is no MMI inside.
-		var/turf/T = get_turf(loc)//To hopefully prevent run time errors.
 		if(T)
 			mmi.forceMove(T)
 		if(mmi.brainmob)
@@ -180,6 +180,11 @@
 			ghostize()
 			stack_trace("Borg MMI lacked a brainmob")
 		mmi = null
+	//CITADEL EDIT: Cyborgs drop encryption keys on destroy
+	if(istype(radio) && istype(radio.keyslot))
+		radio.keyslot.forceMove(T)
+		radio.keyslot = null
+	//END CITADEL EDIT
 	if(connected_ai)
 		connected_ai.connected_robots -= src
 	if(shell)