Merge pull request #3647 from SkyMarshal/patch-2

ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.

code/ZAS/Connection.dm

@@ -104,8 +104,7 @@ Indirect connections will not merge the two zones after they reach equilibrium.
 
 	//Disconnect zones while handling unusual conditions.
 	//	e.g. loss of a zone on a turf
-	if(A && A.zone && B && B.zone)
-		DisconnectZones(A.zone, B.zone)
+	DisconnectZones(zone_A, zone_B)
 
 	//Finally, preform actual deletion.
 	. = ..()
@@ -400,4 +399,4 @@ Indirect connections will not merge the two zones after they reach equilibrium.
 
 #undef CONNECTION_DIRECT
 #undef CONNECTION_INDIRECT
-#undef CONNECTION_CLOSED
+#undef CONNECTION_CLOSED

code/modules/projectiles/gun.dm

@@ -187,7 +187,7 @@
 			else
 				playsound(user, fire_sound, 50, 1)
 			in_chamber.on_hit(M)
-			if (!in_chamber.nodamage)
+			if (in_chamber.damage_type != HALLOSS)
 				user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]")
 				user.death()
 			else
@@ -212,4 +212,4 @@
 			Fire(M,user) ///Otherwise, shoot!
 			return
 	else
-		return ..() //Pistolwhippin'
+		return ..() //Pistolwhippin'