Updates to latest, so I can deconflict

code/game/objects/items/weapons/grenades/flashbang.dm

@@ -50,17 +50,6 @@
 
 		// Flash
 		if(flash)
-			if(M.weakeyes)
-				M.visible_message("<span class='disarm'><b>[M]</b> screams and collapses!</span>")
-				to_chat(M, "<span class='userdanger'><font size=3>AAAAGH!</font></span>")
-				M.Weaken(15) //hella stunned
-				M.Stun(15)
-				if(ishuman(M))
-					M.emote("scream")
-					var/mob/living/carbon/human/H = M
-					var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
-					if(E)
-						E.receive_damage(8, TRUE)
 			if(M.flash_eyes(affect_silicon = TRUE))
 				M.Stun(stun_amount)
 				M.Weaken(stun_amount)

code/game/objects/items/weapons/storage/artistic_toolbox.dm

@@ -2,10 +2,7 @@
 	name = "artistic toolbox"
 	desc = "A metal container designed to hold various tools. This variety holds art supplies."
 	icon_state = "green"
-	item_state = "toolbox_green"
-	icon = 'icons/goonstation/objects/objects.dmi'
-	lefthand_file = 'icons/goonstation/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/goonstation/mob/inhands/items_righthand.dmi'
+	item_state = "artistic_toolbox"
 
 /obj/item/storage/toolbox/green/memetic
 	name = "artistic toolbox"

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

@@ -88,7 +88,7 @@
 		return
 
 	if((istype(over_object, /obj/structure/table) || isfloorturf(over_object)) && length(contents) \
-		&& loc == M && !M.stat && !M.restrained() && M.canmove && over_object.Adjacent(M) && !istype(M, /obj/item/storage/lockbox)) // Worlds longest `if()`
+		&& loc == M && !M.stat && !M.restrained() && M.canmove && over_object.Adjacent(M) && !istype(src, /obj/item/storage/lockbox)) // Worlds longest `if()`
 		var/turf/T = get_turf(over_object)
 		if(isfloorturf(over_object))
 			if(get_turf(M) != T)

code/game/objects/items/weapons/storage/toolbox.dm

@@ -1,9 +1,10 @@
 /obj/item/storage/toolbox
 	name = "toolbox"
 	desc = "Danger. Very robust."
-	icon = 'icons/obj/storage.dmi'
-	icon_state = "red"
-	item_state = "toolbox_red"
+	icon_state = "toolbox_default"
+	item_state = "toolbox_default"
+	lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi'
 	flags = CONDUCT
 	force = 10
 	throwforce = 10
@@ -16,6 +17,23 @@
 	hitsound = 'sound/weapons/smash.ogg'
 	drop_sound = 'sound/items/handling/toolbox_drop.ogg'
 	pickup_sound =  'sound/items/handling/toolbox_pickup.ogg'
+	var/latches = "single_latch"
+	var/has_latches = TRUE
+
+/obj/item/storage/toolbox/Initialize(mapload)
+	. = ..()
+	if(has_latches)
+		if(prob(10))
+			latches = "double_latch"
+			if(prob(1))
+				latches = "triple_latch"
+	update_icon()
+
+/obj/item/storage/toolbox/update_icon()
+	..()
+	cut_overlays()
+	if(has_latches)
+		add_overlay(latches)
 
 /obj/item/storage/toolbox/emergency
 	name = "emergency toolbox"
@@ -35,6 +53,7 @@
 /obj/item/storage/toolbox/emergency/old
 	name = "rusty red toolbox"
 	icon_state = "toolbox_red_old"
+	has_latches = FALSE
 
 /obj/item/storage/toolbox/mechanical
 	name = "mechanical toolbox"
@@ -55,6 +74,7 @@
 /obj/item/storage/toolbox/mechanical/old
 	name = "rusty blue toolbox"
 	icon_state = "toolbox_blue_old"
+	has_latches = FALSE
 
 /obj/item/storage/toolbox/electrical
 	name = "electrical toolbox"
@@ -112,22 +132,3 @@
 	new /obj/item/stack/cable_coil(src, 30, paramcolor = pickedcolor)
 	new /obj/item/wirecutters(src)
 	new /obj/item/multitool(src)
-
-/obj/item/storage/toolbox/brass
-	name = "brass box"
-	desc = "A huge brass box with several indentations in its surface."
-	icon_state = "brassbox"
-	item_state = null
-	resistance_flags = FIRE_PROOF | ACID_PROOF
-	w_class = WEIGHT_CLASS_HUGE
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 28
-	storage_slots = 28
-	attack_verb = list("robusted", "crushed", "smashed")
-
-/obj/item/storage/toolbox/brass/prefilled/populate_contents()
-	new /obj/item/screwdriver/brass(src)
-	new /obj/item/wirecutters/brass(src)
-	new /obj/item/wrench/brass(src)
-	new /obj/item/crowbar/brass(src)
-	new /obj/item/weldingtool/experimental/brass(src)