Fixes #6436

code/modules/mining/satchel_ore_boxdm.dm

@@ -4,19 +4,11 @@
 /obj/structure/ore_box
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "orebox0"
-	name = "Ore Box"
+	name = "ore box"
 	desc = "A heavy box used for storing ore."
 	density = 1
-	var/amt_gold = 0
-	var/amt_silver = 0
-	var/amt_diamond = 0
-	var/amt_glass = 0
-	var/amt_iron = 0
-	var/amt_phoron = 0
-	var/amt_uranium = 0
-	var/amt_clown = 0
-	var/amt_strange = 0
 	var/last_update = 0
+	var/list/stored_ore = list()
 
 /obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/ore))
@@ -28,8 +20,22 @@
 		for(var/obj/item/weapon/ore/O in S.contents)
 			S.remove_from_storage(O, src) //This will move the item to this item's contents
 		user << "\blue You empty the satchel into the box."
+
+	update_ore_count()
+
 	return
 
+/obj/structure/ore_box/proc/update_ore_count()
+
+	stored_ore = list()
+
+	for(var/obj/item/weapon/ore/O in contents)
+
+		if(stored_ore[O.name])
+			stored_ore[O.name]++
+		else
+			stored_ore[O.name] = 1
+
 /obj/structure/ore_box/examine()
 	set name = "Examine"
 	set category = "IC"
@@ -48,34 +54,17 @@
 
 	add_fingerprint(usr)
 
-	if(contents.len < 1)
+	if(!contents.len)
 		usr << "It is empty."
 		return
 
 	if(world.time > last_update + 10)
-		update_orecount()
+		update_ore_count()
 		last_update = world.time
 
-	var/dat = text("<b>The contents of the ore box reveal...</b>")
-	if (amt_iron)
-		dat += text("<br>Metal ore: [amt_iron]")
-	if (amt_glass)
-		dat += text("<br>Sand: [amt_glass]")
-	if (amt_phoron)
-		dat += text("<br>Phoron ore: [amt_phoron]")
-	if (amt_uranium)
-		dat += text("<br>Uranium ore: [amt_uranium]")
-	if (amt_silver)
-		dat += text("<br>Silver ore: [amt_silver]")
-	if (amt_gold)
-		dat += text("<br>Gold ore: [amt_gold]")
-	if (amt_diamond)
-		dat += text("<br>Diamond ore: [amt_diamond]")
-	if (amt_strange)
-		dat += text("<br>Strange rocks: [amt_strange]")
-
-	usr << dat
-
+	usr << "It holds:"
+	for(var/ore in stored_ore)
+		usr << "- [stored_ore[ore]] [ore]"
 	return
 
 
@@ -106,47 +95,4 @@
 		O.loc = src.loc
 	usr << "\blue You empty the ore box"
 
-	return
-
-
-// Updates ore tally
-/obj/structure/ore_box/proc/update_orecount()
-	amt_iron = 0
-	amt_glass = 0
-	amt_phoron = 0
-	amt_uranium = 0
-	amt_silver = 0
-	amt_gold = 0
-	amt_diamond = 0
-	amt_strange = 0
-	amt_clown = 0
-
-	for(var/obj/item/weapon/ore/O in contents)
-		if(!istype(O))
-			continue
-
-		if (istype(O, /obj/item/weapon/ore/iron))
-			amt_iron++
-			continue
-		if (istype(O, /obj/item/weapon/ore/glass))
-			amt_glass++
-			continue
-		if (istype(O, /obj/item/weapon/ore/phoron))
-			amt_phoron++
-			continue
-		if (istype(O, /obj/item/weapon/ore/uranium))
-			amt_uranium++
-			continue
-		if (istype(O, /obj/item/weapon/ore/silver))
-			amt_silver++
-			continue
-		if (istype(O, /obj/item/weapon/ore/gold))
-			amt_gold++
-			continue
-		if (istype(O, /obj/item/weapon/ore/diamond))
-			amt_diamond++
-			continue
-		if (istype(O, /obj/item/weapon/ore/strangerock))
-			amt_strange++
-			continue
 	return