diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index d369161127f..80dd45d1b02 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -39,6 +39,10 @@ name = "Scaredy's Private Reserve Beef Jerky" icon_state = "sosjerky" +/obj/item/trash/spacetwinkie + name = "Space Twinkie" + icon_state = "space_twinkie" + /obj/item/trash/syndi_cakes name = "Syndi cakes" icon_state = "syndi_cakes" diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index 8ab0ba3c5ce..2d84035879a 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -85,14 +85,14 @@ /obj/item/reagent_containers/food/snacks/watermelonslice name = "watermelon slice" desc = "A slice of watery goodness." - icon_state = "watermelonslice" + icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#FF3867" tastes = list("watermelon" = 1) /obj/item/reagent_containers/food/snacks/pineappleslice name = "pineapple slices" desc = "Rings of pineapple." - icon_state = "pineappleslice" + icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#e5b437" tastes = list("pineapple" = 1) diff --git a/code/modules/food_and_drinks/food/foods/junkfood.dm b/code/modules/food_and_drinks/food/foods/junkfood.dm index ad174fcaddd..b36231d3829 100644 --- a/code/modules/food_and_drinks/food/foods/junkfood.dm +++ b/code/modules/food_and_drinks/food/foods/junkfood.dm @@ -48,6 +48,7 @@ name = "Space Twinkie" icon_state = "space_twinkie" desc = "Guaranteed to survive longer then you will." + trash = /obj/item/trash/spacetwinkie filling_color = "#FFE591" junkiness = 25 list_reagents = list("sugar" = 4) diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 911b8eae866..72bd5fe8bf7 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -55,7 +55,7 @@ seed = /obj/item/seeds/orange name = "orange" desc = "It's an tangy fruit." - icon_state = "orange" + icon_state = "orange" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. tastes = list("orange" = 1) filling_color = "#FFA500" distill_reagent = "triple_sec" diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 61c23a294b8..e4e20fd1f7c 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -25,7 +25,7 @@ seed = /obj/item/seeds/watermelon name = "watermelon" desc = "It's full of watery goodness." - icon_state = "watermelon" + icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. slice_path = /obj/item/reagent_containers/food/snacks/watermelonslice slices_num = 5 dried_type = null @@ -51,7 +51,7 @@ seed = /obj/item/seeds/watermelon/holy name = "holymelon" desc = "The water within this melon has been blessed by some deity that's particularly fond of watermelon." - icon_state = "holymelon" + icon_state = "holymelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#FFD700" dried_type = null wine_power = 0.7 //Water to wine, baby. diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index aad271e4f76..526d83e698d 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi index 2259813e20c..3c1d27750e6 100644 Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 5fa2372fa80..ef9af82d855 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