Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

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

@@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 /obj/item/storage/toolbox/update_icon()
 	..()
 	cut_overlays()
-	if(blood_DNA && blood_DNA.len)
+	if(length(blood_DNA))
 		add_blood_overlay()
 	if(has_latches)
 		var/icon/I = icon('icons/obj/storage.dmi', latches)
@@ -262,16 +262,12 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	new /obj/item/ammo_box/a762(src)
 	new /obj/item/ammo_box/a762(src)
 
-/obj/item/storage/toolbox/gold_real
+/obj/item/storage/toolbox/plastitanium/gold_real
 	name = "golden toolbox"
 	desc = "A larger then normal toolbox made of gold plated plastitanium."
 	icon_state = "gold"
 	item_state = "toolbox_gold"
 	has_latches = FALSE
-	force = 16 // Less then a spear
-	throwforce = 14
-	throw_speed = 5
-	throw_range = 10
 	material_flags = NONE
 
 /obj/item/storage/toolbox/gold_real/PopulateContents()