Merge pull request #2115 from Yoshax/ED-Emag

Ensures security robots can be properly emagged
This commit is contained in:
Neerti
2016-07-13 19:14:23 -04:00
committed by GitHub
2 changed files with 26 additions and 0 deletions
+12
View File
@@ -85,6 +85,18 @@
declare_arrests = !declare_arrests
attack_hand(usr)
/mob/living/bot/secbot/emag_act(var/remaining_uses, var/mob/user)
. = ..()
if(!emagged)
if(user)
user << "<span class='notice'>\The [src] buzzes and beeps.</span>"
emagged = 1
patrol_speed = 3
target_speed = 4
return 1
else
user << "<span class='notice'>\The [src] is already corrupt.</span>"
/mob/living/bot/secbot/attackby(var/obj/item/O, var/mob/user)
var/curhealth = health
..()
+14
View File
@@ -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."