Skip to content

Commit

Permalink
moves changes from original branch - modifies bait, condiments, bread…
Browse files Browse the repository at this point in the history
…, burgers, and cake
  • Loading branch information
thestripes committed Jun 25, 2024
1 parent 49dab68 commit f425eb2
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 127 deletions.
2 changes: 1 addition & 1 deletion code/modules/food_and_drinks/food/bait.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

/obj/item/reagent_containers/food/snacks/bait/worm
name = "worm"
desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it are you ?"
desc = "It's a wriggling worm from a can of fishing bait. You're not going to eat it... are you?"
icon = 'icons/obj/fishing.dmi'
icon_state = "worm"
list_reagents = list(/datum/reagent/consumable/nutriment = 1)
Expand Down
46 changes: 23 additions & 23 deletions code/modules/food_and_drinks/food/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,14 @@

/obj/item/reagent_containers/food/condiment/sugar
name = "sugar sack"
desc = "Tasty spacey sugar!"
desc = "A bag of sugar. Used for sweetening, typically."
icon_state = "sugar"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/sugar = 50)

/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then
name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
desc = "A shaker full of salt. Make sure the cap is on tight!"
icon_state = "saltshakersmall"
icon_empty = "emptyshaker"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
Expand All @@ -160,7 +160,7 @@

/obj/item/reagent_containers/food/condiment/peppermill
name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
desc = "A handheld mill to grind down peppercorn. Often used to flavor food... or make people sneeze."
icon_state = "peppermillsmall"
icon_empty = "emptyshaker"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
Expand All @@ -170,7 +170,7 @@

/obj/item/reagent_containers/food/condiment/milk
name = "space milk"
desc = "It's milk. White and nutritious goodness!"
desc = "A carton full of milk. Freshly supplied from a mammal, a biogenerator, or chemically reproduced in a lab."
icon_state = "milk"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
Expand All @@ -186,7 +186,7 @@

/obj/item/reagent_containers/food/condiment/soymilk
name = "soy milk"
desc = "It's soy milk. White and nutritious goodness!"
desc = "A carton full of soy milk. Freshly supplied from the soybean."
icon_state = "soymilk"
item_state = "carton"
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
Expand All @@ -195,20 +195,20 @@

/obj/item/reagent_containers/food/condiment/rice
name = "rice sack"
desc = "A big bag of rice. Good for cooking!"
desc = "A bag of dry, bleached rice. Better when properly cooked."
icon_state = "rice"
item_state = "flour"
list_reagents = list(/datum/reagent/consumable/rice = 30)

/obj/item/reagent_containers/food/condiment/soysauce
name = "soy sauce"
desc = "A salty soy-based flavoring."
desc = "A glass bottle of soy sauce. Known for being salty and savory."
icon_state = "soysauce"
list_reagents = list(/datum/reagent/consumable/soysauce = 50)

/obj/item/reagent_containers/food/condiment/mayonnaise
name = "mayonnaise"
desc = "An oily condiment made from egg yolks."
desc = "An oily condiment made from egg yolk."
icon_state = "mayonnaise"
list_reagents = list(/datum/reagent/consumable/mayonnaise = 50)

Expand All @@ -222,16 +222,16 @@
amount_per_transfer_from_this = 10
possible_transfer_amounts = list()
possible_states = list(
/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."),
/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"),
/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"),
/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"),
/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"),
/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"),
/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "A packet of ketchup. The old standby, given by the fistful."),
/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "A packet of hotsauce. Good for spicing up food."),
/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A packet of soy sauce. Good on rice."),
/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "A packet of coldsauce. Good for... cooling down food?"),
/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "A shaker full of salt. Make sure the cap is on tight!"),
/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "A handheld mill to grind down peppercorn. Often used to flavor food... or make people sneeze."),
/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A (presumably) corn-sourced oil. Good for cooking."),
/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "A packet of sugar. Used for sweetening, typically."),
/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "An artificial sweetener. Just be careful to not give yourself a headache with too much!"),
/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "A sweet and savory packet of barbeque sauce. It's sticky!"),
)

