Merge pull request #9012 from Cerebulon/mug_fix

Fix some coffee mugs not using the correct sprites

code/modules/food/drinkingglass/mugs.dm

@@ -78,12 +78,12 @@
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/alma
 	name = "\improper Almach Association coffee cup"
 	desc = "A grey coffee cup emblazoned with the star of the Almach Association."
-	icon_state = "coffeecup_alma"
+	base_icon = "coffeecup_alma"
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/almp
 	name = "\improper Almach Protectorate coffee cup"
 	desc = "A purple coffee cup emblazoned with the star of the Almach Protectorate."
-	icon_state = "coffeecup_almp"
+	base_icon = "coffeecup_almp"
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/psc
 	name = "\improper Pearlshield coffee mug"
@@ -119,7 +119,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/zeng
 	name = "\improper Zeng-Hu coffee cup"
 	desc = "A coffee cup bearing the Zeng-Hu logo."
-	icon_state = "coffeecup_zeng"
+	base_icon = "coffeecup_zeng"
 
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/bishop
 	name = "\improper Bishop coffee mug"
@@ -170,7 +170,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/flame
 	name = "flame coffee cup"
 	desc = "A coffee cup with the a flame emblazoned on it."
-	icon_state = "coffeecup_flame"
+	base_icon = "coffeecup_flame"
 
 // Pure colors & other
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/black
@@ -248,4 +248,4 @@
 /obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/tall/rainbow
 	name = "tall rainbow coffee mug"
 	desc = "An unreasonably tall coffee mug, for when you really need to wake up in the morning. This one is rainbow colored."
-	base_icon = "coffeecup_tall_rainbow"
+	base_icon = "coffeecup_tall_rainbow"