From 4aedb9c327e770de7c7a353ebe1d4a3eefa54833 Mon Sep 17 00:00:00 2001
From: Expletive <deletedexpletives@gmail.com>
Date: Mon, 12 Jun 2017 14:48:37 -0700
Subject: [PATCH] changesrequested

---
 code/game/objects/items/weapons/storage/lockbox.dm | 9 +--------
 code/modules/clothing/under/accessories.dm         | 4 ++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 311b428fe98..1314174e7a2 100755
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -148,15 +148,8 @@
 			icon_state += "+b"
 		if(contents && open)
 			for (var/i in 1 to contents.len)
-				var/medaltype = "medal"
 				var/obj/item/clothing/accessory/medal/M = contents[i]
-				if(istype(M, /obj/item/clothing/accessory/medal/gold))
-					medaltype += "-gold"
-				if(istype(M, /obj/item/clothing/accessory/medal/silver))
-					medaltype += "-silver"
-				if(istype(M, /obj/item/clothing/accessory/medal/plasma))
-					medaltype += "-plasma"
-				var/icon/medalicon = icon(initial(icon), medaltype)
+				var/icon/medalicon = icon(initial(icon), M.medaltype)
 				if(i > 1 && i <= 5)
 					medalicon.Shift(EAST, (i-1)*3)
 				else if(i > 5)
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index 93321a053ae..0bde06b6b99 100755
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -85,6 +85,7 @@
 	item_color = "bronze"
 	materials = list(MAT_METAL=1000)
 	resistance_flags = FIRE_PROOF
+	var/medaltype = "medal" //Sprite used for medalbox
 	var/commended = FALSE
 
 //Pinning medals on people
@@ -138,6 +139,7 @@
 	desc = "A silver medal."
 	icon_state = "silver"
 	item_color = "silver"
+	medaltype = "medal-silver"
 	materials = list(MAT_SILVER=1000)
 
 /obj/item/clothing/accessory/medal/silver/valor
@@ -153,6 +155,7 @@
 	desc = "A prestigious golden medal."
 	icon_state = "gold"
 	item_color = "gold"
+	medaltype = "medal-gold"
 	materials = list(MAT_GOLD=1000)
 
 /obj/item/clothing/accessory/medal/gold/captain
@@ -169,6 +172,7 @@
 	desc = "An eccentric medal made of plasma."
 	icon_state = "plasma"
 	item_color = "plasma"
+	medaltype = "medal-plasma"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = -10, acid = 0) //It's made of plasma. Of course it's flammable.
 	materials = list(MAT_PLASMA=1000)