From 9689dd1e17ed472c9be34970f97475c4115ce60d Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 12 Jul 2016 20:08:25 +0100 Subject: [PATCH 1/3] Ensures security robots can be properly emagged, also makes them stronger when emagged --- code/modules/mob/living/bot/secbot.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 2d22e7770c..49871cdaf3 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -85,6 +85,15 @@ declare_arrests = !declare_arrests attack_hand(usr) +/mob/living/bot/secbot/emag_act(var/remaining_uses, var/mob/user) + . = ..() + if(user) + user << "The [src] buzzes and beeps." + emagged = 1 + patrol_speed = 3 + target_speed = 4 + return 1 + /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user) var/curhealth = health ..() From 98099eb56d0c38f5c5636bd73c991cad7a07a407 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 12 Jul 2016 20:09:55 +0100 Subject: [PATCH 2/3] Adds changelog --- html/changelogs/Yoshax -MurderBots.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 html/changelogs/Yoshax -MurderBots.txt diff --git a/html/changelogs/Yoshax -MurderBots.txt b/html/changelogs/Yoshax -MurderBots.txt new file mode 100644 index 0000000000..8352435677 --- /dev/null +++ b/html/changelogs/Yoshax -MurderBots.txt @@ -0,0 +1,14 @@ +# Your name. +author: Yoshax + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "When emagged security bots such as the Securitron and ED-209 will now move faster and pursue faster. + - bugfix: "Security bots such as above can now actually be properly emagged." \ No newline at end of file From 44d0ee657c173f99c0052aaedc009bb800cae7ff Mon Sep 17 00:00:00 2001 From: Yoshax Date: Tue, 12 Jul 2016 21:40:07 +0100 Subject: [PATCH 3/3] Ensures bots are only emaggable once --- code/modules/mob/living/bot/secbot.dm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/bot/secbot.dm b/code/modules/mob/living/bot/secbot.dm index 49871cdaf3..0a0803a27e 100644 --- a/code/modules/mob/living/bot/secbot.dm +++ b/code/modules/mob/living/bot/secbot.dm @@ -87,12 +87,15 @@ /mob/living/bot/secbot/emag_act(var/remaining_uses, var/mob/user) . = ..() - if(user) - user << "The [src] buzzes and beeps." - emagged = 1 - patrol_speed = 3 - target_speed = 4 - return 1 + if(!emagged) + if(user) + user << "\The [src] buzzes and beeps." + emagged = 1 + patrol_speed = 3 + target_speed = 4 + return 1 + else + user << "\The [src] is already corrupt." /mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user) var/curhealth = health