diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 70649a1e..039e020b 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -72,6 +72,10 @@ name = "soyfood" icon_state = "soy_food" +/obj/item/trash/carbonnanotube_noodles + name = "carbon nanotube noodles" + icon_state = "carbonnanotube_noodles" + /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 fbc73677..2800d6c4 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -100,3 +100,14 @@ filling_color = "#F5F5DC" tastes = list("sweetness" = 3, "cake" = 1) foodtype = GRAIN | FRUIT | VEGETABLES + +/obj/item/reagent_containers/food/snacks/carbonnanotube_noodles + name = "carbon nanotube noodles" + desc = "A self-heating bag of hollowed charcoal noodles with a spicy soy sauce glaze. Does contain small traces of charcoal." + icon_state = "carbonnanotube_noodles" + trash = /obj/item/trash/carbonnanotube_noodles + list_reagents = list("nutriment" = 5, "charcoal" = 1, "vitamin" = 4) + junkiness = 0 + filling_color = "#FFD700" + tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3) + foodtype = GRAIN | VEGETABLES diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 024ed53c..a61aa0b2 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -14,7 +14,8 @@ /obj/item/reagent_containers/food/snacks/soyfood = 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) + /obj/item/reagent_containers/food/snacks/poppypretzel = 3, + /obj/item/reagent_containers/food/snacks/carbonnanotube_noodles = 4) refill_canister = /obj/item/vending_refill/snack var/chef_compartment_access = "28" //ACCESS_KITCHEN diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 15f1ae0d..ed5ec9d8 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 ad1242e8..0d9a3397 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