cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Pacifists now taunt secbots when attempting attacks with harm or disarm intent. (#1467)

Browse Source 
* Pacifists now taunt secbots when attempting attacks with harm or disarm intent. (#54570)

Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>

* Pacifists now taunt secbots when attempting attacks with harm or disarm intent.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Jared-Fogle <35135081+Jared-Fogle@ users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-10-26 09:09:32 +01:00
committed by GitHub
parent d7b0535f59
commit 744cbc2e44
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/bot/secbot.dm
+9
View File
@@ -203,6 +203,15 @@ Auto Patrol: []"},
if(special_retaliate_after_attack(H))
return
// Turns an oversight into a feature. Beepsky will now announce when pacifists taunt him over sec comms.
if(HAS_TRAIT(H, TRAIT_PACIFISM))
H.visible_message("<span class='notice'>[H] taunts [src], daring [p_them()] to give chase!</span>", \
"<span class='notice'>You taunt [src], daring [p_them()] to chase you!</span>", "<span class='hear'>You hear someone shout a daring taunt!</span>", DEFAULT_MESSAGE_RANGE, H)
speak("Taunted by pacifist scumbag <b>[H]</b> in [get_area(src)].", radio_channel)
// Interrupt the attack chain. We've already handled this scenario for pacifists.
return
return ..()
/mob/living/simple_animal/bot/secbot/attackby(obj/item/W, mob/user, params)