Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

# Conflicts:
#	code/game/machinery/turrets.dm

code/modules/projectiles/projectile/beams.dm

@@ -20,6 +20,7 @@
 	name = "practice laser"
 	damage = 0
 	nodamage = 1
+	log = 0
 
 /obj/item/projectile/beam/scatter
 	name = "laser pellet"
@@ -74,6 +75,7 @@
 	damage_type = STAMINA
 	flag = "laser"
 	var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
+	log = 0
 
 /obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
 	. = ..()

code/modules/projectiles/projectile/reusable.dm

@@ -37,6 +37,7 @@
 	var/obj/item/weapon/pen/pen = null
 	edge = 0
 	embed = 0
+	log = 0//it won't log even when there's a pen inside, but since the damage will be so low, I don't think there's any point in making it any more complex
 
 /obj/item/projectile/bullet/reusable/foam_dart/handle_drop()
 	if(dropped)
@@ -64,3 +65,4 @@
 	icon_state = "foamdart_riot"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 	stamina = 25
+	log = 1