diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index c5777eb511c..8f2fb94ecc9 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -707,6 +707,8 @@
 				update_icon()
 			else
 				to_chat(user, "<span class='filter_notice'><font color='red'>Access denied.</font></span>")
+				if(user == src) //RS edit: No self-unlocking.
+					to_chat(user, "<span class='filter_notice'>You are not allowed to manipulate your own lock.</span>")
 
 	else if(istype(W, /obj/item/borg/upgrade/))
 		var/obj/item/borg/upgrade/U = W
@@ -714,6 +716,8 @@
 			to_chat(usr, "<span class='filter_notice'>You must access the borgs internals!</span>")
 		else if(!src.module && U.require_module)
 			to_chat(usr, "<span class='filter_notice'>The borg must choose a module before it can be upgraded!</span>")
+		else if(user == src) //RS edit: No self-upgrading.
+			to_chat(user, "<span class='warning'>You lack the reach to be able to upgrade yourself.</span>")
 		else if(U.locked)
 			to_chat(usr, "<span class='filter_notice'>The upgrade is locked and cannot be used yet!</span>")
 		else
@@ -846,7 +850,10 @@
 	else if(istype(M, /mob/living/silicon/robot))
 		var/mob/living/silicon/robot/R = M
 		if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/weapon/card/robot))
-			return 1
+			if(R == src) //RS edit: No self-unlocking.
+				return FALSE
+			else
+				return TRUE
 	return 0
 
 /mob/living/silicon/robot/proc/check_access(obj/item/I)