Fix for Ripley tele-drilling people that had run away.

Fix for mediborgs inserting their beaker into the chem dispenser. (this broke everything)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2568 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-11-28 19:34:08 +00:00
parent bb9e5f749a
commit 986858f761
2 changed files with 5 additions and 1 deletions

View File

@@ -78,6 +78,7 @@
chassis.occupant_message("<font color='red'><b>You start to drill [target]</b></font>")
chassis.use_power(energy_drain)
var/T = chassis.loc
var/C = target.loc //why are these backwards? we may never know -Pete
if(do_after_cooldown(target))
if(T == chassis.loc && src == chassis.selected)
if(istype(target, /turf/simulated/wall/r_wall))
@@ -93,7 +94,7 @@
for(var/obj/item/weapon/ore/ore in range(chassis,1))
if(get_dir(chassis,ore)&chassis.dir)
ore.Move(ore_box)
else
else if(target.loc == C)
chassis.log_message("Drilled through [target]")
target.ex_act(2)
return 1

View File

@@ -112,6 +112,9 @@
return
attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob)
if(isrobot(user))
return
if(!istype(B, /obj/item/weapon/reagent_containers/glass))
return