initial

code/_onclick/adjacent.dm

@@ -25,7 +25,7 @@
 	* If you are diagonally adjacent, ensure you can pass through at least one of the mutually adjacent square.
 		* Passing through in this case ignores anything with the throwpass flag, such as tables, racks, and morgue trays.
 */
-/turf/Adjacent(atom/neighbor, atom/target = null)
+/turf/Adjacent(atom/neighbor, atom/target = null, list/ignore_list)
 	var/turf/T0 = get_turf(neighbor)
 	if(T0 == src)
 		return TRUE
@@ -34,22 +34,22 @@
 
 	if(T0.x == x || T0.y == y)
 		// Check for border blockages
-		return T0.ClickCross(get_dir(T0,src), border_only = 1) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target)
+		return T0.ClickCross(get_dir(T0,src), border_only = 1, ignore_list = ignore_list) && src.ClickCross(get_dir(src,T0), border_only = 1, target_atom = target, ignore_list = ignore_list)
 
 	// Not orthagonal
 	var/in_dir = get_dir(neighbor,src) // eg. northwest (1+8)
 	var/d1 = in_dir&(in_dir-1) // eg west (1+8)&(8) = 8
 	var/d2 = in_dir - d1 // eg north (1+8) - 8 = 1
 
 	for(var/d in list(d1,d2))
-		if(!T0.ClickCross(d, border_only = 1))
+		if(!T0.ClickCross(d, border_only = 1, ignore_list = ignore_list))
 			continue // could not leave T0 in that direction
 
 		var/turf/T1 = get_step(T0,d)
-		if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0))
+		if(!T1 || T1.density || !T1.ClickCross(get_dir(T1,T0)|get_dir(T1,src), border_only = 0, ignore_list = ignore_list))
 			continue // couldn't enter or couldn't leave T1
 
-		if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target))
+		if(!src.ClickCross(get_dir(src,T1), border_only = 1, target_atom = target, ignore_list = ignore_list))
 			continue // could not enter src
 
 		return TRUE // we don't care about our own density
@@ -131,8 +131,11 @@ Quick adjacency (to turf):
 	This is defined as any dense ON_BORDER object, or any dense object without throwpass.
 	The border_only flag allows you to not objects (for source and destination squares)
 */
-/turf/proc/ClickCross(target_dir, border_only, target_atom = null)
+/turf/proc/ClickCross(target_dir, border_only, target_atom = null, list/ignore_list)
 	for(var/obj/O in src)
+		if(O in ignore_list)
+			continue
+
 		if(!O.density || O == target_atom || O.throwpass)
 			continue // throwpass is used for anything you can click through
 

code/datums/ammo/misc.dm

@@ -51,6 +51,8 @@
 /datum/ammo/flamethrower/tank_flamer
 	flamer_reagent_type = /datum/reagent/napalm/blue
 
+	max_range = 8
+
 /datum/ammo/flamethrower/sentry_flamer
 	flags_ammo_behavior = AMMO_IGNORE_ARMOR|AMMO_IGNORE_COVER|AMMO_FLAME
 	flamer_reagent_type = /datum/reagent/napalm/blue
@@ -265,6 +267,9 @@
 	nade_type = /obj/item/explosive/grenade/smokebomb
 	icon_state = "smoke_shell"
 
+/datum/ammo/grenade_container/tank_glauncher
+	max_range = 8
+
 /datum/ammo/hugger_container
 	name = "hugger shell"
 	ping = null

code/datums/ammo/rocket.dm

@@ -143,6 +143,8 @@
 		return
 	return ..()
 
+/datum/ammo/rocket/ap/tank_towlauncher
+	max_range = 8
 
 /datum/ammo/rocket/ltb
 	name = "cannon round"

code/modules/mob/living/carbon/human/human.dm

@@ -1270,10 +1270,18 @@
 
 	if(!H || H.w_uniform?.sensor_mode != SENSOR_MODE_LOCATION)
 		return
