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

[MIRROR] Gives the Chef a Beacon to pick their ingredient box (#670)

Browse Source 
* Gives the Chef a Beacon to pick their ingredient box (#53146)

* adds ingredients beacon

* starts the chef off with an ingredient beacon instead of a box

* Update boxes.dm

* Revert "Update boxes.dm"

This reverts commit b89fadab04.

* optimizes the list thingy (thank you, Floyd)

* Fixes a typo in one of the comments

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* fixes a definition

* moves ingredient box/beacon code to miscellaneous instead of boxes

* adds the random option

* adds a cute little bit of 'flavor' text... get it?

* Revert "adds a cute little bit of 'flavor' text... get it?"

This reverts commit a6541bf220.

* adds references to a new company and a bit of fun text

* moves randomFood out of the for loop

* Revert "moves randomFood out of the for loop"

This reverts commit e2c5171fce.

Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>

* Gives the Chef a Beacon to pick their ingredient box

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: ATH1909 <42606352+ATH1909@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-09-06 06:05:26 +02:00
committed by GitHub
co-authored by ATH1909 LemonInTheDark
parent 25623081fb
commit 649528bf6b
3 changed files with 176 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/boxes.dm
-140
View File
@@ -962,146 +962,6 @@
for(var/i in 1 to 7)
new /obj/item/reagent_containers/food/snacks/meat/slab(src)
/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
illustration = "fruit"
var/theme_name
/obj/item/storage/box/ingredients/Initialize()
. = ..()
if(theme_name)
name = "[name] ([theme_name])"
desc = "A box containing supplementary ingredients for the aspiring chef. The box's theme is '[theme_name]'."
inhand_icon_state = "syringe_kit"
/obj/item/storage/box/ingredients/wildcard
theme_name = "wildcard"
/obj/item/storage/box/ingredients/wildcard/PopulateContents()
for(var/i in 1 to 7)
var/randomFood = pick(/obj/item/reagent_containers/food/snacks/grown/chili,
/obj/item/reagent_containers/food/snacks/grown/tomato,
/obj/item/reagent_containers/food/snacks/grown/carrot,
/obj/item/reagent_containers/food/snacks/grown/potato,
/obj/item/reagent_containers/food/snacks/grown/potato/sweet,
/obj/item/reagent_containers/food/snacks/grown/apple,
/obj/item/reagent_containers/food/snacks/chocolatebar,
/obj/item/reagent_containers/food/snacks/grown/cherries,
/obj/item/reagent_containers/food/snacks/grown/banana,
/obj/item/reagent_containers/food/snacks/grown/cabbage,
/obj/item/reagent_containers/food/snacks/grown/soybeans,
/obj/item/reagent_containers/food/snacks/grown/corn,
/obj/item/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
/obj/item/reagent_containers/food/snacks/grown/mushroom/chanterelle)
new randomFood(src)
/obj/item/storage/box/ingredients/fiesta
theme_name = "fiesta"
/obj/item/storage/box/ingredients/fiesta/PopulateContents()
new /obj/item/reagent_containers/food/snacks/tortilla(src)
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/corn(src)
new /obj/item/reagent_containers/food/snacks/grown/soybeans(src)
new /obj/item/reagent_containers/food/snacks/grown/chili(src)
/obj/item/storage/box/ingredients/italian
theme_name = "italian"
/obj/item/storage/box/ingredients/italian/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
new /obj/item/reagent_containers/food/snacks/meatball(src)
new /obj/item/reagent_containers/food/drinks/bottle/wine(src)
/obj/item/storage/box/ingredients/vegetarian
theme_name = "vegetarian"
/obj/item/storage/box/ingredients/vegetarian/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/carrot(src)
new /obj/item/reagent_containers/food/snacks/grown/eggplant(src)
new /obj/item/reagent_containers/food/snacks/grown/potato(src)
new /obj/item/reagent_containers/food/snacks/grown/apple(src)
new /obj/item/reagent_containers/food/snacks/grown/corn(src)
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
/obj/item/storage/box/ingredients/american
theme_name = "american"
/obj/item/storage/box/ingredients/american/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/potato(src)
new /obj/item/reagent_containers/food/snacks/grown/tomato(src)
new /obj/item/reagent_containers/food/snacks/grown/corn(src)
new /obj/item/reagent_containers/food/snacks/meatball(src)
/obj/item/storage/box/ingredients/fruity
theme_name = "fruity"
/obj/item/storage/box/ingredients/fruity/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/apple(src)
new /obj/item/reagent_containers/food/snacks/grown/citrus/orange(src)
new /obj/item/reagent_containers/food/snacks/grown/citrus/lemon(src)
new /obj/item/reagent_containers/food/snacks/grown/citrus/lime(src)
new /obj/item/reagent_containers/food/snacks/grown/watermelon(src)
/obj/item/storage/box/ingredients/sweets
theme_name = "sweets"
/obj/item/storage/box/ingredients/sweets/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/cherries(src)
new /obj/item/reagent_containers/food/snacks/grown/banana(src)
new /obj/item/reagent_containers/food/snacks/chocolatebar(src)
new /obj/item/reagent_containers/food/snacks/grown/cocoapod(src)
new /obj/item/reagent_containers/food/snacks/grown/apple(src)
/obj/item/storage/box/ingredients/delights
theme_name = "delights"
/obj/item/storage/box/ingredients/delights/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/grown/potato/sweet(src)
new /obj/item/reagent_containers/food/snacks/grown/bluecherries(src)
new /obj/item/reagent_containers/food/snacks/grown/vanillapod(src)
new /obj/item/reagent_containers/food/snacks/grown/cocoapod(src)
new /obj/item/reagent_containers/food/snacks/grown/berries(src)
/obj/item/storage/box/ingredients/grains
theme_name = "grains"
/obj/item/storage/box/ingredients/grains/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/grown/oat(src)
new /obj/item/reagent_containers/food/snacks/grown/wheat(src)
new /obj/item/reagent_containers/food/snacks/grown/cocoapod(src)
new /obj/item/reagent_containers/honeycomb(src)
new /obj/item/seeds/poppy(src)
/obj/item/storage/box/ingredients/carnivore
theme_name = "carnivore"
/obj/item/storage/box/ingredients/carnivore/PopulateContents()
new /obj/item/reagent_containers/food/snacks/meat/slab/bear(src)
new /obj/item/reagent_containers/food/snacks/meat/slab/spider(src)
new /obj/item/reagent_containers/food/snacks/spidereggs(src)
new /obj/item/reagent_containers/food/snacks/carpmeat(src)
new /obj/item/reagent_containers/food/snacks/meat/slab/xeno(src)
new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(src)
new /obj/item/reagent_containers/food/snacks/meatball(src)
/obj/item/storage/box/ingredients/exotic
theme_name = "exotic"
/obj/item/storage/box/ingredients/exotic/PopulateContents()
for(var/i in 1 to 2)
new /obj/item/reagent_containers/food/snacks/carpmeat(src)
new /obj/item/reagent_containers/food/snacks/grown/soybeans(src)
new /obj/item/reagent_containers/food/snacks/grown/cabbage(src)
new /obj/item/reagent_containers/food/snacks/grown/chili(src)
/obj/item/storage/box/emptysandbags
name = "box of empty sandbags"
illustration = "sandbag"