clothing

GainStation13/code/clothing/haydee_suit.dm

@@ -2,7 +2,7 @@
 	name = "Haydee Helmet"
 	desc = "A strange helmet. Offers little to no protection."
 	icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
-	alternate_worn_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
+	mob_overlay_icon = 'GainStation13/icons/obj/clothing/haydee_modular.dmi'
 	icon_state = "haydee_helmet"
 	item_state = "item_haydee_helmet"
 	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 25, "fire" = 25, "acid" = 25)

GainStation13/code/clothing/suits.dm

@@ -5,7 +5,7 @@
 	name = "GATO letterman jacket"
 	desc = "A GATO themed letterman jacket. Perfect for repping your pride in the company as you violently murder russian mobsters"
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "letterman_gato"
 	item_state = "letterman_gato"
 	mutantrace_variation = NONE
@@ -14,7 +14,7 @@
 	name = "Elegant Carapace"
 	desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "cc_carapace"
 	item_state = "cc_carapace"
 	mutantrace_variation = NONE
@@ -23,7 +23,7 @@
 	name = "CC-GT Carapace"
 	desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "gato_carapace"
 	item_state = "gato_carapace"
 	mutantrace_variation = NONE
@@ -32,7 +32,7 @@
 	name = "Hellcat Overcoat"
 	desc = "Badass. Seems to be specifically made for some CentComm Commander."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "hellcat_overcoat"
 	item_state = "hellcat_overcoat"
 	mutantrace_variation = NONE
@@ -41,7 +41,7 @@
 	name = "CC Parade Jacket"
 	desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "paradejacket_black"
 	item_state = "paradejacket_black"
 	mutantrace_variation = NONE
@@ -50,7 +50,7 @@
 	name = "CC Parade Jacket"
 	desc = "This elegant and highly protective parade jacket seems to have been made into color purple."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "paradejacket_purple"
 	item_state = "paradejacket_purple"
 	mutantrace_variation = NONE
@@ -59,7 +59,7 @@
 	name = "GATO Hardsuit"
 	desc = "Exclusive variant of a hardsuit, primarily reserved for CC GATO personnel."
 	icon = 'GainStation13/icons/mob/suits.dmi'
-	alternate_worn_icon = 'GainStation13/icons/mob/suits.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/suits.dmi'
 	icon_state = "gato_hardsuit"
 	item_state = "gato_hardsuit"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert/gato

GainStation13/code/modules/clothing/under/jobs/clothing.dm

@@ -1,3 +0,0 @@
-/obj/item/clothing
-	/// Where do we want to grab the file from? use this for GS13 specific clothing.
-	var/icon/alternate_worn_icon

GainStation13/code/modules/vending/mealdor.dm

@@ -39,7 +39,6 @@
 				/obj/item/clothing/head/chefhat = 5,
 				/obj/item/reagent_containers/food/snacks/cookie = 10,
 				/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
-				/obj/item/reagent_containers/food/snacks/salad = 20,
 				/obj/item/reagent_containers/food/snacks/blueberry_gum = 5
 				)
 	premium = list(