Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear

Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm

code/modules/projectiles/ammunition/energy.dm

@@ -41,11 +41,11 @@
 	fire_sound = 'sound/weapons/pulse.ogg'
 
 /obj/item/ammo_casing/energy/laser/bluetag
-	projectile_type = /obj/item/projectile/lasertag/bluetag
+	projectile_type = /obj/item/projectile/beam/lasertag/bluetag
 	select_name = "bluetag"
 
 /obj/item/ammo_casing/energy/laser/redtag
-	projectile_type = /obj/item/projectile/lasertag/redtag
+	projectile_type = /obj/item/projectile/beam/lasertag/redtag
 	select_name = "redtag"
 
 /obj/item/ammo_casing/energy/xray

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

@@ -27,7 +27,7 @@
 	name = "\improper DRAGnet"
 	desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
 	icon_state = "dragnet"
-	origin_tech = "combat=3;magnets=3;materials=4; bluespace=4"
+	origin_tech = "combat=3;magnets=3;materials=4;bluespace=4"
 	ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
 	can_flashlight = 0
 	ammo_x_offset = 1

code/modules/projectiles/projectile.dm

@@ -7,6 +7,7 @@
 	pass_flags = PASSTABLE
 	mouse_opacity = 0
 	hitsound = 'sound/weapons/pierce.ogg'
+	pressure_resistance = INFINITY
 	var/def_zone = ""	//Aiming at
 	var/mob/firer = null//Who shot it
 	var/suppressed = 0	//Attack message
@@ -25,7 +26,7 @@
 	var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
 	var/flag = "bullet" //Defines what armor to use when it hits things.  Must be set to bullet, laser, energy,or bomb
 	var/projectile_type = "/obj/item/projectile"
-	var/kill_count = 50 //This will de-increment every step. When 0, it will delete the projectile.
+	var/range = 50 //This will de-increment every step. When 0, it will delete the projectile.
 		//Effects
 	var/stun = 0
 	var/weaken = 0
@@ -39,19 +40,15 @@
 	var/jitter = 0
 	var/forcedodge = 0
 	// 1 to pass solid objects, 2 to pass solid turfs (results in bugs, bugs and tons of bugs)
-	var/range = 0
 
 /obj/item/projectile/New()
 	permutated = list()
 	return ..()
 
 /obj/item/projectile/proc/Range()
-	if(range)
-		range--
-		if(range <= 0)
-			on_range()
-	else
-		return
+	range--
+	if(range <= 0 && loc)
+		on_range()
 
 /obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
 	qdel(src)
@@ -125,13 +122,9 @@
 
 
 /obj/item/projectile/proc/fire()
-	spawn()
+	spawn(1)
 		while(loc)
-			if(kill_count < 1)
-				qdel(src)
-				return
 			if(!paused)
-				kill_count--
 				if((!( current ) || loc == current))
 					current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
 				step_towards(src, current)
@@ -139,11 +132,11 @@
 					if(loc == get_turf(original))
 						if(!(original in permutated))
 							Bump(original, 1)
-			Range()
+				Range()
 			sleep(1)
 
 
 /obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
 	..()
 	if(isliving(AM) && AM.density && !checkpass(PASSMOB))
-		Bump(AM, 1)
+		Bump(AM, 1)

code/modules/projectiles/projectile/beams.dm

@@ -67,17 +67,16 @@
 	..()
 	return QDEL_HINT_PUTINPOOL
 
-/obj/item/projectile/lasertag
+/obj/item/projectile/beam/lasertag
 	name = "laser tag beam"
 	icon_state = "omnilaser"
 	hitsound = null
 	damage = 0
 	damage_type = STAMINA
 	flag = "laser"
-	pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 	var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
 
-/obj/item/projectile/lasertag/on_hit(atom/target, blocked = 0)
+/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
 	. = ..()
 	if(ishuman(target))
 		var/mob/living/carbon/human/M = target
@@ -86,10 +85,10 @@
 				M.adjustStaminaLoss(34)
 
 
-/obj/item/projectile/lasertag/redtag
+/obj/item/projectile/beam/lasertag/redtag
 	icon_state = "laser"
 	suit_types = list(/obj/item/clothing/suit/bluetag)
 
-/obj/item/projectile/lasertag/bluetag
+/obj/item/projectile/beam/lasertag/bluetag
 	icon_state = "bluelaser"
 	suit_types = list(/obj/item/clothing/suit/redtag)

code/modules/projectiles/projectile/special.dm

@@ -134,11 +134,9 @@ obj/item/projectile/kinetic/New()
 		damage *= 4
 	..()
 
-/obj/item/projectile/kinetic/Range()
-	range--
-	if(range <= 0)
-		new /obj/item/effect/kinetic_blast(src.loc)
-		qdel(src)
+/obj/item/projectile/kinetic/on_range()
+	new /obj/item/effect/kinetic_blast(src.loc)
+	..()
 
 /obj/item/projectile/kinetic/on_hit(atom/target)
 	. = ..()