Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed

code/modules/projectiles/gun.dm

@@ -38,7 +38,6 @@
 	var/current_skin = null //the skin choice if we had a reskin
 	var/list/options = list()
 
-	lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
 
 	var/obj/item/device/firing_pin/pin = /obj/item/device/firing_pin //standard firing pin for most guns

code/modules/projectiles/guns/energy/special.dm

@@ -70,7 +70,6 @@
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "pen"
 	item_state = "pen"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 	w_class = WEIGHT_CLASS_TINY
 

code/modules/projectiles/guns/magic.dm

@@ -19,7 +19,6 @@
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
 	pin = /obj/item/device/firing_pin/magic
 
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
 
 /obj/item/weapon/gun/magic/afterattack(atom/target, mob/living/user, flag)

code/modules/projectiles/projectile.dm

@@ -225,7 +225,7 @@
 				pixel_x = pixel_x_offset
 				pixel_y = pixel_y_offset
 			else
-				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)))
+				animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
 
 			if(original && (original.layer>=2.75) || ismob(original))
 				if(loc == get_turf(original))