* Fix a runtime on mecha syringe gun hitting that prevented reagent transfer (#42642)

* Reverted some hastily (and wrongly) made changes to prehit() procs
This commit is contained in:
Menshin
2019-02-04 10:06:15 +01:00
committed by oranges
parent 3304267330
commit 8d11af1748
4 changed files with 5 additions and 5 deletions

View File

@@ -130,7 +130,7 @@
return BODY_ZONE_CHEST
/obj/item/projectile/proc/prehit(atom/target)
return BULLET_ACT_HIT
return TRUE
/obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE)
var/turf/target_loca = get_turf(target)

View File

@@ -385,11 +385,11 @@
if(M.anti_magic_check())
M.visible_message("<span class='warning'>[src] vanishes on contact with [A]!</span>")
qdel(src)
return BULLET_ACT_BLOCK
return
if(M.anchored)
return ..()
M.forceMove(src)
return BULLET_ACT_HIT
return FALSE
return ..()
/obj/item/projectile/magic/locker/on_hit(target)

View File

@@ -30,7 +30,7 @@
if(target == original)
DISABLE_BITFIELD(movement_type, UNSTOPPABLE)
else if(!isturf(target))
return BULLET_ACT_HIT
return FALSE
return ..()
/obj/item/projectile/curse_hand/Destroy()