From 4441ff39bdca061a1a27b2cdfbb8cd664d3e3057 Mon Sep 17 00:00:00 2001 From: py01 Date: Thu, 25 Jul 2019 23:19:37 -0700 Subject: [PATCH] Beepsky is now electric immune (#45392) * beepsky is electric immune * beepsky now overrides electrocute_act entirely he gains a short speed boost when shocked instead * Update traits.dm * Update secbot.dm --- code/modules/mob/living/simple_animal/bot/secbot.dm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index b962b423206..e38a69c82ae 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -69,7 +69,7 @@ var/datum/job/detective/J = new/datum/job/detective access_card.access += J.get_access() prev_access = access_card.access - + //SECHUD var/datum/atom_hud/secsensor = GLOB.huds[DATA_HUD_SECURITY_ADVANCED] secsensor.add_hud_to(src) @@ -92,6 +92,13 @@ walk_to(src,0) last_found = world.time +/mob/living/simple_animal/bot/secbot/electrocute_act(shock_damage, source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)//shocks only make him angry + if(base_speed < initial(base_speed) + 3) + base_speed += 3 + addtimer(VARSET_CALLBACK(src, base_speed, base_speed - 3), 60) + playsound(src, 'sound/machines/defib_zap.ogg', 50) + visible_message("[src] shakes and speeds up!") + /mob/living/simple_animal/bot/secbot/set_custom_texts() text_hack = "You overload [name]'s target identification system."