/obj/item/reagent_containers/food/condiment/pack/update_icon()
Expand Down Expand Up @@ -295,30 +295,30 @@

/obj/item/reagent_containers/food/condiment/ketchup
name = "ketchup bottle"
desc = "You feel more american already"
desc = "The old standby condiment."
icon_state = "ketchup"
list_reagents = list(/datum/reagent/consumable/ketchup = 50)

/obj/item/reagent_containers/food/condiment/bbqsauce
name = "bbq sauce bottle"
desc = "Hand wipes not included"
desc = "A sweet and savory barbeque sauce. It's sticky!"
icon_state = "bbqsauce"
list_reagents = list(/datum/reagent/consumable/bbqsauce = 50)

/obj/item/reagent_containers/food/condiment/hotsauce
name = "hot sauce bottle"
desc = "You can almost TASTE the stomach ulcers now!"
desc = "Good for spicing up food!"
icon_state = "hotsauce"
list_reagents = list(/datum/reagent/consumable/capsaicin = 50)

/obj/item/reagent_containers/food/condiment/coldsauce
name = "cold sauce bottle"
desc = "Leaves the tounge numb in it's passage"
desc = "Good for... cooling down food?"
icon_state = "coldsauce"
list_reagents = list(/datum/reagent/consumable/frostoil = 50)

/obj/item/reagent_containers/food/condiment/oliveoil
name = "olive oil bottle"
desc = "A delicious oil used in cooking"
desc = "Oil made from pressed olives. Great for cooking."
icon_state = "oliveoil"
list_reagents = list(/datum/reagent/consumable/cornoil = 50)
34 changes: 17 additions & 17 deletions code/modules/food_and_drinks/food/snacks_bread.dm
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

/obj/item/reagent_containers/food/snacks/breadslice/moldy
name = "moldy bread slice"
desc = "Entire stations have been ripped apart over arguing whether this is still good to eat."
desc = "Mold colonies have taken root on this humble piece of bread. Its a gamble to try and shave off the mold to make edible again..."
icon_state = "moldybreadslice"
customfoodfilling = 0
bonus_reagents = list(/datum/reagent/consumable/mold = 10)
Expand All @@ -53,7 +53,7 @@

/obj/item/reagent_containers/food/snacks/store/bread/meat
name = "meatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman."
desc = "The culinary oddity, originating from an obscure spacer tradition. "
icon_state = "meatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/meat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
Expand All @@ -69,7 +69,7 @@

/obj/item/reagent_containers/food/snacks/store/bread/xenomeat
name = "xenomeatbread loaf"
desc = "The culinary base of every self-respecting eloquen/tg/entleman. Extra Heretical."
desc = "The culinary oddity, originating from an obscure spacer tradition. The meat in the roll is green and acrid..."
icon_state = "xenomeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/xenomeat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
Expand All @@ -79,15 +79,15 @@

/obj/item/reagent_containers/food/snacks/breadslice/xenomeat
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
desc = "A slice of meatbread. Now sliced, the prepared meat oozes slightly..."
icon_state = "xenobreadslice"
filling_color = "#32CD32"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT

/obj/item/reagent_containers/food/snacks/store/bread/spidermeat
name = "spider meat loaf"
desc = "Reassuringly green meatloaf made from spider meat."
desc = "A meatloaf made from giant arachnid. Sometimes prepared when culling the invasive species, the texture is questionable, and the health detriments are undeniable."
icon_state = "spidermeatbread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/spidermeat
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
Expand All @@ -97,15 +97,15 @@

/obj/item/reagent_containers/food/snacks/breadslice/spidermeat
name = "spider meat bread slice"
desc = "A slice of meatloaf made from an animal that most likely still wants you dead."
desc = "A slice of meatloaf made from giant arachnid. The green meat threatens to fall apart from its already gelatinous state when cut."
icon_state = "spiderbreadslice"
filling_color = "#7CFC00"
list_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/toxin = 3, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | MEAT | TOXIC

