From 510d1acd0650ee98c7b4c5fb00886a9574ca28cc Mon Sep 17 00:00:00 2001 From: AnturK Date: Fri, 18 Dec 2015 10:03:38 +0100 Subject: [PATCH] Medbeam Fixes --- code/modules/projectiles/guns/medbeam.dm | 17 +++-------------- icons/effects/beam.dmi | Bin 5223 -> 5456 bytes 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm index 5af9f806bca..67a768ee3f8 100644 --- a/code/modules/projectiles/guns/medbeam.dm +++ b/code/modules/projectiles/guns/medbeam.dm @@ -33,30 +33,19 @@ /obj/item/weapon/gun/medbeam/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override) add_fingerprint(user) - if(!isliving(target)) - return if(current_target) LoseTarget() + if(!isliving(target)) + return current_target = target active = 1 - current_beam = new(user,current_target,time=6000) + current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical) spawn(0) current_beam.Start() feedback_add_details("gun_fired","[src.type]") -/obj/item/weapon/gun/medbeam/afterattack(obj/target, mob/user, proximity) - if(target.loc == loc || target == user) - return - - if(!current_target && isliving(target)) - current_target = target - active = 1 - current_beam = new(user,current_target,time=6000) - spawn(0) - current_beam.Start() - /obj/item/weapon/gun/medbeam/process() var/mob/living/carbon/human/H = loc if(!istype(H)) diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi index dc0c7b9c513b86c8a92f9bd64e30a522dcbc3a70..2d880961426c8a7505a2aff1099b0105fd4936cd 100644 GIT binary patch delta 5231 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 rO;K2d!9PX!H9 delta 4983 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