Fixes Emagged Borgs Not Having Instant Bolt/Shock (#22084)

* borg moment

* proc added

* steel review
This commit is contained in:
matttheficus
2023-08-23 22:00:15 -04:00
committed by GitHub
parent c65945e7dd
commit ce060435f4
3 changed files with 12 additions and 3 deletions
+2 -3
View File
@@ -204,10 +204,9 @@
open_close(user)
/obj/machinery/door/airlock/AICtrlClick(mob/living/silicon/user) // Bolts doors
if(!ai_control_check(user))
return
if(isAntag(user) || do_after(user, 3 SECONDS, target = src, allow_moving = TRUE))
if(user.can_instant_lockdown() || do_after(user, 3 SECONDS, target = src, allow_moving = TRUE))
toggle_bolt(user)
@@ -219,7 +218,7 @@
if(isElectrified())
electrify(0, user, TRUE) // un-shock
else
if(isAntag(user) || do_after(user, 3 SECONDS, target = src, allow_moving = TRUE))
if(user.can_instant_lockdown() || do_after(user, 3 SECONDS, target = src, allow_moving = TRUE))
electrify(-1, user, TRUE) // permanent shock + audio cue
playsound(loc, "sparks", 100, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
@@ -1596,3 +1596,8 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
else
to_chat(src, "<span class='warning'>You can only use this emote when you're out of charge.</span>")
/mob/living/silicon/robot/can_instant_lockdown()
if(emagged || faction_check_mob(src, "syndicate"))
return TRUE
return FALSE
@@ -78,6 +78,11 @@
QDEL_NULL(aiCamera)
return ..()
/mob/living/silicon/proc/can_instant_lockdown()
if(isAntag(src))
return TRUE
return FALSE
/mob/living/silicon/proc/get_radio()
return