diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 9943a262..70649a1e 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -68,6 +68,10 @@ resistance_flags = NONE grind_results = list("aluminium" = 10) +/obj/item/trash/soy_food + name = "soyfood" + icon_state = "soy_food" + /obj/item/trash/attack(mob/M, mob/living/user) return diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 8f661b86..fbc73677 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -80,6 +80,17 @@ tastes = list("cheese" = 5, "crisps" = 2) foodtype = JUNKFOOD | DAIRY | SUGAR +/obj/item/reagent_containers/food/snacks/soyfood + name = "Soyfood" + desc = "fine print: seasoned with nanoscale mechanochemical generators. Not only does it taste good, But also self-heats when opened" + icon_state = "soyfood" + trash = /obj/item/trash/soy_food + list_reagents = list("nutriment" = 4, "sugar" = 2, "vitamin" = 3) + junkiness = 0 + filling_color = "#FFD700" + tastes = list("nanomachines" = 2, "soybeans" = 5) + foodtype = DAIRY | GRAIN + /obj/item/reagent_containers/food/snacks/syndicake name = "syndi-cakes" icon_state = "syndi_cakes" diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 19138bad..5478009a 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -10,11 +10,12 @@ /obj/item/reagent_containers/food/snacks/sosjerky = 6, /obj/item/reagent_containers/food/snacks/no_raisin = 6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6, + /obj/item/reagent_containers/food/snacks/soyfood = 6, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6) contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) premium = list(/obj/item/storage/box/donkpockets = 1, /obj/item/reagent_containers/food/snacks/poppypretzel = 3) - + refill_canister = /obj/item/vending_refill/snack var/chef_compartment_access = "28" //ACCESS_KITCHEN diff --git a/icons/mob/inhands/misc/food_lefthand.dmi b/icons/mob/inhands/misc/food_lefthand.dmi index 19e0706d..9203a100 100644 Binary files a/icons/mob/inhands/misc/food_lefthand.dmi and b/icons/mob/inhands/misc/food_lefthand.dmi differ diff --git a/icons/mob/inhands/misc/food_righthand.dmi b/icons/mob/inhands/misc/food_righthand.dmi index da8eda32..6db67d27 100644 Binary files a/icons/mob/inhands/misc/food_righthand.dmi and b/icons/mob/inhands/misc/food_righthand.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 246fae3f..15f1ae0d 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index cd2d37d5..ad1242e8 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