From 16b4c0f3833d8bde87a832de7d631fb2008ad7a4 Mon Sep 17 00:00:00 2001 From: NovaBot <154629622+NovaBot13@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:58:13 -0400 Subject: [PATCH] [MIRROR] Prevent borgs resisting from grabs when they are locked down (#1407) * Prevent borgs resisting from grabs when they are locked down (#81904) ## About The Pull Request Prevents borgs resisting from grabs when they are locked ![image](https://github.com/tgstation/tgstation/assets/8430839/3fc8dee4-3539-4891-9a91-bc27b3610da2) (yes, there's small baloonies message barely visible) ## Why It's Good For The Game Isn't it fun to try and pull some locked down borg while they press B like hundred times per second so you can't even move them. ## Changelog :cl: fix: As a borg you shouldn't be able to resist from grab while locked down /:cl: * Prevent borgs resisting from grabs when they are locked down --------- Co-authored-by: Iajret <8430839+Iajret@users.noreply.github.com> --- 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 619322664f6..f00249137f4 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -938,6 +938,12 @@ buckle_mob_flags= RIDER_NEEDS_ARM // just in case return ..() +/mob/living/silicon/robot/can_resist() + if(lockcharge) + balloon_alert(src, "locked down!") + return FALSE + return ..() + /mob/living/silicon/robot/execute_resist() . = ..() if(!has_buckled_mobs()) @@ -945,7 +951,6 @@ for(var/mob/unbuckle_me_now as anything in buckled_mobs) unbuckle_mob(unbuckle_me_now, FALSE) - /mob/living/silicon/robot/proc/TryConnectToAI() set_connected_ai(select_active_ai_with_fewest_borgs(z)) if(connected_ai)