-	if(H.z != src.z || get_dist(src,H) < 1 || src == H)
+
+	var/atom/tracking_atom = H
+	if(tracking_atom.z != src.z && SSinterior.in_interior(tracking_atom))
+		var/datum/interior/interior = SSinterior.get_interior_by_coords(tracking_atom.x, tracking_atom.y, tracking_atom.z)
+		var/atom/exterior = interior.exterior
+		if(exterior)
+			tracking_atom = exterior
+
+	if(tracking_atom.z != src.z || get_dist(src, tracking_atom) < 1 || src == tracking_atom)
 		hud_used.locate_leader.icon_state = "trackondirect[tracking_suffix]"
 	else
-		hud_used.locate_leader.setDir(get_dir(src,H))
+		hud_used.locate_leader.setDir(get_dir(src, tracking_atom))
 		hud_used.locate_leader.icon_state = "trackon[tracking_suffix]"
 
 /mob/living/carbon/proc/locate_nearest_nuke()

code/modules/mob/living/carbon/xenomorph/life.dm

@@ -445,6 +445,12 @@ Make sure their actual health updates immediately.*/
 		QL.icon_state = "trackoff"
 		return
 
+	if(tracking_atom.loc.z != loc.z && SSinterior.in_interior(tracking_atom))
+		var/datum/interior/interior = SSinterior.get_interior_by_coords(tracking_atom.x, tracking_atom.y, tracking_atom.z)
+		var/atom/exterior = interior.exterior
+		if(exterior)
+			tracking_atom = exterior
+
 	if(tracking_atom.loc.z != loc.z || get_dist(src, tracking_atom) < 1 || src == tracking_atom)
 		QL.icon_state = "trackondirect"
 	else

code/modules/projectiles/projectile.dm

@@ -192,8 +192,8 @@
 
 	if(F && !(projectile_flags & PROJECTILE_SHRAPNEL))
 		permutated |= F //Don't hit the shooter (firer)
-	else if (S && (projectile_flags & PROJECTILE_SHRAPNEL))
-		permutated |= S
+	if (S)
+		permutated |= get_atom_on_turf(S) //Don't hit the originating object
 
 	permutated |= src //Don't try to hit self.
 	shot_from = S
@@ -354,15 +354,14 @@
 	if((speed * world.tick_lag) >= get_dist(current_turf, target_turf))
 		SEND_SIGNAL(src, COMSIG_BULLET_TERMINAL)
 
-	// Check we can reach the turf at all based on pathed grid
-	var/proj_dir = get_dir(current_turf, next_turf)
-	if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf))
-		ammo.on_hit_turf(current_turf, src)
-		current_turf.bullet_act(src)
-		return TRUE
 
-	// Check for hits that would occur when moving to turf, such as a blocking cade
-	if(scan_a_turf(next_turf, proj_dir))
+	var/list/ignore_list
+	var/obj/item/hardpoint/hardpoint = shot_from
+	if(istype(hardpoint))
+		LAZYOR(ignore_list, hardpoint.owner) //if fired from a vehicle, exclude the vehicle's body from the adjacency check
+
+	// Check we can reach the turf at all based on pathed grid
+	if(check_canhit(current_turf, next_turf, ignore_list))
 		return TRUE
 
 	// Actually move
@@ -599,6 +598,19 @@
 	if(SEND_SIGNAL(src, COMSIG_BULLET_POST_HANDLE_MOB, L, .) & COMPONENT_BULLET_PASS_THROUGH)
 		return FALSE
 
+/obj/projectile/proc/check_canhit(turf/current_turf, turf/next_turf, list/ignore_list)
+	var/proj_dir = get_dir(current_turf, next_turf)
+	if((proj_dir & (proj_dir - 1)) && !current_turf.Adjacent(next_turf, ignore_list = ignore_list))
+		ammo.on_hit_turf(current_turf, src)
+		current_turf.bullet_act(src)
+		return TRUE
+
+	// Check for hits that would occur when moving to turf, such as a blocking cade
+	if(scan_a_turf(next_turf, proj_dir))
+		return TRUE
+
+	return FALSE
+
 //----------------------------------------------------------
 				// \\
 				//  HITTING THE TARGET  \\

code/modules/vehicles/apc/apc.dm

@@ -182,7 +182,7 @@ GLOBAL_LIST_EMPTY(command_apc_list)
 	V.add_hardpoint(FPW)
 	FPW.dir = turn(V.dir, 90)
 	FPW.name = "Left "+ initial(FPW.name)
