Revert "12/21 modernizations from TG live"

code/modules/projectiles/firing.dm

@@ -1,4 +1,4 @@
-/obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
+/obj/item/ammo_casing/proc/fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, params, distro, quiet, zone_override = "",spread)
 	distro += variance
 	for (var/i = max(1, pellets), i > 0, i--)
 		var/targloc = get_turf(target)
@@ -20,7 +20,7 @@
 	update_icon()
 	return 1
 
-/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override)
+/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
 	if (!BB)
 		return
 	BB.original = target
@@ -39,20 +39,17 @@
 	var/turf/curloc = get_turf(user)
 	if (!istype(targloc) || !istype(curloc) || !BB)
 		return 0
-
-	var/firing_dir
-	if(BB.firer)
-		firing_dir = BB.firer.dir
-	if(!BB.suppressed && firing_effect_type)
-		PoolOrNew(firing_effect_type, list(get_turf(src), firing_dir))
-
-	var/direct_target
+	BB.ammo_casing = src
 	if(targloc == curloc)
-		if(target) //if the target is right on our location we'll skip the travelling code in the proj's fire()
-			direct_target = target
-	if(!direct_target)
-		BB.preparePixelProjectile(target, targloc, user, params, spread)
-	BB.fire(null, direct_target)
+		if(target) //if the target is right on our location we go straight to bullet_act()
+			target.bullet_act(BB, BB.def_zone)
+		qdel(BB)
+		BB = null
+		return 1
+
+	BB.preparePixelProjectile(target, targloc, user, params, spread)
+	if(BB)
+		BB.fire()
 	BB = null
 	return 1
 
@@ -60,3 +57,42 @@
 	var/dx = abs(target.x - current.x)
 	var/dy = abs(target.y - current.y)
 	return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z)
+
+/obj/item/projectile/proc/preparePixelProjectile(atom/target, var/turf/targloc, mob/living/user, params, spread)
+	var/turf/curloc = get_turf(user)
+	src.loc = get_turf(user)
+	src.starting = get_turf(user)
+	src.current = curloc
+	src.yo = targloc.y - curloc.y
+	src.xo = targloc.x - curloc.x
+
+	if(params)
+		var/list/mouse_control = params2list(params)
+		if(mouse_control["icon-x"])
+			src.p_x = text2num(mouse_control["icon-x"])
+		if(mouse_control["icon-y"])
+			src.p_y = text2num(mouse_control["icon-y"])
+		if(mouse_control["screen-loc"])
+			//Split screen-loc up into X+Pixel_X and Y+Pixel_Y
+			var/list/screen_loc_params = splittext(mouse_control["screen-loc"], ",")
+
+			//Split X+Pixel_X up into list(X, Pixel_X)
+			var/list/screen_loc_X = splittext(screen_loc_params[1],":")
+
+			//Split Y+Pixel_Y up into list(Y, Pixel_Y)
+			var/list/screen_loc_Y = splittext(screen_loc_params[2],":")
+			// world << "X: [screen_loc_X[1]] PixelX: [screen_loc_X[2]] / Y: [screen_loc_Y[1]] PixelY: [screen_loc_Y[2]]"
+			var/x = text2num(screen_loc_X[1]) * 32 + text2num(screen_loc_X[2]) - 32
+			var/y = text2num(screen_loc_Y[1]) * 32 + text2num(screen_loc_Y[2]) - 32
+
+			//Calculate the "resolution" of screen based on client's view and world's icon size. This will work if the user can view more tiles than average.
+			var/screenview = (user.client.view * 2 + 1) * world.icon_size //Refer to http://www.byond.com/docs/ref/info.html#/client/var/view for mad maths
+
+			var/ox = round(screenview/2) //"origin" x
+			var/oy = round(screenview/2) //"origin" y
+			// world << "Pixel position: [x] [y]"
+			var/angle = Atan2(y - oy, x - ox)
+			// world << "Angle: [angle]"
+			src.Angle = angle
+	if(spread)
+		src.Angle += spread