diff --git a/code/modules/critters/critter_defenses.dm b/code/modules/critters/critter_defenses.dm
index fde45ab5d3f..6033748bb33 100644
--- a/code/modules/critters/critter_defenses.dm
+++ b/code/modules/critters/critter_defenses.dm
@@ -121,3 +121,13 @@ Contains the procs that control attacking critters
 		if(prob(25))
 			src.Die()
 		return
+
+	attack_animal(mob/living/simple_animal/M as mob)
+		if(M.melee_damage_upper == 0)
+			M.emote("[M.friendly] [src]")
+		else
+			for(var/mob/O in viewers(src, null))
+				O.show_message("\red <B>[M]</B> [M.attacktext] [src]!", 1)
+			var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
+			TakeDamage(damage)
+		return
\ No newline at end of file
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 3b4360eda1f..d74b831f510 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -103,6 +103,8 @@ proc/move_mining_shuttle()
 	icon_state = "lantern-off"
 	desc = "A miner's lantern"
 	anchored = 0
+	icon_on = "lantern-on"
+	icon_off = "lantern-off"
 	var/brightness = 12			// luminosity when on
 
 /obj/item/device/flashlight/lantern/New()
@@ -111,12 +113,10 @@ proc/move_mining_shuttle()
 	return
 
 /obj/item/device/flashlight/lantern/attack_self(mob/user)
-	..()
-	if (on == 1)
-		icon_state = "lantern-on"
-	else
-		icon_state = "lantern-off"
-
+	src.add_fingerprint(user)
+	on = !on
+	update_brightness(user)
+	return
 
 /*****************************Pickaxe********************************/
 
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index a9462687a9f..2e86e4fea35 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -13,7 +13,7 @@
 /obj/item/weapon/gun/energy/laser/practice
 	name = "practice laser gun"
 	desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
-	projectile_type = "/obj/item/projectile/beam/practice"
+	projectile_type = "/obj/item/projectile/practice"
 
 
 obj/item/weapon/gun/energy/laser/retro