-	FPW.origins = list(2, 0)
+	FPW.origins = list(1, 0)
 	FPW.muzzle_flash_pos = list(
 		"1" = list(-18, 14),
 		"2" = list(18, -42),
@@ -195,7 +195,7 @@ GLOBAL_LIST_EMPTY(command_apc_list)
 	V.add_hardpoint(FPW)
 	FPW.dir = turn(V.dir, -90)
 	FPW.name = "Right "+ initial(FPW.name)
-	FPW.origins = list(-2, 0)
+	FPW.origins = list(-1, 0)
 	FPW.muzzle_flash_pos = list(
 		"1" = list(16, 14),
 		"2" = list(-18, -42),

code/modules/vehicles/hardpoints/hardpoint.dm

@@ -305,45 +305,6 @@
 
 	return data
 
-/// Traces backwards from the gun origin to the vehicle to check for obstacles between the vehicle and the muzzle.
-/obj/item/hardpoint/proc/clear_los()
-	if(origins[1] == 0 && origins[2] == 0) //skipping check for modules we don't need this
-		return TRUE
-
-	var/turf/muzzle_turf = get_origin_turf()
-
-	var/turf/checking_turf = muzzle_turf
-	while(!(owner in checking_turf))
-		// Dense turfs block LoS
-		if(checking_turf.density)
-			return FALSE
-
-		// Ensure that we can pass over all objects in the turf
-		for(var/obj/object in checking_turf)
-			// Since vehicles are multitile the
-			if(object == owner)
-				continue
-
-			// Non-dense objects are irrelevant
-			if(!object.density)
-				continue
-
-			// Make sure we can pass object from all directions
-			if(!HAS_FLAG(object.pass_flags.flags_can_pass_all, PASS_OVER_THROW_ITEM))
-				if(!HAS_FLAG(object.flags_atom, ON_BORDER))
-					return FALSE
-				//If we're behind the object, check the behind pass flags
-				else if(dir == object.dir && !HAS_FLAG(object.pass_flags.flags_can_pass_behind, PASS_OVER_THROW_ITEM))
-					return FALSE
-				//If we're in front, check front pass flags
-				else if(dir == turn(object.dir, 180) && !HAS_FLAG(object.pass_flags.flags_can_pass_front, PASS_OVER_THROW_ITEM))
-					return FALSE
-
-		// Trace back towards the vehicle
-		checking_turf = get_step(checking_turf, turn(dir,180))
-
-	return TRUE
-
 //-----------------------------
 //------INTERACTION PROCS----------
 //-----------------------------
@@ -605,10 +566,6 @@
 		to_chat(user, SPAN_WARNING("<b>The target is not within your firing arc!</b>"))
 		return NONE
 
-	if(!clear_los())
-		to_chat(user, SPAN_WARNING("<b>The muzzle is obstructed!</b>"))
-		return NONE
-
 	return handle_fire(target, user, params)
 
 /// Actually fires the gun, sets up the projectile and fires it.

code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm

@@ -4,7 +4,7 @@
 	caliber = "grenade"
 	icon_state = "glauncher_2"
 	w_class = SIZE_LARGE
-	default_ammo = /datum/ammo/grenade_container
+	default_ammo = /datum/ammo/grenade_container/tank_glauncher
 	max_rounds = 20
 	gun_type = /obj/item/hardpoint/secondary/grenade_launcher
 

code/modules/vehicles/hardpoints/hardpoint_ammo/tow_ammo.dm

@@ -5,6 +5,6 @@
 	caliber = "rocket" //correlates to any rocket mags
 	icon_state = "quad_rocket"
 	w_class = SIZE_LARGE
-	default_ammo = /datum/ammo/rocket/ap
+	default_ammo = /datum/ammo/rocket/ap/tank_towlauncher
 	max_rounds = 10
 	gun_type = /obj/item/hardpoint/secondary/towlauncher

code/modules/vehicles/hardpoints/holder/tank_turret.dm

@@ -218,8 +218,3 @@
 		target = L
 
 	return ..()
-
-/obj/item/hardpoint/holder/tank_turret/get_origin_turf()
-	var/origin_turf = ..()
-	origin_turf = get_step(get_step(origin_turf, owner.dir), owner.dir) //this should get us tile in front of tank to prevent grenade being stuck under us.
-	return origin_turf

code/modules/vehicles/hardpoints/primary/autocannon.dm

@@ -10,8 +10,6 @@
 	health = 2000
 	firing_arc = 60
 
-	origins = list(0, -3)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/ace_autocannon
 	max_clips = 2
 

code/modules/vehicles/hardpoints/primary/dual_cannon.dm

@@ -14,7 +14,7 @@
 	health = 1500
 	firing_arc = 60
 
-	origins = list(0, -2)
+	origins = list(0, 1)
 
 	allowed_seat = VEHICLE_DRIVER
 

code/modules/vehicles/hardpoints/primary/flamer.dm

@@ -10,8 +10,6 @@
 	health = 2000
 	firing_arc = 90
 
-	origins = list(0, -3)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/primary_flamer
 	max_clips = 1
 
@@ -33,9 +31,8 @@
 		BULLET_TRAIT_ENTRY(/datum/element/bullet_trait_iff)
 	))
 
