diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm index 903c1f12ee6..3f40ce9c109 100644 --- a/code/game/objects/effects/spawners/random/food_or_drink.dm +++ b/code/game/objects/effects/spawners/random/food_or_drink.dm @@ -6,6 +6,7 @@ name = "donk pocket box spawner" icon_state = "donkpocket" loot = list( + /obj/item/storage/box/donkpockets, /obj/item/storage/box/donkpockets/donkpocketspicy, /obj/item/storage/box/donkpockets/donkpocketteriyaki, /obj/item/storage/box/donkpockets/donkpocketpizza, @@ -184,17 +185,20 @@ /obj/item/food/cheesiehonkers = 5, /obj/item/food/candy = 5, /obj/item/food/chips = 5, - /obj/item/food/sosjerky = 5, + /obj/item/food/sosjerky = 5, /obj/item/food/no_raisin = 5, /obj/item/food/peanuts = 5, /obj/item/food/cnds = 5, /obj/item/food/energybar = 5, /obj/item/reagent_containers/food/drinks/dry_ramen = 5, + /obj/item/food/cornchips/random = 5, + /obj/item/food/semki = 5, /obj/item/food/peanuts/random = 3, /obj/item/food/cnds/random = 3, /obj/item/storage/box/gum = 3, /obj/item/food/syndicake = 1, /obj/item/food/peanuts/ban_appeal = 1, + /obj/item/food/pistachios = 1, /obj/item/food/candy/bronx = 1 ) diff --git a/code/game/objects/effects/spawners/random/trash.dm b/code/game/objects/effects/spawners/random/trash.dm index 36ce36f4c6d..4ed87631207 100644 --- a/code/game/objects/effects/spawners/random/trash.dm +++ b/code/game/objects/effects/spawners/random/trash.dm @@ -38,6 +38,9 @@ /obj/item/trash/pistachios = 2, /obj/item/trash/peanuts = 2, /obj/item/trash/boritos = 1, + /obj/item/trash/boritos/green = 1, + /obj/item/trash/boritos/purple = 1, + /obj/item/trash/boritos/red = 1, /obj/item/trash/can/food/beans = 1, /obj/item/trash/popcorn = 1, /obj/item/trash/energybar = 1, diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index 59ed333608b..f538c794381 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -692,22 +692,6 @@ foodtypes = MEAT | DAIRY | GRAIN venue_value = FOOD_PRICE_CHEAP -/obj/item/food/cornchips - name = "boritos corn chips" - desc = "Triangular corn chips. They do seem a bit bland but would probably go well with some kind of dipping sauce." - icon_state = "boritos" - trash_type = /obj/item/trash/boritos - bite_consumption = 2 - food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3) - junkiness = 20 - tastes = list("fried corn" = 1) - foodtypes = JUNKFOOD | FRIED - w_class = WEIGHT_CLASS_SMALL - -/obj/item/food/cornchips/MakeLeaveTrash() - if(trash_type) - AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_POPABLE) - /obj/item/food/rationpack name = "ration pack" diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index c76b00edfb4..b97bbbcbf17 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -347,3 +347,71 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) junkiness = 5 //Homemade or not, sunflower seets are always kinda junky foodtypes = JUNKFOOD | NUTS trash_type = /obj/item/trash/semki/healthy + +/obj/item/food/cornchips + name = "\improper Boritos corn chips" + desc = "Triangular corn chips. They do seem a bit bland but would probably go well with some kind of dipping sauce." + icon_state = "boritos" + trash_type = /obj/item/trash/boritos + bite_consumption = 2 + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3) + junkiness = 20 + custom_price = PAYCHECK_ASSISTANT * 0.8 //we are filled to the brim with flavor + tastes = list("fried corn" = 1) + foodtypes = JUNKFOOD | FRIED + w_class = WEIGHT_CLASS_SMALL + +/obj/item/food/cornchips/MakeLeaveTrash() + AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_POPABLE) + +/obj/item/food/cornchips/blue + name = "\improper Coolest Ranch Boritos corn chips" + desc = "Triangular corn chips. This one is in coolest ranch and would probably go well with some kind of dipping sauce. Which came first, ranch or cool ranch?" + icon_state = "boritos" + trash_type = /obj/item/trash/boritos + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3, /datum/reagent/consumable/yoghurt = 1, /datum/reagent/consumable/garlic = 1) + tastes = list("fried corn" = 1, "coolest ranch" = 1) + +/obj/item/food/cornchips/green + name = "\improper Spess Salsa Boritos corn chips" + desc = "Triangular corn chips. This one is in spess salsa and would probably go well with some kind of dipping sauce." + icon_state = "boritosgreen" + trash_type = /obj/item/trash/boritos/green + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3, /datum/reagent/consumable/astrotame = 1, /datum/reagent/consumable/blackpepper = 1) + tastes = list("fried corn" = 1, "spess salsa" = 1) + +/obj/item/food/cornchips/red + name = "\improper Nacho Cheese Boritos corn chips" + desc = "Triangular corn chips. This one is in nacho cheese and would probably go well with some kind of dipping sauce." + icon_state = "boritosred" + trash_type = /obj/item/trash/boritos/red + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3, /datum/reagent/consumable/astrotame = 1, /datum/reagent/consumable/cornmeal = 1) + tastes = list("fried corn" = 1, "nacho cheese" = 1) + +/obj/item/food/cornchips/purple + name = "\improper Spicy Sweet Chili Boritos corn chips" + desc = "Triangular corn chips. This one is in spicy sweet chili and would probably go well with some kind of dipping sauce." + icon_state = "boritospurple" + trash_type = /obj/item/trash/boritos/purple + food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/salt = 3, /datum/reagent/consumable/capsaicin = 1, /datum/reagent/consumable/sugar = 1) + tastes = list("fried corn" = 1, "spicy & sweet chili" = 1) + +/obj/item/food/cornchips/random + name = "\improper Boritos cornchips" + desc = "Filled with one of four delicious flavours!" + +/obj/item/food/cornchips/random/Initialize(mapload) + var/random_flavour = pick(subtypesof(/obj/item/food/cornchips) - /obj/item/food/cornchips/random) + + var/obj/item/food/sample = new random_flavour(loc) + + name = sample.name + desc = sample.desc + food_reagents = sample.food_reagents + icon_state = sample.icon_state + trash_type = sample.trash_type + tastes = sample.tastes + + qdel(sample) + + . = ..() diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index cd80ebf67b0..37136f1f799 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -45,6 +45,15 @@ icon_state = "boritos" grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag +/obj/item/trash/boritos/green + icon_state = "boritosgreen" + +/obj/item/trash/boritos/red + icon_state = "boritosred" + +/obj/item/trash/boritos/purple + icon_state = "boritospurple" + /obj/item/trash/popcorn name = "popcorn" icon_state = "popcorn" diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 9c33c9f95bd..45635ae75e3 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -13,7 +13,7 @@ /obj/item/food/chips = 6, /obj/item/food/chips/shrimp = 6, /obj/item/food/sosjerky = 6, - /obj/item/food/chips = 6, + /obj/item/food/cornchips/random = 6, /obj/item/food/sosjerky = 6, /obj/item/food/no_raisin = 6, /obj/item/food/peanuts = 6, diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 0f5e37d5cac..cf79db09640 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 e88862cb615..35af3a7f5e1 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