mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Bugfix for borgs&doors as well as chem grenades.
This commit is contained in:
@@ -528,7 +528,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
|
|||||||
if (src.canAIHack())
|
if (src.canAIHack())
|
||||||
src.hack(user)
|
src.hack(user)
|
||||||
return
|
return
|
||||||
else if(user)
|
else if(user && !isrobot(user))
|
||||||
if(!C)
|
if(!C)
|
||||||
return
|
return
|
||||||
if(C.in_use)
|
if(C.in_use)
|
||||||
@@ -542,7 +542,7 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
|
|||||||
return
|
return
|
||||||
if(istype(C, /obj/item/device/hacktool/engineer))
|
if(istype(C, /obj/item/device/hacktool/engineer))
|
||||||
return
|
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]"
|
world << "ERROR: Mob was null when calling attack_ai on [src.name] at [src.x],[src.y],[src.z]"
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -140,6 +140,7 @@
|
|||||||
|
|
||||||
|
|
||||||
process()
|
process()
|
||||||
|
processing_objects.Remove(src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -45,10 +45,6 @@
|
|||||||
if(scanning)
|
if(scanning)
|
||||||
src.overlays += text("infrared_old2")
|
src.overlays += text("infrared_old2")
|
||||||
src.small_icon_state_overlays += text("infrared_on")
|
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)
|
if(holder)
|
||||||
holder.update_icon()
|
holder.update_icon()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -87,15 +87,9 @@
|
|||||||
if(timing)
|
if(timing)
|
||||||
overlays += text("prox_timing")
|
overlays += text("prox_timing")
|
||||||
small_icon_state_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)
|
if(scanning)
|
||||||
overlays += text("prox_scanning")
|
overlays += text("prox_scanning")
|
||||||
small_icon_state_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)
|
if(holder)
|
||||||
holder.update_icon()
|
holder.update_icon()
|
||||||
|
|
||||||
|
|||||||
@@ -64,9 +64,6 @@
|
|||||||
if(timing)
|
if(timing)
|
||||||
overlays += text("timer_timing")
|
overlays += text("timer_timing")
|
||||||
small_icon_state_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)
|
if(holder)
|
||||||
holder.update_icon()
|
holder.update_icon()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -289,12 +289,6 @@
|
|||||||
if(beaker_two)
|
if(beaker_two)
|
||||||
beaker_two.loc = get_turf(src.loc)
|
beaker_two.loc = get_turf(src.loc)
|
||||||
|
|
||||||
c_state(var/i = 0)
|
|
||||||
if(i)
|
|
||||||
icon_state = initial(icon_state) + "_armed"
|
|
||||||
return
|
|
||||||
|
|
||||||
|
|
||||||
large
|
large
|
||||||
name = "Large Chem Grenade"
|
name = "Large Chem Grenade"
|
||||||
desc = "An oversized grenade that affects a larger area."
|
desc = "An oversized grenade that affects a larger area."
|
||||||
|
|||||||
Reference in New Issue
Block a user