-/obj/item/hardpoint/primary/flamer/try_fire(target, user, params)
-	var/turf/origin_turf = get_origin_turf()
-	if(origin_turf == get_turf(target))
+/obj/item/hardpoint/primary/flamer/try_fire(atom/target, mob/living/user, params)
+	if(get_turf(target) in owner.locs)
 		to_chat(user, SPAN_WARNING("The target is too close."))
 		return NONE
 

code/modules/vehicles/hardpoints/primary/ltb.dm

@@ -10,8 +10,6 @@
 	health = 2000
 	firing_arc = 60
 
-	origins = list(0, -3)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/ltb_cannon
 	max_clips = 4
 

code/modules/vehicles/hardpoints/primary/minigun.dm

@@ -9,8 +9,6 @@
 	health = 2000
 	firing_arc = 90
 
-	origins = list(0, -3)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/ltaaap_minigun
 	max_clips = 2
 

code/modules/vehicles/hardpoints/secondary/cupola.dm

@@ -10,8 +10,6 @@
 	health = 2000
 	firing_arc = 120
 
-	origins = list(0, -2)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/m56_cupola
 	max_clips = 1
 

code/modules/vehicles/hardpoints/secondary/flamer.dm

@@ -10,8 +10,6 @@
 	health = 2000
 	firing_arc = 120
 
-	origins = list(0, -2)
-
 	ammo = new /obj/item/ammo_magazine/hardpoint/secondary_flamer
 	max_clips = 1
 
@@ -29,14 +27,28 @@
 	scatter = 2
 	fire_delay = 1.5 SECONDS
 
+/obj/item/hardpoint/secondary/small_flamer/try_fire(atom/target, mob/living/user, params)
+	if(get_turf(target) in owner.locs)
+		to_chat(user, SPAN_WARNING("The target is too close."))
+		return NONE
+
+	return ..()
+
 /obj/item/hardpoint/secondary/small_flamer/handle_fire(atom/target, mob/living/user, params)
-	var/turf/origin_turf = get_origin_turf()
+	//step forward along path so flame starts outside hull
+	var/list/turfs = get_line(get_origin_turf(), get_turf(target))
+	var/turf/origin_turf
+	for(var/turf/turf as anything in turfs)
+		if(turf in owner.locs)
+			continue
+		origin_turf = turf
+		break
 
 	var/distance = get_dist(origin_turf, get_turf(target))
 	var/fire_amount = min(ammo.current_rounds, distance+1, max_range)
 	ammo.current_rounds -= fire_amount
 
-	new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target, CALLBACK(src, PROC_REF(display_ammo), user))
+	new /obj/flamer_fire(origin_turf, create_cause_data(initial(name), user), null, fire_amount, null, FLAMESHAPE_LINE, target)
 
 	play_firing_sounds()
 

code/modules/vehicles/hardpoints/secondary/frontal_cannon.dm

@@ -13,7 +13,7 @@
 	health = 2000
 	firing_arc = 120
 
-	origins = list(0, -2)
+	origins = list(0, -1)
 
 	allowed_seat = VEHICLE_DRIVER