Skip to content

Commit

Permalink
[MIRROR] Prevent borgs resisting from grabs when they are locked down (
Browse files Browse the repository at this point in the history
…#2382)

* 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: NovaBot <[email protected]>
Co-authored-by: Iajret <[email protected]>
  • Loading branch information
3 people authored Mar 12, 2024
1 parent a0c15b6 commit cbcd96b
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion code/modules/mob/living/silicon/robot/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -938,14 +938,19 @@
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())
return
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)
Expand Down

0 comments on commit cbcd96b

Please sign in to comment.