/obj/item/reagent_containers/food/snacks/store/bread/banana
name = "banana-nut bread"
desc = "A heavenly and filling treat."
desc = "Banana bread - a terran classic. The beloved savior of overripe bananas."
icon_state = "bananabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/banana
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/banana = 20)
Expand All @@ -124,7 +124,7 @@

/obj/item/reagent_containers/food/snacks/store/bread/tofu
name = "Tofubread"
desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
desc = "A tofu-based variant of the spacer delicacy that is meatbread."
icon_state = "tofubread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/tofu
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 10)
Expand All @@ -134,15 +134,15 @@

/obj/item/reagent_containers/food/snacks/breadslice/tofu
name = "tofubread slice"
desc = "A slice of delicious tofubread."
desc = "A slice of tofubread."
icon_state = "tofubreadslice"
filling_color = "#FF8C00"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | VEGETABLES

/obj/item/reagent_containers/food/snacks/store/bread/creamcheese
name = "cream cheese bread"
desc = "Yum yum yum!"
desc = "A cream cheese-filled loaf. Pleasantly filling."
icon_state = "creamcheesebread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/creamcheese
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
Expand All @@ -152,15 +152,15 @@

/obj/item/reagent_containers/food/snacks/breadslice/creamcheese
name = "cream cheese bread slice"
desc = "A slice of yum!"
desc = "A slice of cream cheese bread."
icon_state = "creamcheesebreadslice"
filling_color = "#FF8C00"
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/vitamin = 1)
foodtype = GRAIN | DAIRY

/obj/item/reagent_containers/food/snacks/store/bread/mimana
name = "mimana bread"
desc = "Best eaten in silence."
desc = "Banana bread, made with a mutant line of bananas. The flavor isn't muted, but you might be."
icon_state = "mimanabread"
slice_path = /obj/item/reagent_containers/food/snacks/breadslice/mimana
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 5)
Expand All @@ -170,7 +170,7 @@

/obj/item/reagent_containers/food/snacks/breadslice/mimana
name = "mimana bread slice"
desc = "A slice of silence!"
desc = "A slice of mutant-banana bread. The grey of the mimana is a little off-putting when viewed like this..."
icon_state = "mimanabreadslice"
filling_color = "#C0C0C0"
list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/toxin/mutetoxin = 1, /datum/reagent/consumable/nothing = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
Expand All @@ -184,7 +184,7 @@

/obj/item/reagent_containers/food/snacks/baguette
name = "baguette"
desc = "Bon appetit!"
desc = "A long, thin loaf of crusty bread. A preserved terran classic. You can't help but wield it like a stick when you hold it."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "baguette"
item_state = "baguette"
Expand All @@ -199,7 +199,7 @@

/obj/item/reagent_containers/food/snacks/garlicbread
name = "garlic bread"
desc = "Alas, it is limited."
desc = "Garlic and butter-topped bread. Widely enjoyed by every species that can eat grains."
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "garlicbread"
item_state = "garlicbread"
Expand Down Expand Up @@ -276,7 +276,7 @@

/obj/item/reagent_containers/food/snacks/butterbiscuit
name = "butter biscuit"
desc = "Well butter my biscuit!"
desc = "A type of \"quick bread\", topped with butter. Not to be confused with the pastry also referred to as a biscuit."
icon = 'icons/obj/food/food.dmi'
icon_state = "butterbiscuit"
filling_color = "#F0E68C"
Expand All @@ -287,7 +287,7 @@

/obj/item/reagent_containers/food/snacks/butterdog
name = "butterdog"
desc = "Made from exotic butters."
desc = "A shaped stick of butter, placed in a long bun. Is this... going to be pleasant?"
icon = 'icons/obj/food/food.dmi'
icon_state = "butterdog"
bitesize = 1
Expand Down
Loading

0 comments on commit f425eb2

Please sign in to comment.