Merge remote-tracking branch 'origin/master' into semi-sync

code/game/objects/items/kitchen.dm

@@ -175,7 +175,7 @@
 
 /obj/item/kitchen/knife/combat/survival/knuckledagger/Initialize()
 	. = ..()
-	AddComponent(/datum/component/butchering, 50, 120, 5) // it's good for butchering stuff
+	AddComponent(/datum/component/butchering, 30, 130, 20) // it's good for butchering stuff
 
 /obj/item/kitchen/knife/combat/survival/knuckledagger/ui_action_click(mob/user, actiontype)
 	light_on = !light_on
@@ -189,6 +189,11 @@
 	else
 		set_light(0)
 
+/obj/item/kitchen/knife/combat/survival/knuckledagger/update_overlays()
+	. = ..()
+	if(light_on)
+		. += "[icon_state]_lit"
+
 /obj/item/kitchen/knife/combat/bone
 	name = "bone dagger"
 	item_state = "bone_dagger"

code/game/objects/items/puzzle_pieces.dm

@@ -137,7 +137,7 @@
 		AM.set_anchored(TRUE)
 		flick("laserbox_burn", AM)
 		trigger()
-		QDEL_IN(AM, 15)
+		QDEL_IN(src, 15)
 
 // snowflake code until undertile elements
 /obj/item/pressure_plate/hologrid/hide()