diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index f9fe3ea0c9e..5d9533470d6 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1152,7 +1152,7 @@ icon_state = "sustenance" products = list(/obj/item/weapon/reagent_containers/food/snacks/tofu = 24, /obj/item/weapon/reagent_containers/food/drinks/ice = 12, - /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6) + /obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn = 6) contraband = list(/obj/item/weapon/kitchen/knife = 6) /obj/machinery/vending/hatdispenser diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 51ee371df32..9da40760327 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -56,7 +56,7 @@ name = "hat" desc = "Someone who wears this will look very smart." icon_state = "detective" - allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy_corn, /obj/item/weapon/pen) + allowed = list(/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn, /obj/item/weapon/pen) armor = list(melee = 50, bullet = 5, laser = 25,energy = 10, bomb = 0, bio = 0, rad = 0) //Mime diff --git a/code/modules/reagents/reagent_containers/food/snacks/candy.dm b/code/modules/reagents/reagent_containers/food/snacks/candy.dm index 1370eff0093..d13eb7ec145 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/candy.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/candy.dm @@ -139,13 +139,13 @@ reagents.add_reagent("sugar", 3) bitesize = 5 -/obj/item/weapon/reagent_containers/food/snacks/candy_corn +/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn name = "candy corn" desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas." - icon_state = "candy_corn" + icon_state = "candycorn" filling_color = "#FFFCB0" -/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New() +/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn/New() ..() reagents.add_reagent("nutriment", 4) reagents.add_reagent("sugar", 2)