Ion storms can actually emag bots now

This commit is contained in:
alex-gh
2013-11-11 17:48:20 +01:00
parent a3e43cb523
commit dfef64b00c
6 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -34,11 +34,11 @@
src.explode()
/obj/machinery/bot/proc/Emag(mob/user as mob)
if(locked)
if(locked && user)
locked = 0
emagged = 1
user << "<span class='warning'>You bypass [src]'s controls.</span>"
if(!locked && open)
if((!locked && open) || !user) //Ion storm does not require unlocking for emagging
emagged = 2
/obj/machinery/bot/examine()
+1 -1
View File
@@ -153,7 +153,7 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
/obj/machinery/bot/cleanbot/Emag(mob/user as mob)
..()
if(open && !locked)
if((!locked && open) || !user)
if(user) user << "<span class='notice'>The [src] buzzes and beeps.</span>"
src.oddbutton = 1
src.screwloose = 1
+1 -1
View File
@@ -204,7 +204,7 @@ Auto Patrol: []"},
/obj/machinery/bot/ed209/Emag(mob/user as mob)
..()
if(open && !locked)
if((!locked && open) || !user)
if(user) user << "<span class='warning'>You short out [src]'s target assessment circuits.</span>"
spawn(0)
for(var/mob/O in hearers(src, null))
+1 -1
View File
@@ -125,7 +125,7 @@
/obj/machinery/bot/floorbot/Emag(mob/user as mob)
..()
if(open && !locked)
if((!locked && open) || !user)
if(user) user << "<span class='notice'>The [src] buzzes and beeps.</span>"
/obj/machinery/bot/floorbot/Topic(href, href_list)
+1 -1
View File
@@ -215,7 +215,7 @@
/obj/machinery/bot/medbot/Emag(mob/user as mob)
..()
if(open && !locked)
if((!locked && open) || !user)
if(user) user << "<span class='warning'>You short out [src]'s reagent synthesis circuits.</span>"
spawn(0)
for(var/mob/O in hearers(src, null))
+1 -1
View File
@@ -177,7 +177,7 @@ Auto Patrol: []"},
/obj/machinery/bot/secbot/Emag(mob/user as mob)
..()
if(open && !locked)
if((!locked && open) || !user)
if(user) user << "\red You short out [src]'s target assessment circuits."
spawn(0)
for(var/mob/O in hearers(src, null))