From 5ea0a911d11b3dee8a83d235c00ea9d752091258 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Tue, 3 May 2016 00:52:23 -0700 Subject: [PATCH] Some more fixes --- code/game/objects/items/robot/robot_items.dm | 1 + code/modules/projectiles/projectile/energy.dm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index e59f8ef6159..804e14b4795 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -164,6 +164,7 @@ var/safety = !emagged if(cooldown > world.time) user << "The device is still recharging!" + return if(isrobot(user)) var/mob/living/silicon/robot/R = user diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index ec42a271121..1708c1e81e6 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -120,6 +120,8 @@ range = 10 /obj/item/projectile/energy/trap/cyborg/on_hit(atom/target, blocked = 0) + if(!ismob(target) || blocked >= 100) + qdel(src) if(iscarbon(target)) var/obj/item/weapon/restraints/legcuffs/beartrap/B = new /obj/item/weapon/restraints/legcuffs/beartrap/energy/cyborg(get_turf(target)) B.Crossed(target)