Bugfix for borgs&doors as well as chem grenades.

This commit is contained in:
SkyMarshal
2012-02-13 16:56:34 -07:00
parent 6cb78379c3
commit 42be0feff6
6 changed files with 3 additions and 21 deletions

View File

@@ -528,7 +528,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
if (src.canAIHack())
src.hack(user)
return
else if(user)
else if(user && !isrobot(user))
if(!C)
return
if(C.in_use)
@@ -542,7 +542,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
return
if(istype(C, /obj/item/device/hacktool/engineer))
return
else
else if(!isrobot(user))
world << "ERROR: Mob was null when calling attack_ai on [src.name] at [src.x],[src.y],[src.z]"
return

View File

@@ -140,6 +140,7 @@
process()
processing_objects.Remove(src)
return

View File

@@ -45,10 +45,6 @@
if(scanning)
src.overlays += text("infrared_old2")
src.small_icon_state_overlays += text("infrared_on")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
if(holder)
holder.update_icon()
return

View File

@@ -87,15 +87,9 @@
if(timing)
overlays += text("prox_timing")
small_icon_state_overlays += text("prox_timing")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
if(scanning)
overlays += text("prox_scanning")
small_icon_state_overlays += text("prox_scanning")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
if(holder)
holder.update_icon()

View File

@@ -64,9 +64,6 @@
if(timing)
overlays += text("timer_timing")
small_icon_state_overlays += text("timer_timing")
if(master && istype(master, /obj/item/weapon/chem_grenade))
var/obj/item/weapon/chem_grenade/M = master
M.c_state(1)
if(holder)
holder.update_icon()
return

View File

@@ -289,12 +289,6 @@
if(beaker_two)
beaker_two.loc = get_turf(src.loc)
c_state(var/i = 0)
if(i)
icon_state = initial(icon_state) + "_armed"
return
large
name = "Large Chem Grenade"
desc = "An oversized grenade that affects a larger area."