diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 89354a01..f21b2601 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -81,5 +81,9 @@ name = "carbon nanotube noodles" icon_state = "carbonnanotube_noodles" +/obj/item/trash/bird_seed + name = "Sunflower Seeds" + icon_state = "seedtrash" + /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 f4249432..e96e92d8 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -119,4 +119,15 @@ filling_color = "#FFD700" tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3) foodtype = GRAIN | VEGETABLES + price = 3 + +/obj/item/reagent_containers/food/snacks/bird_seed + name = "Sunflower Seeds" + desc = "An plastic bag that has a red cardinal as it's mascot on the front with ingredients of olive oil and starlight grown Sunflowers with a hint of a secret spice. " + icon_state = "avianseed" + trash = /obj/item/trash/bird_seed + list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 4) + filling_color = "#b497162f" + tastes = list("olives" = 1, "Nuts" = 3, "spice" = 2) + foodtype = GRAIN | VEGETABLES price = 3 \ No newline at end of file diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index d91eac5b..bdd12bb1 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -5,17 +5,18 @@ product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" icon_state = "snack" products = list(/obj/item/reagent_containers/food/snacks/candy = 6, - /obj/item/reagent_containers/food/drinks/dry_ramen = 6, - /obj/item/reagent_containers/food/snacks/chips = 6, - /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/drinks/dry_ramen = 6, + /obj/item/reagent_containers/food/snacks/chips = 6, + /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/cheesiehonkers = 6, - /obj/item/reagent_containers/food/snacks/soyfood = 6) + /obj/item/reagent_containers/food/snacks/bird_seed =6, + /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/carbonnanotube_noodles = 4) + /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 094753db..37d1c238 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 c84a4bb6..8b80a6fb 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