From ddd8b402f13dbdf9e01f066c2fafc42f64a8e987 Mon Sep 17 00:00:00 2001 From: Foopwo Date: Tue, 21 May 2024 16:28:15 -0700 Subject: [PATCH 1/3] removes research borg self-upgrading --- code/modules/mob/living/silicon/robot/robot.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index c5777eb511c..34451a2da37 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, "Access denied.") + if(user == src) //RS edit: No self-unlocking. + to_chat(user, "You are not allowed to manipulate your own lock.") else if(istype(W, /obj/item/borg/upgrade/)) var/obj/item/borg/upgrade/U = W @@ -714,6 +716,8 @@ to_chat(usr, "You must access the borgs internals!") else if(!src.module && U.require_module) to_chat(usr, "The borg must choose a module before it can be upgraded!") + else if(user == src) //RS edit: No self-unlocking. + to_chat(user, "You lack the reach to be able to upgrade yourself.") else if(U.locked) to_chat(usr, "The upgrade is locked and cannot be used yet!") 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 0 + else + return 1 return 0 /mob/living/silicon/robot/proc/check_access(obj/item/I) From 5f272592373a1bf4a22686c50f4da6c4b4b668eb Mon Sep 17 00:00:00 2001 From: foopwo <73252543+foopwo@users.noreply.github.com> Date: Tue, 21 May 2024 16:44:05 -0700 Subject: [PATCH 2/3] small comment mistake --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 34451a2da37..69b53fdbf33 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -716,7 +716,7 @@ to_chat(usr, "You must access the borgs internals!") else if(!src.module && U.require_module) to_chat(usr, "The borg must choose a module before it can be upgraded!") - else if(user == src) //RS edit: No self-unlocking. + else if(user == src) //RS edit: No self-upgrading. to_chat(user, "You lack the reach to be able to upgrade yourself.") else if(U.locked) to_chat(usr, "The upgrade is locked and cannot be used yet!") From c950e8773ad780f65635b8804d6fa181c245883d Mon Sep 17 00:00:00 2001 From: foopwo <73252543+foopwo@users.noreply.github.com> Date: Wed, 22 May 2024 20:56:51 -0700 Subject: [PATCH 3/3] falsify --- code/modules/mob/living/silicon/robot/robot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 69b53fdbf33..8f2fb94ecc9 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -851,9 +851,9 @@ var/mob/living/silicon/robot/R = M if(check_access(R.get_active_hand()) || istype(R.get_active_hand(), /obj/item/weapon/card/robot)) if(R == src) //RS edit: No self-unlocking. - return 0 + return FALSE else - return 1 + return TRUE return 0 /mob/living/silicon/robot/proc/check_access(obj/item/I)