Fixing mechanical traps and portable flashers (#1173)

Traps will trigger don't matter if you are walking or running, same with portable flashers.

Also, fixing a missing shotgun box sprite and a the wrong gun in the supply cargo crate.

code/datums/supplypacks.dm

@@ -708,8 +708,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 
 /datum/supply_packs/weapons
 	name = "Weapons crate"
-	contains = list(/obj/item/weapon/gun/energy/rifle,
-					/obj/item/weapon/gun/energy/rifle,
+	contains = list(/obj/item/weapon/gun/energy/rifle/laser,
+					/obj/item/weapon/gun/energy/rifle/laser,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/weapon/gun/projectile/sec,
 					/obj/item/ammo_magazine/c45m,

code/game/machinery/flasher.dm

@@ -103,10 +103,8 @@
 	if ((src.disable) || (src.last_flash && world.time < src.last_flash + 150))
 		return
 
-	if(istype(AM, /mob/living/carbon))
-		var/mob/living/carbon/M = AM
-		if ((M.m_intent != "walk") && (src.anchored))
-			src.flash()
+	if (src.anchored)
+		src.flash()
 
 /obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/wrench))
@@ -145,4 +143,4 @@
 	icon_state = "launcherbtt"
 	active = 0
 
-	return
+	return

code/game/objects/items/weapons/traps.dm

@@ -102,19 +102,19 @@
 /obj/item/weapon/beartrap/Crossed(AM as mob|obj)
 	if(deployed && isliving(AM))
 		var/mob/living/L = AM
-		if(L.m_intent == "run")
-			L.visible_message(
-				"<span class='danger'>[L] steps on \the [src].</span>",
-				"<span class='danger'>You step on \the [src]!</span>",
-				"<b>You hear a loud metallic snap!</b>"
-				)
-			attack_mob(L)
-			if(!buckled_mob)
-				anchored = 0
-			deployed = 0
-			update_icon()
+		L.visible_message(
+			"<span class='danger'>[L] steps on \the [src].</span>",
+			"<span class='danger'>You step on \the [src]!</span>",
+			"<b>You hear a loud metallic snap!</b>"
+			)
+		attack_mob(L)
+		if(!buckled_mob)
+			anchored = 0
+		deployed = 0
+		update_icon()
 	..()
 
+
 /obj/item/weapon/beartrap/update_icon()
 	..()
 

code/modules/projectiles/ammunition/boxes.dm

@@ -304,7 +304,7 @@
 
 /obj/item/ammo_magazine/shotgun/shell
 	name = "ammunition box (shell)"
-	icon_state = "llethalslug_box"
+	icon_state = "lethalslug_box"
 	ammo_type = /obj/item/ammo_casing/shotgun/pellet
 	max_ammo = 8