cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Boritos: Now with different flavors and available at vendors + Ready Donkmeal Trash Sprite uplift (#64238)

Browse Source 
Boritos finally decided to start supplying the station with their cornchips. This PR comes with 4 flavors of boritos that can be bought from vendors as well as a slight uplift for the sprite of Ready Donkmeal's trash variant, making it actually look like trash rather then a pristine box.

Also hey if you walk on boritos packages they pop! Thats cool right?
This commit is contained in:
ErdinyoBarboza
2022-01-25 15:41:17 +00:00
committed by GitHub
parent fb5e1c7f79
commit 1533cdbe6f
8 changed files with 86 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/effects/spawners/random/food_or_drink.dm
+5 -1
View File
@@ -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
)
code/game/objects/effects/spawners/random/trash.dm
+3
View File
@@ -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,
code/game/objects/items/food/misc.dm
-16
View File
@@ -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"
code/game/objects/items/food/snacks.dm
+68
View File
@@ -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)
. = ..()
code/game/objects/items/trash.dm
+9
View File
@@ -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"