diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm
index 6db5dab83d..4c05797df8 100644
--- a/code/game/machinery/vending_machines_vr.dm
+++ b/code/game/machinery/vending_machines_vr.dm
@@ -2406,7 +2406,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 10,
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10,
- /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesetoast = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10,
@@ -2558,7 +2558,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatcube = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10,
- /obj/item/weapon/reagent_containers/food/snacks/microchips = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/microfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/milosoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/mint = 10,
@@ -2577,8 +2577,9 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionrings = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10,
- /obj/item/weapon/reagent_containers/food/snacks/ovenchips = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/ovenfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/pie = 10,
/obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10,
@@ -2800,9 +2801,9 @@
/obj/item/weapon/reagent_containers/food/snacks/spagetti = 10,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10)
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15
/obj/machinery/vending/event/food/safe //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP//
@@ -2889,7 +2890,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cb09 = 10,
/obj/item/weapon/reagent_containers/food/snacks/cb10 = 10,
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi = 10,
- /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesetoast = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito = 10,
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos = 10,
@@ -3041,7 +3042,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatcube = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/meatsteak = 10,
- /obj/item/weapon/reagent_containers/food/snacks/microchips = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/microfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/milosoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/mimeburger = 10,
/obj/item/weapon/reagent_containers/food/snacks/mint = 10,
@@ -3060,8 +3061,9 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionrings = 10,
/obj/item/weapon/reagent_containers/food/snacks/onionsoup = 10,
- /obj/item/weapon/reagent_containers/food/snacks/ovenchips = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/ovenfries = 10,
/obj/item/weapon/reagent_containers/food/snacks/pancakes = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry = 10,
/obj/item/weapon/reagent_containers/food/snacks/pastatomato = 10,
/obj/item/weapon/reagent_containers/food/snacks/pie = 10,
/obj/item/weapon/reagent_containers/food/snacks/piginblanket = 10,
@@ -3194,9 +3196,9 @@
/obj/item/weapon/reagent_containers/food/snacks/wishsoup = 10,
/obj/item/weapon/reagent_containers/food/snacks/yellowcurry = 10,
/obj/item/weapon/reagent_containers/food/snacks/zestfish = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 10,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 10)
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 10,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 10)
vend_delay = 15
/obj/machinery/vending/event/food/ingredients //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP//
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index 1a109bab91..356edb5341 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -56,6 +56,10 @@
name = "bbq chips bag"
icon_state = "chips_bbq"
+/obj/item/trash/chips/snv
+ name = "salt & vinegar chips bag"
+ icon_state = "chips_snv"
+
/obj/item/trash/cookiesnack
name = "\improper Carps Ahoy! miniature cookies packet"
icon_state = "cookiesnack"
@@ -89,10 +93,26 @@
/obj/item/trash/plate
name = "plate"
icon_state = "plate"
+ drop_sound = 'sound/items/drop/food.ogg'
+ pickup_sound = 'sound/items/pickup/food.ogg'
+
+/obj/item/trash/asian_bowl
+ name = "asian bowl"
+ icon_state = "asian_bowl"
+ drop_sound = 'sound/items/drop/food.ogg'
+ pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/snack_bowl
name = "snack bowl"
icon_state = "snack_bowl"
+ drop_sound = 'sound/items/drop/food.ogg'
+ pickup_sound = 'sound/items/pickup/food.ogg'
+
+/obj/item/trash/small_bowl
+ name = "small bowl"
+ icon_state = "small_bowl"
+ drop_sound = 'sound/items/drop/food.ogg'
+ pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/pistachios
name = "pistachios packet"
@@ -182,7 +202,7 @@
pickup_sound = 'sound/items/pickup/food.ogg'
/obj/item/trash/chipbasket
- name = "empty basket"
+ name = "empty chip basket"
icon_state = "chipbasket_empty"
drop_sound = 'sound/items/drop/food.ogg'
pickup_sound = 'sound/items/pickup/food.ogg'
@@ -246,6 +266,12 @@
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
+/obj/item/trash/ntbeans
+ name = "empty baked bean can"
+ icon_state = "ntbeans"
+ drop_sound = 'sound/items/drop/soda.ogg'
+ pickup_sound = 'sound/items/pickup/soda.ogg'
+
/obj/item/trash/salo
name = "salo pack"
icon_state = "pigfat"
@@ -317,9 +343,9 @@
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
-/obj/item/trash/spacer_cake_wrap
+/obj/item/trash/spacercake_wrap
name = "snack cake wrapper"
- icon_state = "spacer_cake_wrap"
+ icon_state = "spacercake_wrap"
/obj/item/trash/sun_snax
name = "sun snax bag"
@@ -371,15 +397,15 @@
name = "\improper CRS ration bag"
icon_state = "tgmc_mre_trash"
-/obj/item/trash/vendor_burger
- name = "burger wrapper"
- icon_state = "packburger_wrapper"
-
-/obj/item/trash/vendor_hotdog
- name = "hotdog wrapper"
- icon_state = "packhotdog_wrapper"
-
-/obj/item/trash/vendor_burrito
- name = "burrito wrapper"
- icon_state = "packburrito_wrapper"
-
+/obj/item/trash/smolburger
+ name = "burger packaging"
+ icon_state = "smolburger"
+
+/obj/item/trash/smolhotdog
+ name = "hotdog packaging"
+ icon_state = "smolhotdog"
+
+/obj/item/trash/smolburrito
+ name = "burrito packaging"
+ icon_state = "smolburrito"
+
diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index 6b562f411c..de37a3d3d9 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -154,13 +154,14 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips = 12,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 12,
+ /obj/item/weapon/reagent_containers/food/snacks/chips/snv = 12,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 12,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 12,
/obj/item/weapon/reagent_containers/food/snacks/semki = 12,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 12,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 12,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 12,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 12,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 12,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 12,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 12,
@@ -187,13 +188,14 @@
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 1,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/chips/snv = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 1,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 1,
/obj/item/weapon/reagent_containers/food/snacks/semki = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 7,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 7,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 7,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 7,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 7,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 7,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 2,
@@ -1029,13 +1031,14 @@
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 8,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 8,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 8,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 8,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips = 8,
+ /obj/item/weapon/reagent_containers/food/snacks/chips/snv = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8
)
@@ -1050,13 +1053,14 @@
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 5,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burger = 5,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog = 5,
- /obj/item/weapon/reagent_containers/food/snacks/vendor_burrito = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger = 7,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog = 7,
+ /obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito = 7,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/chips/snv = 5,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 5,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5
)
diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm
index e005d71330..abf4f89b37 100644
--- a/code/modules/food/food/condiment.dm
+++ b/code/modules/food/food/condiment.dm
@@ -61,6 +61,11 @@
desc = "You feel more American already."
icon_state = "ketchup"
center_of_mass = list("x"=16, "y"=6)
+ if("mustard")
+ name = "Mustard"
+ desc = "A somewhat bitter topping."
+ icon_state = "mustard"
+ center_of_mass = list("x"=16, "y"=6)
if("capsaicin")
name = "Hotsauce"
desc = "You can almost TASTE the stomach ulcers now!"
@@ -76,6 +81,11 @@
desc = "A salty soy-based flavoring."
icon_state = "soysauce"
center_of_mass = list("x"=16, "y"=6)
+ if("vinegar")
+ name = "Vinegar"
+ desc = "An acetic acid used in various dishes."
+ icon_state = "vinegar"
+ center_of_mass = list("x"=16, "y"=6)
if("frostoil")
name = "Coldsauce"
desc = "Leaves the tongue numb in its passage."
@@ -118,7 +128,6 @@
if("spacespice")
name = "bottle of space spice"
desc = "An exotic blend of spices for cooking. Definitely not worms."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "spacespicebottle"
center_of_mass = list("x"=16, "y"=6)
if("barbecue")
@@ -158,6 +167,10 @@
. = ..()
reagents.add_reagent("ketchup", 50)
+/obj/item/weapon/reagent_containers/food/condiment/mustard/Initialize()
+ . = ..()
+ reagents.add_reagent("mustard", 50)
+
/obj/item/weapon/reagent_containers/food/condiment/hotsauce/Initialize()
. = ..()
reagents.add_reagent("capsaicin", 50)
@@ -177,6 +190,10 @@
. = ..()
reagents.add_reagent("soysauce", 50)
+/obj/item/weapon/reagent_containers/food/condiment/vinegar/Initialize()
+ . = ..()
+ reagents.add_reagent("vinegar", 50)
+
/obj/item/weapon/reagent_containers/food/condiment/yeast
name = "Yeast"
@@ -203,16 +220,26 @@
. = ..()
reagents.add_reagent("sodiumchloride", 20)
-/obj/item/weapon/reagent_containers/food/condiment/small/peppermill
- name = "pepper mill"
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill //Keeping name here to save map based headaches
+ name = "pepper shaker"
desc = "Often used to flavor food or make people sneeze."
- icon_state = "peppermillsmall"
+ icon_state = "peppershakersmall"
center_of_mass = list("x"=17, "y"=11)
/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 20)
+/obj/item/weapon/reagent_containers/food/condiment/small/peppergrinder
+ name = "pepper mill"
+ desc = "Fancy way to season a dish or make people sneeze."
+ icon_state = "peppermill"
+ center_of_mass = list("x"=17, "y"=11)
+
+/obj/item/weapon/reagent_containers/food/condiment/small/peppermill/Initialize()
+ . = ..()
+ reagents.add_reagent("blackpepper", 30)
+
/obj/item/weapon/reagent_containers/food/condiment/small/sugar
name = "sugar"
desc = "Sweetness in a bottle"
@@ -429,11 +456,10 @@
. = ..()
reagents.add_reagent("flour", 200)
randpixel_xy()
-
+
/obj/item/weapon/reagent_containers/food/condiment/spacespice
name = "space spices"
desc = "An exotic blend of spices for cooking. Definitely not worms."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "spacespicebottle"
possible_transfer_amounts = list(1,40) //for clown turning the lid off
amount_per_transfer_from_this = 1
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index 4b78169387..3bf0cad418 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -7,7 +7,7 @@
center_of_mass = list("x"=16, "y"=16)
w_class = ITEMSIZE_SMALL
force = 0
-
+
var/bitesize = 1
var/bitecount = 0
var/trash = null
@@ -21,12 +21,12 @@
var/datum/reagent/nutriment/coating/coating = null
var/icon/flat_icon = null //Used to cache a flat icon generated from dipping in batter. This is used again to make the cooked-batter-overlay
var/do_coating_prefix = 1 //If 0, we wont do "battered thing" or similar prefixes. Mainly for recipes that include batter but have a special name
-
+
/// Used for foods that are "cooked" without being made into a specific recipe or combination.
/// Generally applied during modification cooking with oven/fryer
/// Used to stop deepfried meat from looking like slightly tanned raw meat, and make it actually look cooked
var/cooked_icon = null
-
+
/// If this has a wrapper on it. If true, it will print a message and ask you to remove it
var/package = FALSE
/// Packaged meals drop this trash type item when opened, if set
@@ -51,7 +51,7 @@
holder.held_mob.forceMove(M.vore_selected)
holder.held_mob = null
qdel(holder)
-
+
usr.drop_from_inventory(src) // Drop food from inventory so it doesn't end up staying on the hud after qdel, and so inhands go away
if(trash)
@@ -250,7 +250,7 @@
/obj/item/weapon/reagent_containers/food/snacks/proc/unpackage(mob/user)
package = FALSE
to_chat(user, "You unwrap [src].")
- playsound(user,'sound/effects/pageturn2.ogg', 15, 1)
+ playsound(user,'sound/effects/packagedfoodopen.ogg', 15, 1)
if(package_trash)
var/obj/item/T = new package_trash
user.put_in_hands(T)
@@ -851,6 +851,30 @@
reagents.add_reagent("protein", 3)
reagents.add_reagent(toxin_type, toxin_amount)
+/obj/item/weapon/reagent_containers/food/snacks/crabmeat
+ name = "crab legs"
+ desc = "... Coffee? Is that you?"
+ icon_state = "crabmeat"
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
+ . = ..()
+ reagents.add_reagent("seafood", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/crab_legs
+ name = "steamed crab legs"
+ desc = "Crab legs steamed and buttered to perfection. One day when the boss gets hungry..."
+ icon_state = "crablegs"
+ nutriment_amt = 2
+ nutriment_desc = list("savory butter" = 2)
+ bitesize = 2
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/crab_legs/Initialize()
+ . = ..()
+ reagents.add_reagent("seafood", 6)
+ reagents.add_reagent("sodiumchloride", 1)
+
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif
desc = "A fillet of sivian fish meat."
filling_color = "#2c2cff"
@@ -1351,7 +1375,7 @@
name = "Wing Fang Chu"
desc = "A savory dish of alien wing wang in soy."
icon_state = "wingfangchu"
- trash = /obj/item/trash/snack_bowl
+ trash = /obj/item/trash/small_bowl
filling_color = "#43DE18"
center_of_mass = list("x"=17, "y"=9)
bitesize = 2
@@ -1416,6 +1440,7 @@
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "Popcorn"
desc = "Now let's find some cinema."
+ icon = 'icons/obj/food_snacks.dmi'
icon_state = "popcorn"
trash = /obj/item/trash/popcorn
var/unpopped = 0
@@ -1436,20 +1461,6 @@
unpopped = max(0, unpopped-1)
. = ..()
-/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
- name = "Loaded Baked Potato"
- desc = "Totally baked."
- icon_state = "loadedbakedpotato"
- filling_color = "#9C7A68"
- center_of_mass = list("x"=16, "y"=10)
- nutriment_amt = 3
- nutriment_desc = list("baked potato" = 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
-
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "Space Fries"
desc = "AKA: French Fries, Freedom Fries, etc."
@@ -1461,35 +1472,94 @@
nutriment_desc = list("fresh fries" = 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/bangersandmash
- name = "Bangers and Mash"
- desc = "An English treat."
- icon_state = "bangersandmash"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- center_of_mass = list("x"=16, "y"=11)
+/obj/item/weapon/reagent_containers/food/snacks/fries
nutriment_amt = 4
- nutriment_desc = list("fluffy potato" = 3, "sausage" = 2)
- bitesize = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/bangersandmash/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesymash
- name = "Cheesy Mashed Potato"
- desc = "The only thing that could make mash better."
- icon_state = "cheesymash"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- center_of_mass = list("x"=16, "y"=11)
- nutriment_amt = 4
- nutriment_desc = list("cheesy potato" = 4)
+ nutriment_desc = list("fries" = 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/cheesymash/Initialize()
+/obj/item/weapon/reagent_containers/food/snacks/fries/Initialize()
. = ..()
- reagents.add_reagent("protein", 3)
+ reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning
+
+/obj/item/weapon/reagent_containers/food/snacks/onionrings
+ name = "onion rings"
+ desc = "Like circular fries but better."
+ icon_state = "onionrings"
+ trash = /obj/item/trash/plate
+ filling_color = "#eddd00"
+ center_of_mass = list("x"=16,"y"=11)
+ nutriment_desc = list("fried onions" = 5)
+ nutriment_amt = 5
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/microfries
+ name = "micro fries"
+ desc = "Soft and rubbery, should have fried them. Good for smaller crewmembers, maybe?"
+ icon_state = "microfries"
+ trash = /obj/item/trash/plate
+ filling_color = "#EDDD00"
+ nutriment_amt = 4
+ nutriment_desc = list("soggy fries" = 4)
+ center_of_mass = list("x"=16, "y"=11)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/ovenfries
+ name = "oven fries"
+ desc = "Dark and crispy, but a bit dry."
+ icon_state = "ovenfries"
+ filling_color = "#EDDD00"
+ nutriment_amt = 4
+ nutriment_desc = list("crisp, dry fries" = 4)
+ center_of_mass = list("x"=16, "y"=11)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries
+ name = "Carrot Fries"
+ desc = "Tasty fries from fresh Carrots."
+ icon_state = "carrotfries"
+ trash = /obj/item/trash/plate
+ filling_color = "#FAA005"
+ center_of_mass = list("x"=16, "y"=11)
+ nutriment_amt = 3
+ nutriment_desc = list("carrot" = 3, "salt" = 1)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries/Initialize()
+ . = ..()
+ reagents.add_reagent("imidazoline", 3)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
+ name = "Cheesy Fries"
+ desc = "Fries. Covered in cheese. Duh."
+ icon_state = "cheesyfries"
+ trash = /obj/item/trash/plate
+ filling_color = "#EDDD00"
+ center_of_mass = list("x"=16, "y"=11)
+ nutriment_amt = 4
+ nutriment_desc = list("fresh fries" = 3, "cheese" = 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/chilicheesefries
+ name = "chili cheese fries"
+ gender = PLURAL
+ desc = "A mighty plate of fries, drowned in hot chili and cheese sauce. Because your arteries are overrated."
+ icon_state = "chilicheesefries"
+ trash = /obj/item/trash/plate
+ filling_color = "#EDDD00"
+ nutriment_amt = 8
+ nutriment_desc = list("hearty, cheesy fries" = 8)
+ center_of_mass = list("x"=16, "y"=11)
+ bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/chilicheesefries/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("capsaicin", 2)
/obj/item/weapon/reagent_containers/food/snacks/blackpudding
name = "Black Pudding"
@@ -1525,21 +1595,6 @@
nutriment_desc = list("noodles" = 2)
bitesize = 1
-/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
- name = "Cheesy Fries"
- desc = "Fries. Covered in cheese. Duh."
- icon_state = "cheesyfries"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- center_of_mass = list("x"=16, "y"=11)
- nutriment_amt = 4
- nutriment_desc = list("fresh fries" = 3, "cheese" = 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "Fortune cookie"
desc = "A true prophecy in each cookie!"
@@ -1620,192 +1675,6 @@
nutriment_desc = list("poppy seeds" = 2, "pretzel" = 3)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/meatballsoup
- name = "Meatball soup"
- desc = "You've got balls kid, BALLS!"
- icon_state = "meatballsoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#785210"
- center_of_mass = list("x"=16, "y"=8)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/Initialize()
- . = ..()
- reagents.add_reagent("protein", 8)
- reagents.add_reagent("water", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/slimesoup
- name = "slime soup"
- desc = "If no water is available, you may substitute tears."
- icon_state = "slimesoup" //nonexistant? - 3/1/2020 FIXED. roro's live on. - 7/14/2020 - The fuck are you smoking, roro's is stupid, name it slimesoup so it's clear wtf it is.
- filling_color = "#C4DBA0"
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/slimesoup/Initialize()
- . = ..()
- reagents.add_reagent("slimejelly", 5)
- reagents.add_reagent("water", 10)
-
-/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
- name = "Tomato soup"
- desc = "Smells like copper."
- icon_state = "tomatosoup"
- filling_color = "#FF0000"
- center_of_mass = list("x"=16, "y"=7)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("blood", 10)
- reagents.add_reagent("water", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/clownstears
- name = "Clown's Tears"
- desc = "Not very funny."
- icon_state = "clownstears"
- filling_color = "#C4FBFF"
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 4
- nutriment_desc = list("salt" = 1, "the worst joke" = 3)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/clownstears/Initialize()
- . = ..()
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("water", 10)
-
-/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
- name = "Vegetable soup"
- desc = "A true vegan meal" //TODO
- icon_state = "vegetablesoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#AFC4B5"
- center_of_mass = list("x"=16, "y"=8)
- nutriment_amt = 8
- nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/Initialize()
- . = ..()
- reagents.add_reagent("water", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
- name = "Nettle soup"
- desc = "To think, the botanist would've beat you to death with one of these."
- icon_state = "nettlesoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#AFC4B5"
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 8
- nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/Initialize()
- . = ..()
- reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
- name = "Mystery soup"
- desc = "The mystery is, why aren't you eating it?"
- icon_state = "mysterysoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#F082FF"
- center_of_mass = list("x"=16, "y"=6)
- nutriment_amt = 1
- nutriment_desc = list("backwash" = 1)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/Initialize()
- . = ..()
- var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
- switch(mysteryselect)
- if(1)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(2)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(3)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
- if(4)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
- reagents.add_reagent("water", 10)
- if(5)
- reagents.add_reagent("nutriment", 2, nutriment_desc)
- reagents.add_reagent("banana", 10)
- if(6)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
- reagents.add_reagent("blood", 10)
- if(7)
- reagents.add_reagent("slimejelly", 10)
- reagents.add_reagent("water", 10)
- if(8)
- reagents.add_reagent("carbon", 10)
- reagents.add_reagent("toxin", 10)
- if(9)
- reagents.add_reagent("nutriment", 5, nutriment_desc)
- reagents.add_reagent("tomatojuice", 10)
- if(10)
- reagents.add_reagent("nutriment", 6, nutriment_desc)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/wishsoup
- name = "Wish Soup"
- desc = "I wish this was soup."
- icon_state = "wishsoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#D1F4FF"
- center_of_mass = list("x"=16, "y"=11)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/wishsoup/Initialize()
- . = ..()
- reagents.add_reagent("water", 10)
- if(prob(25))
- src.desc = "A wish come true!"
- reagents.add_reagent("nutriment", 8, list("something good" = 8))
-
-/obj/item/weapon/reagent_containers/food/snacks/hotchili
- name = "Hot Chili"
- desc = "A five alarm Texan Chili!"
- icon_state = "hotchili"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#FF3C00"
- center_of_mass = list("x"=15, "y"=9)
- nutriment_amt = 3
- nutriment_desc = list("chilli peppers" = 3)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/hotchili/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/coldchili
- name = "Cold Chili"
- desc = "This slush is barely a liquid!"
- icon_state = "coldchili"
- filling_color = "#2B00FF"
- center_of_mass = list("x"=15, "y"=9)
- trash = /obj/item/trash/snack_bowl
- nutriment_amt = 3
- nutriment_desc = list("ice peppers" = 3)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/coldchili/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"
desc = "Just add water!"
@@ -1972,65 +1841,6 @@
. = ..()
reagents.add_reagent("protein", 3)
-/obj/item/weapon/reagent_containers/food/snacks/sandwich
- name = "Sandwich"
- desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
- icon_state = "sandwich"
- trash = /obj/item/trash/plate
- filling_color = "#D9BE29"
- center_of_mass = list("x"=16, "y"=4)
- nutriment_amt = 3
- nutriment_desc = list("bread" = 3, "cheese" = 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sandwich/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
-
-/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
- name = "Toasted Sandwich"
- desc = "Now if you only had a pepper bar."
- icon_state = "toastedsandwich"
- trash = /obj/item/trash/plate
- filling_color = "#D9BE29"
- center_of_mass = list("x"=16, "y"=4)
- nutriment_amt = 3
- nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("carbon", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
- name = "Grilled Cheese Sandwich"
- desc = "Goes great with Tomato soup!"
- icon_state = "toastedsandwich"
- trash = /obj/item/trash/plate
- filling_color = "#D9BE29"
- nutriment_amt = 3
- nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
- name = "Tomato Soup"
- desc = "Drinking this feels like being a vampire! A tomato vampire..."
- icon_state = "tomatosoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#D92929"
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 5
- nutriment_desc = list("soup" = 5)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/Initialize()
- . = ..()
- reagents.add_reagent("tomatojuice", 10)
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "Roffle Waffles"
@@ -2047,30 +1857,10 @@
. = ..()
reagents.add_reagent("psilocybin", 8)
-/obj/item/weapon/reagent_containers/food/snacks/stew
- name = "Stew"
- desc = "A nice and warm stew. Healthy and strong."
- icon_state = "stew"
- filling_color = "#9E673A"
- center_of_mass = list("x"=16, "y"=5)
- nutriment_amt = 6
- nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)
- drop_sound = 'sound/items/drop/shovel.ogg'
- pickup_sound = 'sound/items/pickup/shovel.ogg'
- bitesize = 10
-
-/obj/item/weapon/reagent_containers/food/snacks/stew/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
-
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
desc = "A slice of bread covered with delicious jam."
icon_state = "jellytoast"
- trash = /obj/item/trash/plate
filling_color = "#B572AB"
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 1
@@ -2085,6 +1875,26 @@
. = ..()
reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/honeytoast
+ name = "Honeyed Toast"
+ desc = "For those who like their breakfast sweet."
+ icon_state = "honeytoast"
+ filling_color = "#FFC02D"
+ nutriment_amt = 1
+ nutriment_desc = list("sweet, crunchy bread" = 1)
+ center_of_mass = list("x"=16, "y"=9)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesetoast
+ name = "Cheesy Toast"
+ desc = "A piece of toast lathered with butter, cheese, and spice."
+ icon_state = "cheesytoast"
+ filling_color = "#F9A617"
+ nutriment_amt = 1
+ nutriment_desc = list("cheese toast" = 8)
+ center_of_mass = list("x"=16, "y"=9)
+ bitesize = 3
+
/obj/item/weapon/reagent_containers/food/snacks/jellyburger
name = "Jelly Burger"
desc = "Culinary delight..?"
@@ -2103,20 +1913,6 @@
. = ..()
reagents.add_reagent("cherryjelly", 5)
-/obj/item/weapon/reagent_containers/food/snacks/milosoup
- name = "Miso soup"
- desc = "The universes best soup! Yum!!!"
- icon_state = "milosoup"
- trash = /obj/item/trash/snack_bowl
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 8
- nutriment_desc = list("soy" = 8)
- bitesize = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/milosoup/Initialize()
- . = ..()
- reagents.add_reagent("water", 5)
-
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
name = "Stewed Soy Meat"
desc = "Even non-vegetarians will LOVE this!"
@@ -2219,21 +2015,6 @@
. = ..()
reagents.add_reagent("protein", 4)
-/obj/item/weapon/reagent_containers/food/snacks/carrotfries
- name = "Carrot Fries"
- desc = "Tasty fries from fresh Carrots."
- icon_state = "carrotfries"
- trash = /obj/item/trash/plate
- filling_color = "#FAA005"
- center_of_mass = list("x"=16, "y"=11)
- nutriment_amt = 3
- nutriment_desc = list("carrot" = 3, "salt" = 1)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/carrotfries/Initialize()
- . = ..()
- reagents.add_reagent("imidazoline", 3)
-
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger
name = "Super Bite Burger"
desc = "This is a mountain of a burger. FOOD!"
@@ -2248,16 +2029,28 @@
. = ..()
reagents.add_reagent("protein", 25)
-/obj/item/weapon/reagent_containers/food/snacks/candiedapple
- name = "Candied Apple"
- desc = "An apple coated in sugary sweetness."
- icon_state = "candiedapple"
+/obj/item/weapon/reagent_containers/food/snacks/caramelapple
+ name = "Caramel Apple"
+ desc = "An apple coated in rich caramel."
+ icon_state = "candiedapple1"
+ trash = /obj/item/trash/stick
filling_color = "#F21873"
center_of_mass = list("x"=15, "y"=13)
nutriment_amt = 3
nutriment_desc = list("apple" = 3, "caramel" = 3, "sweetness" = 2)
bitesize = 3
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple
+ name = "Candied Apple"
+ desc = "An apple coated in sugary sweetness."
+ icon_state = "candiedapple2"
+ trash = /obj/item/trash/stick
+ filling_color = "#F21873"
+ center_of_mass = list("x"=15, "y"=13)
+ nutriment_amt = 3
+ nutriment_desc = list("apple" = 3, "sweetness" = 2)
+ bitesize = 3
+
/obj/item/weapon/reagent_containers/food/snacks/applepie
name = "Apple Pie"
desc = "A pie containing sweet sweet love... or apple."
@@ -2289,11 +2082,54 @@
nutriment_desc = list("sourness" = 2, "bread" = 2)
bitesize = 3
+// Sandwiches //////////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/sandwich
+ name = "Sandwich"
+ desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
+ icon_state = "sandwich"
+ filling_color = "#D9BE29"
+ center_of_mass = list("x"=16, "y"=4)
+ nutriment_amt = 3
+ nutriment_desc = list("bread" = 3, "cheese" = 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sandwich/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
+ name = "Toasted Sandwich"
+ desc = "Now if you only had a pepper bar."
+ icon_state = "toastedsandwich"
+ filling_color = "#D9BE29"
+ center_of_mass = list("x"=16, "y"=4)
+ nutriment_amt = 3
+ nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("carbon", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
+ name = "Grilled Cheese Sandwich"
+ desc = "Goes great with Tomato soup!"
+ icon_state = "toastedsandwich"
+ filling_color = "#D9BE29"
+ nutriment_amt = 3
+ nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "Jelly Sandwich"
desc = "You wish you had some peanut butter to go with this..."
icon_state = "jellysandwich"
- trash = /obj/item/trash/plate
filling_color = "#9E3A78"
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 2
@@ -2316,6 +2152,8 @@
. = ..()
reagents.add_reagent("peanutbutter", 5)
+// End Sandwiches //////////////////////////////////////////////
+
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
name = "Boiled Slime Core"
desc = "A boiled red thing."
@@ -2334,43 +2172,6 @@
center_of_mass = list("x"=16, "y"=14)
bitesize = 1
-/obj/item/weapon/reagent_containers/food/snacks/mint/Initialize()
- . = ..()
- reagents.add_reagent("mint", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/mint/admints
- desc = "Spearmint, peppermint's non-festive cousin."
- icon = 'icons/obj/food_snacks.dmi'
- icon_state = "admint"
-
-/obj/item/weapon/storage/box/admints
- name = "Ad-mints"
- desc = "A pack of air fresheners for your mouth."
- description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight."
- icon = 'icons/obj/food_snacks.dmi'
- icon_state = "admint_pack"
- item_state = "candy"
- slot_flags = SLOT_EARS
- w_class = 1
- starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints = 6)
- can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints)
- use_sound = 'sound/items/drop/paper.ogg'
- drop_sound = 'sound/items/drop/wrapper.ogg'
- max_storage_space = 6
- foldable = null
- trash = /obj/item/trash/admints
-
-/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
- name = "chantrelle soup"
- desc = "A delicious and hearty mushroom soup."
- icon_state = "mushroomsoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#E386BF"
- center_of_mass = list("x"=17, "y"=10)
- nutriment_amt = 8
- nutriment_desc = list("mushroom" = 8, "milk" = 2)
- bitesize = 3
-
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
name = "plump helmet biscuit"
desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
@@ -2401,21 +2202,6 @@
. = ..()
reagents.add_reagent("protein", 5)
-/obj/item/weapon/reagent_containers/food/snacks/beetsoup
- name = "beet soup"
- desc = "Wait, how do you spell it again..?"
- icon_state = "beetsoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#FAC9FF"
- center_of_mass = list("x"=15, "y"=8)
- nutriment_amt = 8
- nutriment_desc = list("tomato" = 4, "beet" = 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/beetsoup/Initialize()
- . = ..()
- name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
-
/obj/item/weapon/reagent_containers/food/snacks/tossedsalad
name = "tossed salad"
desc = "A proper salad, basic and simple, with little bits of carrot, tomato and apple intermingled. Vegan!"
@@ -2457,7 +2243,328 @@
. = ..()
reagents.add_reagent("gold", 5)
-/////////////////////////////////////////////////Sliceable////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////Soups/////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/meatballsoup
+ name = "Meatball soup"
+ desc = "You've got balls kid, BALLS!"
+ icon_state = "meatballsoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#785210"
+ center_of_mass = list("x"=16, "y"=8)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 8)
+ reagents.add_reagent("water", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/slimesoup
+ name = "slime soup"
+ desc = "If no water is available, you may substitute tears."
+ icon_state = "slimesoup" //nonexistant? - 3/1/2020 FIXED. roro's live on. - 7/14/2020 - The fuck are you smoking, roro's is stupid, name it slimesoup so it's clear wtf it is.
+ filling_color = "#C4DBA0"
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/slimesoup/Initialize()
+ . = ..()
+ reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("water", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
+ name = "Tomato soup"
+ desc = "Smells like copper."
+ icon_state = "tomatosoup"
+ filling_color = "#FF0000"
+ center_of_mass = list("x"=16, "y"=7)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("blood", 10)
+ reagents.add_reagent("water", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/clownstears
+ name = "Clown's Tears"
+ desc = "Not very funny."
+ icon_state = "clownstears"
+ filling_color = "#C4FBFF"
+ center_of_mass = list("x"=16, "y"=7)
+ nutriment_amt = 4
+ nutriment_desc = list("salt" = 1, "the worst joke" = 3)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/clownstears/Initialize()
+ . = ..()
+ reagents.add_reagent("banana", 5)
+ reagents.add_reagent("water", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
+ name = "Vegetable soup"
+ desc = "A true vegan meal" //TODO
+ icon_state = "vegetablesoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#AFC4B5"
+ center_of_mass = list("x"=16, "y"=8)
+ nutriment_amt = 8
+ nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/Initialize()
+ . = ..()
+ reagents.add_reagent("water", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
+ name = "Nettle soup"
+ desc = "To think, the botanist would've beat you to death with one of these."
+ icon_state = "nettlesoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#AFC4B5"
+ center_of_mass = list("x"=16, "y"=7)
+ nutriment_amt = 8
+ nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/Initialize()
+ . = ..()
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("tricordrazine", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
+ name = "Mystery soup"
+ desc = "The mystery is, why aren't you eating it?"
+ icon_state = "mysterysoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#F082FF"
+ center_of_mass = list("x"=16, "y"=6)
+ nutriment_amt = 1
+ nutriment_desc = list("backwash" = 1)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/Initialize()
+ . = ..()
+ var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
+ switch(mysteryselect)
+ if(1)
+ reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(2)
+ reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(3)
+ reagents.add_reagent("nutriment", 5, nutriment_desc)
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("tricordrazine", 5)
+ if(4)
+ reagents.add_reagent("nutriment", 5, nutriment_desc)
+ reagents.add_reagent("water", 10)
+ if(5)
+ reagents.add_reagent("nutriment", 2, nutriment_desc)
+ reagents.add_reagent("banana", 10)
+ if(6)
+ reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent("blood", 10)
+ if(7)
+ reagents.add_reagent("slimejelly", 10)
+ reagents.add_reagent("water", 10)
+ if(8)
+ reagents.add_reagent("carbon", 10)
+ reagents.add_reagent("toxin", 10)
+ if(9)
+ reagents.add_reagent("nutriment", 5, nutriment_desc)
+ reagents.add_reagent("tomatojuice", 10)
+ if(10)
+ reagents.add_reagent("nutriment", 6, nutriment_desc)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/wishsoup
+ name = "Wish Soup"
+ desc = "I wish this was soup."
+ icon_state = "wishsoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#D1F4FF"
+ center_of_mass = list("x"=16, "y"=11)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/wishsoup/Initialize()
+ . = ..()
+ reagents.add_reagent("water", 10)
+ if(prob(25))
+ src.desc = "A wish come true!"
+ reagents.add_reagent("nutriment", 8, list("something good" = 8))
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
+ name = "Tomato Soup"
+ desc = "Drinking this feels like being a vampire! A tomato vampire..."
+ icon_state = "tomatosoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#D92929"
+ center_of_mass = list("x"=16, "y"=7)
+ nutriment_amt = 5
+ nutriment_desc = list("soup" = 5)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/Initialize()
+ . = ..()
+ reagents.add_reagent("tomatojuice", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
+ name = "chantrelle soup"
+ desc = "A delicious and hearty mushroom soup."
+ icon_state = "mushroomsoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#E386BF"
+ center_of_mass = list("x"=17, "y"=10)
+ nutriment_amt = 8
+ nutriment_desc = list("mushroom" = 8, "milk" = 2)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/beetsoup
+ name = "beet soup"
+ desc = "Wait, how do you spell it again..?"
+ icon_state = "beetsoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#FAC9FF"
+ center_of_mass = list("x"=15, "y"=8)
+ nutriment_amt = 8
+ nutriment_desc = list("tomato" = 4, "beet" = 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/beetsoup/Initialize()
+ . = ..()
+ name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
+
+/obj/item/weapon/reagent_containers/food/snacks/soup/onion
+ name = "onion soup"
+ desc = "A soup with layers."
+ icon_state = "onionsoup"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#E0C367"
+ center_of_mass = list("x"=16, "y"=7)
+ nutriment_amt = 5
+ nutriment_desc = list("onion" = 2, "soup" = 2)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup
+ name = "chicken noodle soup"
+ gender = PLURAL
+ desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots."
+ icon_state = "chickennoodlesoup"
+ filling_color = "#ead90c"
+ nutriment_amt = 6
+ nutriment_desc = list("warm soup" = 6)
+ center_of_mass = list("x"=16, "y"=5)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("water", 5)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/stew
+ name = "Stew"
+ desc = "A nice and warm stew. Healthy and strong."
+ icon_state = "stew"
+ filling_color = "#9E673A"
+ center_of_mass = list("x"=16, "y"=5)
+ nutriment_amt = 6
+ nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)
+ drop_sound = 'sound/items/drop/shovel.ogg'
+ pickup_sound = 'sound/items/pickup/shovel.ogg'
+ bitesize = 10
+
+/obj/item/weapon/reagent_containers/food/snacks/stew/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("water", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/bearstew
+ name = "bear stew"
+ gender = PLURAL
+ desc = "A thick, dark stew of bear meat and vegetables."
+ icon_state = "bearstew"
+ filling_color = "#9E673A"
+ nutriment_amt = 6
+ nutriment_desc = list("hearty stew" = 6)
+ center_of_mass = list("x"=16, "y"=5)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/bearstew/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("hyperzine", 5)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("water", 5)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/hotchili
+ name = "Hot Chili"
+ desc = "A five alarm Texan Chili!"
+ icon_state = "hotchili"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#FF3C00"
+ center_of_mass = list("x"=15, "y"=9)
+ nutriment_amt = 3
+ nutriment_desc = list("chilli peppers" = 3)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/hotchili/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/coldchili
+ name = "Cold Chili"
+ desc = "This slush is barely a liquid!"
+ icon_state = "coldchili"
+ filling_color = "#2B00FF"
+ center_of_mass = list("x"=15, "y"=9)
+ trash = /obj/item/trash/snack_bowl
+ nutriment_amt = 3
+ nutriment_desc = list("ice peppers" = 3)
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/coldchili/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/bearchili
+ name = "bear chili"
+ gender = PLURAL
+ desc = "A dark, hearty chili. Can you bear the heat?"
+ icon_state = "bearchili"
+ trash = /obj/item/trash/snack_bowl
+ filling_color = "#702708"
+ nutriment_amt = 3
+ nutriment_desc = list("dark, hearty chili" = 3)
+ center_of_mass = list("x"=15, "y"=9)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/bearchili/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ reagents.add_reagent("hyperzine", 5)
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////Sliceable/////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
// sliceable is just an organization type path, it doesn't have any additional code or variables tied to it.
@@ -2543,7 +2650,6 @@
name = "xenomeatbread slice"
desc = "A slice of delicious meatbread. Extra Heretical."
icon_state = "xenobreadslice"
- trash = /obj/item/trash/plate
filling_color = "#8AFF75"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
@@ -2573,7 +2679,6 @@
name = "Banana-nut bread slice"
desc = "A slice of delicious banana bread."
icon_state = "bananabreadslice"
- trash = /obj/item/trash/plate
filling_color = "#EDE5AD"
bitesize = 2
center_of_mass = list("x"=16, "y"=8)
@@ -2598,7 +2703,6 @@
name = "Tofubread slice"
desc = "A slice of delicious tofubread."
icon_state = "tofubreadslice"
- trash = /obj/item/trash/plate
filling_color = "#F7FFE0"
bitesize = 2
center_of_mass = list("x"=16, "y"=13)
@@ -2608,6 +2712,47 @@
filled = TRUE
+/obj/item/weapon/reagent_containers/food/snacks/slice/bread
+ name = "Bread slice"
+ desc = "A slice of home."
+ icon_state = "breadslice"
+ filling_color = "#D27332"
+ bitesize = 2
+ center_of_mass = list("x"=16, "y"=4)
+ whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
+
+/obj/item/weapon/reagent_containers/food/snacks/slice/bread/filled
+ filled = TRUE
+
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
+ name = "Cream Cheese Bread"
+ desc = "Yum yum yum!"
+ icon_state = "creamcheesebread"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread
+ slices_num = 5
+ filling_color = "#FFF896"
+ center_of_mass = list("x"=16, "y"=9)
+ nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3)
+ nutriment_amt = 5
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 15)
+
+/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread
+ name = "Cream Cheese Bread slice"
+ desc = "A slice of yum!"
+ icon_state = "creamcheesebreadslice"
+ filling_color = "#FFF896"
+ bitesize = 2
+ center_of_mass = list("x"=16, "y"=14)
+ whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
+
+/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled
+ filled = TRUE
+
/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
name = "Carrot Cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
@@ -2773,7 +2918,6 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled
filled = TRUE
-
/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
name = "Lime Cake"
desc = "A cake with added lime."
@@ -2785,7 +2929,6 @@
nutriment_desc = list("cake" = 10, "sweetness" = 10, "lime" = 15)
nutriment_amt = 20
-
/obj/item/weapon/reagent_containers/food/snacks/slice/limecake
name = "Lime Cake slice"
desc = "Just a slice of cake, it is enough for everyone."
@@ -2913,51 +3056,6 @@
nutriment_amt = 6
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/slice/bread
- name = "Bread slice"
- desc = "A slice of home."
- icon_state = "breadslice"
- trash = /obj/item/trash/plate
- filling_color = "#D27332"
- bitesize = 2
- center_of_mass = list("x"=16, "y"=4)
- whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
-
-/obj/item/weapon/reagent_containers/food/snacks/slice/bread/filled
- filled = TRUE
-
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
- name = "Cream Cheese Bread"
- desc = "Yum yum yum!"
- icon_state = "creamcheesebread"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread
- slices_num = 5
- filling_color = "#FFF896"
- center_of_mass = list("x"=16, "y"=9)
- nutriment_desc = list("bread" = 6, "cream" = 3, "cheese" = 3)
- nutriment_amt = 5
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread/Initialize()
- . = ..()
- reagents.add_reagent("protein", 15)
-
-/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread
- name = "Cream Cheese Bread slice"
- desc = "A slice of yum!"
- icon_state = "creamcheesebreadslice"
- trash = /obj/item/trash/plate
- filling_color = "#FFF896"
- bitesize = 2
- center_of_mass = list("x"=16, "y"=14)
- whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
-
-
-/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled
- filled = TRUE
-
-
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice
name = "Watermelon Slice"
desc = "A slice of watery goodness."
@@ -3024,9 +3122,299 @@
w_class = ITEMSIZE_TINY
nutriment_amt = 1
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
+ name = "Njarir Merana Grill"
+ desc = "A well-dressed fish, seared to perfection and adorned with herbs and spices in a traditional Nerahni Tajaran style. Can be sliced into proper serving sizes."
+ icon_state = "grilled_carp"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
+ slices_num = 6
+ trash = /obj/item/trash/snacktray
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
+ . = ..()
+ reagents.add_reagent("seafood", 12)
-/////////////////////////////////////////////////PIZZA////////////////////////////////////////
+/obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
+ name = "korlaaskak slice"
+ desc = "A well-dressed fillet of carp, seared to perfection and adorned with herbs and spices."
+ icon_state = "grilledcarp_slice"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie
+ name = "key lime pie"
+ desc = "A tart, sweet dessert. What's a key lime, anyway?"
+ icon_state = "keylimepie"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice
+ slices_num = 5
+ filling_color = "#F5B951"
+ nutriment_amt = 16
+ nutriment_desc = list("lime" = 12, "graham crackers" = 4)
+ center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/keylimepieslice
+ name = "slice of key lime pie"
+ desc = "A slice of tart pie, with whipped cream on top."
+ icon_state = "keylimepieslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#F5B951"
+ bitesize = 3
+ nutriment_desc = list("lime" = 1)
+ center_of_mass = list("x"=16, "y"=12)
+
+/obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled
+ nutriment_amt = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/quiche
+ name = "quiche"
+ desc = "Real men eat this, contrary to popular belief."
+ icon_state = "quiche"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/quicheslice
+ slices_num = 5
+ filling_color = "#F5B951"
+ nutriment_amt = 10
+ nutriment_desc = list("cheese" = 5, "egg" = 5)
+ center_of_mass = list("x"=16, "y"=10)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/quiche/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/quicheslice
+ name = "slice of quiche"
+ desc = "A slice of delicious quiche. Eggy, cheesy goodness."
+ icon_state = "quicheslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#F5B951"
+ bitesize = 3
+ nutriment_desc = list("cheesy eggs" = 1)
+ center_of_mass = list("x"=16, "y"=12)
+
+/obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled
+ nutriment_amt = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies
+ name = "brownies"
+ gender = PLURAL
+ desc = "Halfway to fudge, or halfway to cake? Who cares!"
+ icon_state = "brownies"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/browniesslice
+ slices_num = 4
+ trash = /obj/item/trash/brownies
+ filling_color = "#301301"
+ nutriment_amt = 8
+ nutriment_desc = list("fudge" = 8)
+ center_of_mass = list("x"=15, "y"=9)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/browniesslice
+ name = "brownie"
+ desc = "a dense, decadent chocolate brownie."
+ icon_state = "browniesslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#F5B951"
+ bitesize = 2
+ nutriment_desc = list("fudge" = 1)
+ center_of_mass = list("x"=16, "y"=12)
+
+/obj/item/weapon/reagent_containers/food/snacks/browniesslice/filled
+ nutriment_amt = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/browniesslice/filled/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies
+ name = "cosmic brownies"
+ gender = PLURAL
+ desc = "Like, ultra-trippy. Brownies HAVE no gender, man." //Except I had to add one!
+ icon_state = "cosmicbrownies"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice
+ slices_num = 4
+ trash = /obj/item/trash/brownies
+ filling_color = "#301301"
+ nutriment_amt = 8
+ nutriment_desc = list("fudge" = 8)
+ center_of_mass = list("x"=15, "y"=9)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+ reagents.add_reagent("space_drugs", 2)
+ reagents.add_reagent("bicaridine", 1)
+ reagents.add_reagent("kelotane", 1)
+ reagents.add_reagent("toxin", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice
+ name = "cosmic brownie"
+ desc = "a dense, decadent and fun-looking chocolate brownie."
+ icon_state = "cosmicbrowniesslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#F5B951"
+ bitesize = 3
+ nutriment_desc = list("fudge" = 1)
+ center_of_mass = list("x"=16, "y"=12)
+
+/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled
+ nutriment_amt = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/lasagna
+ name = "lasagna"
+ desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "lasagna"
+ nutriment_amt = 5
+ nutriment_desc = list("tomato" = 4, "meat" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2) //For meaty things.
+
+/obj/item/weapon/reagent_containers/food/snacks/gigapuddi
+ name = "Astro-Pudding"
+ desc = "A crème caramel of astronomical size."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "gigapuddi"
+ nutriment_amt = 20
+ nutriment_desc = list("caramel" = 20)
+ bitesize = 2
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy
+ desc = "A crème caramel of astronomical size, made with extra love."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "happypuddi"
+
+/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
+ desc = "A crème caramel of astronomical size, made with extra hate."
+ icon_state = "angerpuddi"
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
+ name = "\improper Buche de Noel"
+ desc = "Yule love it!"
+ icon = 'icons/obj/food.dmi'
+ icon_state = "buche"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/bucheslice
+ slices_num = 5
+ w_class = 2
+ nutriment_amt = 20
+ nutriment_desc = list("spongy cake" = 20)
+ bitesize = 3
+ trash = /obj/item/trash/tray
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
+ . = ..()
+ reagents.add_reagent("sugar", 9)
+ reagents.add_reagent("coco", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/bucheslice
+ name = "\improper Buche de Noel slice"
+ desc = "A slice of winter magic."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "buche_slice"
+ trash = /obj/item/trash/plate
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
+ name = "turkey"
+ desc = "Tastes like chicken."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "turkey"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
+ slices_num = 6
+ w_class = 2
+ nutriment_amt = 20
+ nutriment_desc = list("turkey" = 20)
+ bitesize = 5
+ trash = /obj/item/trash/tray
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey/Initialize()
+ . = ..()
+ reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("cornoil", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/turkeyslice
+ name = "turkey drumstick"
+ desc = "Forsooth!"
+ icon = 'icons/obj/food.dmi'
+ icon_state = "turkey_drumstick"
+ trash = /obj/item/trash/plate
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter
+ name = "suppermatter"
+ desc = "Extremely dense and powerful food."
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/suppermattershard
+ slices_num = 10
+ icon = 'icons/obj/food.dmi'
+ icon_state = "suppermatter"
+ nutriment_amt = 48
+ nutriment_desc = list("pure power" = 48)
+ bitesize = 12
+ w_class = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter/Initialize()
+ . = ..()
+ set_light(1.4,2,"#FFFF00")
+
+/obj/item/weapon/reagent_containers/food/snacks/suppermattershard
+ name = "suppermatter shard"
+ desc = "A single portion of power."
+ icon = 'icons/obj/food.dmi'
+ icon_state = "suppermattershard"
+ bitesize = 3
+ trash = null
+
+/obj/item/weapon/reagent_containers/food/snacks/suppermattershard/Initialize()
+ . = ..()
+ set_light(1.4,1.4,"#FFFF00")
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter
+ name = "exciting suppermatter"
+ desc = "Extremely dense, powerful and exciting food!"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
+ slices_num = 10
+ icon = 'icons/obj/food.dmi'
+ icon_state = "excitingsuppermatter"
+ nutriment_amt = 60
+ nutriment_desc = list("pure, indescribable power" = 60)
+ bitesize = 12
+ w_class = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter/Initialize()
+ . = ..()
+ set_light(1.4,2,"#FF0000")
+
+/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
+ name = "exciting suppermatter shard"
+ desc = "A single portion of exciting power!"
+ icon = 'icons/obj/food.dmi'
+ icon_state = "excitingsuppermattershard"
+ bitesize = 4
+ trash = null
+
+/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard/Initialize()
+ . = ..()
+ set_light(1.4,1.4,"#FF0000")
+
+/////////////////////////////////////////////////PIZZA/////////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza
slices_num = 6
@@ -3063,7 +3451,6 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
name = "ham & pineapple pizza"
desc = "One of the most debated pizzas in existence."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "pineapple_pizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pineappleslice
slices_num = 6
@@ -3081,7 +3468,6 @@
/obj/item/weapon/reagent_containers/food/snacks/pineappleslice
name = "ham & pineapple pizza slice"
desc = "A slice of contraband."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "pineapple_pizza_slice"
filling_color = "#BAA14C"
bitesize = 2
@@ -3175,6 +3561,25 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled
filled = TRUE
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/crunch
+ name = "pizza crunch"
+ desc = "This was once a normal pizza, but it has been coated in batter and deep-fried. Whatever toppings it once had are a mystery, but they're still under there, somewhere..."
+ icon_state = "pizzacrunch"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzacrunchslice
+ slices_num = 6
+ nutriment_amt = 25
+ nutriment_desc = list("fried pizza" = 25)
+ center_of_mass = list("x"=16, "y"=11)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/pizzacrunchslice
+ name = "pizza crunch"
+ desc = "A little piece of a heart attack. It's toppings are a mystery, hidden under batter"
+ icon_state = "pizzacrunchslice"
+ filling_color = "#BAA14C"
+ bitesize = 2
+ center_of_mass = list("x"=18, "y"=13)
+
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/oldpizza
name = "moldy pizza"
desc = "This pizza might actually be alive. There's mold all over."
@@ -3652,7 +4057,6 @@
/obj/item/weapon/reagent_containers/food/snacks/bellefritter
name = "frostbelle fritters"
desc = "Frostbelles, prepared traditionally."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bellefritter"
filling_color = "#5dadcf"
center_of_mass = list("x"=16, "y"=12)
@@ -3819,7 +4223,7 @@
name = "baked beans"
desc = "Musical fruit in a slightly less musical container."
filling_color = "#FC6F28"
- icon_state = "beans"
+ icon_state = "bakedbeans"
nutriment_amt = 4
nutriment_desc = list("beans" = 4)
bitesize = 2
@@ -3869,20 +4273,6 @@
. = ..()
reagents.add_reagent("poisonberryjuice", 3)
-/obj/item/weapon/reagent_containers/food/snacks/eggroll
- name = "egg roll"
- desc = "Free with orders over 10 thalers."
- icon_state = "eggroll"
- filling_color = "#799ACE"
- center_of_mass = list("x"=17, "y"=4)
- nutriment_amt = 4
- nutriment_desc = list("egg" = 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/eggroll/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/devilledegg
name = "devilled eggs"
desc = "Spicy homestyle favorite."
@@ -4260,6 +4650,7 @@
feeder.put_in_hands(trash)
qdel(src)
return
+
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
@@ -4286,7 +4677,6 @@
/obj/item/weapon/reagent_containers/food/snacks/sausage/battered
name = "battered sausage"
desc = "A piece of mixed, long meat, battered and then deepfried."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "batteredsausage"
filling_color = "#DB0000"
center_of_mass = list("x"=16, "y"=16)
@@ -4303,7 +4693,6 @@
/obj/item/weapon/reagent_containers/food/snacks/jalapeno_poppers
name = "jalapeno popper"
desc = "A battered, deep-fried chilli pepper."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "popper"
filling_color = "#00AA00"
center_of_mass = list("x"=10, "y"=6)
@@ -4320,7 +4709,6 @@
/obj/item/weapon/reagent_containers/food/snacks/mouseburger
name = "mouse burger"
desc = "Squeaky and a little furry."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "ratburger"
center_of_mass = list("x"=16, "y"=11)
bitesize = 2
@@ -4332,7 +4720,6 @@
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu
name = "chicken katsu"
desc = "An Earth delicacy consisting of chicken fried in a light beer batter."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "katsu"
trash = /obj/item/trash/plate
filling_color = "#E9ADFF"
@@ -4346,50 +4733,6 @@
reagents.add_reagent("beerbatter", 2)
reagents.add_reagent("oil", 1)
-/obj/item/weapon/reagent_containers/food/snacks/fries
- nutriment_amt = 4
- nutriment_desc = list("fries" = 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/fries/Initialize()
- . = ..()
- reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning
-
-/obj/item/weapon/reagent_containers/food/snacks/microchips
- name = "micro chips"
- desc = "Soft and rubbery, should have fried them. Good for smaller crewmembers, maybe?"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "microchips"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- nutriment_amt = 4
- nutriment_desc = list("soggy fries" = 4)
- center_of_mass = list("x"=16, "y"=11)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/ovenchips
- name = "oven chips"
- desc = "Dark and crispy, but a bit dry."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "ovenchips"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- nutriment_amt = 4
- nutriment_desc = list("crisp, dry fries" = 4)
- center_of_mass = list("x"=16, "y"=11)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/crunch
- name = "pizza crunch"
- desc = "This was once a normal pizza, but it has been coated in batter and deep-fried. Whatever toppings it once had are a mystery, but they're still under there, somewhere..."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "pizzacrunch"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzacrunchslice
- slices_num = 6
- nutriment_amt = 25
- nutriment_desc = list("fried pizza" = 25)
- center_of_mass = list("x"=16, "y"=11)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/crunch/Initialize()
. = ..()
@@ -4397,19 +4740,9 @@
coating = reagents.get_reagent("batter")
reagents.add_reagent("oil", 4)
-/obj/item/weapon/reagent_containers/food/snacks/pizzacrunchslice
- name = "pizza crunch"
- desc = "A little piece of a heart attack. It's toppings are a mystery, hidden under batter"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "pizzacrunchslice"
- filling_color = "#BAA14C"
- bitesize = 2
- center_of_mass = list("x"=18, "y"=13)
-
/obj/item/weapon/reagent_containers/food/snacks/funnelcake
name = "funnel cake"
- desc = "Funnel cakes rule!"
- icon = 'icons/obj/food_syn.dmi'
+ desc = "A taste of the carnival. You can feel your blood pressure rising."
icon_state = "funnelcake"
filling_color = "#Ef1479"
center_of_mass = list("x"=16, "y"=12)
@@ -4424,7 +4757,6 @@
/obj/item/weapon/reagent_containers/food/snacks/spreads
name = "nutri-spread"
desc = "A stick of plant-based nutriments in a semi-solid form. I can't believe it's not margarine!"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "marge"
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
@@ -4433,8 +4765,6 @@
/obj/item/weapon/reagent_containers/food/snacks/spreads/butter
name = "butter"
- desc = "A stick of pure butterfat made from milk products."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "butter"
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
@@ -4458,7 +4788,6 @@
/obj/item/weapon/reagent_containers/food/snacks/rawbacon
name = "raw bacon"
desc = "A very thin piece of raw meat, cut from beef."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "rawbacon"
bitesize = 1
center_of_mass = list("x"=16, "y"=16)
@@ -4470,7 +4799,6 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon
name = "bacon"
desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon"
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
@@ -4478,7 +4806,6 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon/microwave
name = "microwaved bacon"
desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon"
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
@@ -4486,7 +4813,6 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon/oven
name = "oven-cooked bacon"
desc = "A tasty meat slice. You don't see any pigs on this station, do you?"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon"
bitesize = 2
center_of_mass = list("x"=16, "y"=16)
@@ -4499,8 +4825,8 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon_stick
name = "eggpop"
desc = "A bacon wrapped boiled egg, conveniently skewered on a wooden stick."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon_stick"
+ trash = /obj/item/trash/stick
/obj/item/weapon/reagent_containers/food/snacks/bacon_stick/Initialize()
. = ..()
@@ -4518,18 +4844,9 @@
reagents.add_reagent("egg", 6)
reagents.add_reagent("protein", 2)
-/obj/item/weapon/reagent_containers/food/snacks/cheese_cracker
- name = "supreme cheese toast"
- desc = "A piece of toast lathered with butter, cheese, spices, and herbs."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "cheese_cracker"
- nutriment_desc = list("cheese toast" = 8)
- nutriment_amt = 8
-
/obj/item/weapon/reagent_containers/food/snacks/bacon_and_eggs
name = "bacon and eggs"
desc = "A piece of bacon and two fried eggs."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon_and_eggs"
trash = /obj/item/trash/plate
@@ -4541,7 +4858,6 @@
/obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour
name = "sweet and sour pork"
desc = "A traditional ancient sol recipe with a few liberties taken with meat selection."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "sweet_and_sour"
nutriment_desc = list("sweet and sour" = 6)
nutriment_amt = 6
@@ -4554,8 +4870,8 @@
/obj/item/weapon/reagent_containers/food/snacks/corn_dog
name = "corn dog"
desc = "A cornbread covered sausage deepfried in oil."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "corndog"
+ trash = /obj/item/trash/stick
nutriment_desc = list("corn batter" = 4)
nutriment_amt = 4
@@ -4566,8 +4882,7 @@
/obj/item/weapon/reagent_containers/food/snacks/truffle
name = "chocolate truffle"
desc = "Rich bite-sized chocolate."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "truffle"
+ icon_state = "chocolatepiece_truffle"
nutriment_amt = 0
bitesize = 4
@@ -4587,8 +4902,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon_flatbread
name = "bacon cheese flatbread"
desc = "Not a pizza."
- icon_state = "bacon_pizza"
- icon = 'icons/obj/food_syn.dmi'
+ icon_state = "bacon_flatbread"
nutriment_desc = list("flatbread" = 5)
nutriment_amt = 5
@@ -4599,7 +4913,6 @@
/obj/item/weapon/reagent_containers/food/snacks/meat_pocket
name = "meat pocket"
desc = "Meat and cheese stuffed in a flatbread pocket, grilled to perfection."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "meat_pocket"
nutriment_desc = list("flatbread" = 3)
nutriment_amt = 3
@@ -4611,8 +4924,7 @@
/obj/item/weapon/reagent_containers/food/snacks/fish_taco
name = "fish taco"
desc = "A questionably cooked fish taco decorated with herbs, spices, and special sauce."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "fish_taco"
+ icon_state = "fishtaco"
nutriment_desc = list("flatbread" = 3)
nutriment_amt = 3
@@ -4623,8 +4935,7 @@
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin
name = "breakfast muffin"
desc = "An english muffin with egg, cheese, and sausage, as sold in fast food joints galaxy-wide."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "nt_muffin"
+ icon_state = "eggmuffin"
nutriment_desc = list("biscuit" = 3)
nutriment_amt = 3
@@ -4635,7 +4946,6 @@
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring
name = "pineapple ring"
desc = "So retro."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "pineapple_ring"
nutriment_desc = list("sweetness" = 2)
nutriment_amt = 2
@@ -4648,7 +4958,6 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/bacon
name = "bacon burger"
desc = "The cornerstone of every nutritious breakfast, now with bacon!"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "baconburger"
filling_color = "#D63C3C"
center_of_mass = list("x"=16, "y"=11)
@@ -4663,7 +4972,6 @@
/obj/item/weapon/reagent_containers/food/snacks/blt
name = "BLT"
desc = "Bacon, lettuce, tomatoes. The perfect lunch."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "blt"
filling_color = "#D63C3C"
center_of_mass = list("x"=16, "y"=16)
@@ -4675,34 +4983,9 @@
. = ..()
reagents.add_reagent("protein", 4)
-/obj/item/weapon/reagent_containers/food/snacks/onionrings
- name = "onion rings"
- desc = "Like circular fries but better."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "onionrings"
- trash = /obj/item/trash/plate
- filling_color = "#eddd00"
- center_of_mass = list("x"=16,"y"=11)
- nutriment_desc = list("fried onions" = 5)
- nutriment_amt = 5
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/soup/onion
- name = "onion soup"
- desc = "A soup with layers."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "onionsoup"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#E0C367"
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 5
- nutriment_desc = list("onion" = 2, "soup" = 2)
- bitesize = 3
-
/obj/item/weapon/reagent_containers/food/snacks/porkbowl
name = "pork bowl"
desc = "A bowl of fried rice with cuts of meat."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "porkbowl"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
@@ -4716,7 +4999,6 @@
/obj/item/weapon/reagent_containers/food/snacks/mashedpotato
name = "mashed potato"
desc = "Pillowy mounds of mashed potato."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "mashedpotato"
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
@@ -4725,46 +5007,62 @@
nutriment_desc = list("mashed potatoes" = 4)
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
+ name = "Loaded Baked Potato"
+ desc = "Totally baked."
+ icon_state = "loadedbakedpotato"
+ filling_color = "#9C7A68"
+ center_of_mass = list("x"=16, "y"=10)
+ nutriment_amt = 3
+ nutriment_desc = list("baked potato" = 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/bangersandmash
+ name = "Bangers and Mash"
+ desc = "An English treat."
+ icon_state = "bangersandmash"
+ trash = /obj/item/trash/plate
+ filling_color = "#EDDD00"
+ center_of_mass = list("x"=16, "y"=11)
+ nutriment_amt = 4
+ nutriment_desc = list("fluffy potato" = 3, "sausage" = 2)
+ bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/bangersandmash/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesymash
+ name = "Cheesy Mashed Potato"
+ desc = "The only thing that could make mash better."
+ icon_state = "cheesymash"
+ trash = /obj/item/trash/plate
+ filling_color = "#EDDD00"
+ center_of_mass = list("x"=16, "y"=11)
+ nutriment_amt = 4
+ nutriment_desc = list("cheesy potato" = 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesymash/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 3)
+
/obj/item/weapon/reagent_containers/food/snacks/croissant
name = "croissant"
desc = "True french cuisine."
- icon = 'icons/obj/food_syn.dmi'
filling_color = "#E3D796"
icon_state = "croissant"
nutriment_amt = 4
nutriment_desc = list("french bread" = 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/crabmeat
- name = "crab legs"
- desc = "... Coffee? Is that you?"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "crabmeat"
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize()
- . = ..()
- reagents.add_reagent("seafood", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/crab_legs
- name = "steamed crab legs"
- desc = "Crab legs steamed and buttered to perfection. One day when the boss gets hungry..."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "crablegs"
- nutriment_amt = 2
- nutriment_desc = list("savory butter" = 2)
- bitesize = 2
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/crab_legs/Initialize()
- . = ..()
- reagents.add_reagent("seafood", 6)
- reagents.add_reagent("sodiumchloride", 1)
-
/obj/item/weapon/reagent_containers/food/snacks/pancakes
name = "pancakes"
- desc = "Pancakes with berries, delicious."
- icon = 'icons/obj/food_syn.dmi'
+ desc = "Pancakes, delicious."
icon_state = "pancakes"
trash = /obj/item/trash/plate
center_of_mass = list("x"=15, "y"=11)
@@ -4772,9 +5070,18 @@
nutriment_amt = 8
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/pancakes/berry
+ name = "berry pancakes"
+ desc = "Pancakes with berries, delicious."
+ icon_state = "pancake_berry"
+ trash = /obj/item/trash/plate
+ center_of_mass = list("x"=15, "y"=11)
+ nutriment_desc = list("pancake" = 4, "berry" = 4)
+ nutriment_amt = 10
+ bitesize = 2
+
/obj/item/weapon/reagent_containers/food/snacks/nugget
name = "chicken nugget"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "nugget_lump"
bitesize = 3
@@ -4788,7 +5095,6 @@
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "ice cream sandwich"
desc = "Portable ice cream in its own packaging."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "icecreamsandwich"
filling_color = "#343834"
center_of_mass = list("x"=15, "y"=4)
@@ -4798,7 +5104,6 @@
/obj/item/weapon/reagent_containers/food/snacks/honeybun
name = "honey bun"
desc = "A sticky pastry bun glazed with honey."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "honeybun"
nutriment_desc = list("pastry" = 1)
nutriment_amt = 3
@@ -4854,81 +5159,99 @@
user.drop_from_inventory(src)
user.put_in_hands(result)
-// Chip update.
/obj/item/weapon/reagent_containers/food/snacks/tortilla
name = "tortilla"
desc = "A thin, flour-based tortilla that can be used in a variety of dishes, or can be served as is."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "tortilla"
bitesize = 3
nutriment_desc = list("tortilla" = 1)
center_of_mass = list("x"=16, "y"=16)
nutriment_amt = 6
-//chips
+//Old_Chips Guide//////////////////////////////////////
+
+//doesn't work
+
+///obj/item/weapon/reagent_containers/food/snacks/chip
+// name = "chip"
+// desc = "A portion sized chip good for dipping."
+// icon_state = "chip"
+// var/bitten_state = "chip_half"
+// bitesize = 1
+// center_of_mass = list("x"=16, "y"=16)
+// nutriment_desc = list("chips" = 1)
+// nutriment_amt = 2
+// flags = OPENCONTAINER
+
+///obj/item/weapon/reagent_containers/food/snacks/chip/on_consume(mob/M as mob)
+// if(reagents && reagents.total_volume)
+// icon_state = bitten_state
+// . = ..()
+
+//Chips//////////////////////////////////////
+
/obj/item/weapon/reagent_containers/food/snacks/chip
name = "chip"
desc = "A portion sized chip good for dipping."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "chip"
- var/bitten_state = "chip_half"
+
bitesize = 1
center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("nacho chips" = 1)
+ nutriment_desc = list("chips" = 1)
nutriment_amt = 2
+ flags = OPENCONTAINER
-/obj/item/weapon/reagent_containers/food/snacks/chip/on_consume(mob/M as mob)
- if(reagents && reagents.total_volume)
- icon_state = bitten_state
- . = ..()
+/obj/item/weapon/reagent_containers/food/snacks/nacho
+ name = "chip"
+ desc = "A portion sized chip good for dipping."
+ icon_state = "chip"
+ bitesize = 1
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("nacho" = 1)
+ nutriment_amt = 2
+ flags = OPENCONTAINER
/obj/item/weapon/reagent_containers/food/snacks/chip/salsa
name = "salsa chip"
desc = "A portion sized chip good for dipping. This one has salsa on it."
icon_state = "chip_salsa"
- bitten_state = "chip_half"
/obj/item/weapon/reagent_containers/food/snacks/chip/guac
name = "guac chip"
desc = "A portion sized chip good for dipping. This one has guac on it."
icon_state = "chip_guac"
- bitten_state = "chip_half"
/obj/item/weapon/reagent_containers/food/snacks/chip/cheese
name = "cheese chip"
desc = "A portion sized chip good for dipping. This one has cheese sauce on it."
icon_state = "chip_cheese"
- bitten_state = "chip_half"
/obj/item/weapon/reagent_containers/food/snacks/chip/nacho
name = "nacho chip"
desc = "A nacho ship stray from a plate of cheesy nachos."
- icon_state = "chip_nacho"
- bitten_state = "chip_half"
+ icon_state = "nacho"
+ nutriment_desc = list("nacho chips" = 1)
/obj/item/weapon/reagent_containers/food/snacks/chip/nacho/salsa
name = "nacho chip"
desc = "A nacho ship stray from a plate of cheesy nachos. This one has salsa on it."
- icon_state = "chip_nacho_salsa"
- bitten_state = "chip_half"
+ icon_state = "nacho_salsa"
/obj/item/weapon/reagent_containers/food/snacks/chip/nacho/guac
name = "nacho chip"
desc = "A nacho ship stray from a plate of cheesy nachos. This one has guac on it."
- icon_state = "chip_nacho_guac"
- bitten_state = "chip_half"
+ icon_state = "nacho_guac"
/obj/item/weapon/reagent_containers/food/snacks/chip/nacho/cheese
name = "nacho chip"
desc = "A nacho ship stray from a plate of cheesy nachos. This one has extra cheese on it."
- icon_state = "chip_nacho_cheese"
- bitten_state = "chip_half"
+ icon_state = "nacho_cheese"
+
+//Chip Baskets//////////////////////////////////////
-// chip plates
/obj/item/weapon/reagent_containers/food/snacks/chipplate
name = "basket of chips"
desc = "A plate of chips intended for dipping."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "chip_basket"
trash = /obj/item/trash/chipbasket
var/vendingobject = /obj/item/weapon/reagent_containers/food/snacks/chip
@@ -4938,9 +5261,8 @@
/obj/item/weapon/reagent_containers/food/snacks/chipplate/attack_hand(mob/user as mob)
var/obj/item/weapon/reagent_containers/food/snacks/returningitem = new vendingobject(loc)
- returningitem.reagents.clear_reagents()
reagents.trans_to(returningitem, bitesize)
- returningitem.bitesize = bitesize/2
+ returningitem.bitesize = 2
user.put_in_hands(returningitem)
if (reagents && reagents.total_volume)
to_chat(user, "You take a chip from the plate.")
@@ -4959,24 +5281,24 @@
. = ..()
/obj/item/weapon/reagent_containers/food/snacks/chipplate/nachos
- name = "plate of nachos"
- desc = "A very cheesy nacho plate."
+ name = "basket of nachos"
+ desc = "A very cheesy basket of nacho."
icon_state = "nachos"
- trash = /obj/item/trash/plate
+ trash = /obj/item/trash/chipbasket
vendingobject = /obj/item/weapon/reagent_containers/food/snacks/chip/nacho
nutriment_desc = list("tortilla chips" = 10)
bitesize = 1
- nutriment_amt = 10
+ nutriment_amt = 14 //slightly better than just plain chips
+
+//Dips//////////////////////////////////////
-//dips
/obj/item/weapon/reagent_containers/food/snacks/dip
name = "queso dip"
desc = "A simple, cheesy dip consisting of tomatos, cheese, and spices."
var/nachotrans = /obj/item/weapon/reagent_containers/food/snacks/chip/nacho/cheese
var/chiptrans = /obj/item/weapon/reagent_containers/food/snacks/chip/cheese
- icon = 'icons/obj/food_syn.dmi'
icon_state = "dip_cheese"
- trash = /obj/item/trash/dipbowl
+ trash = /obj/item/trash/small_bowl
bitesize = 1
nutriment_desc = list("queso" = 20)
center_of_mass = list("x"=16, "y"=16)
@@ -5036,74 +5358,19 @@
nutriment_desc = list("guacmole" = 20)
nutriment_amt = 20
-//burritos
-/obj/item/weapon/reagent_containers/food/snacks/burrito
- name = "chilli burrito"
- desc = "Minced meat wrapped in a flour tortilla. It's a burrito by definition."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("tortilla" = 6)
+//Burritos//////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
+ name = "fuego phoron burrito"
+ desc = "A super spicy vegetarian burrito."
+ icon_state = "fuegoburrito"
nutriment_amt = 6
+ nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1)
+ bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
+/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize()
. = ..()
- reagents.add_reagent("protein", 4)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan
- name = "vegan burrito"
- desc = "Tofu wrapped in a flour tortilla."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_vegan"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("tortilla" = 6)
- nutriment_amt = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
- . = ..()
- reagents.add_reagent("tofu", 6)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
- name = "spicy burrito"
- desc = "Spicy meat wrapped in a flour tortilla."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_spicy"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("tortilla" = 6)
- nutriment_amt = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
- name = "carne queso burrito"
- desc = "Meat and melted cheese wrapped in a flour tortilla."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_cheese"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("tortilla" = 6)
- nutriment_amt = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
- name = "el diablo"
- desc = "Meat and an insane amount of chillis packed in a flour tortilla. The Chaplain will see you now."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_hell"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("hellfire" = 6)
- nutriment_amt = 24// 10 Chilis is a lot.
+ reagents.add_reagent("capsaicin", 4)
/obj/item/weapon/reagent_containers/food/snacks/meatburrito
name = "carne asada burrito"
@@ -5129,11 +5396,63 @@
. = ..()
reagents.add_reagent("protein", 2)
+/obj/item/weapon/reagent_containers/food/snacks/eggroll
+ name = "egg roll"
+ desc = "Free with orders over 10 thalers."
+ icon_state = "eggroll"
+ filling_color = "#799ACE"
+ center_of_mass = list("x"=17, "y"=4)
+ nutriment_amt = 4
+ nutriment_desc = list("egg" = 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/eggroll/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito
+ name = "chilli burrito"
+ desc = "Minced meat wrapped in a flour tortilla. It's a burrito by definition."
+ icon_state = "burrito"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("tortilla" = 6)
+ nutriment_amt = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
+ name = "spicy burrito"
+ desc = "Spicy meat wrapped in a flour tortilla."
+ icon_state = "spicyburrito"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("tortilla" = 6)
+ nutriment_amt = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
+ name = "carne queso burrito"
+ desc = "Meat and melted cheese wrapped in a flour tortilla."
+ icon_state = "cheesemeatburrito"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("tortilla" = 6)
+ nutriment_amt = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 6)
+
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
name = "spicy cheese burrito"
desc = "Melted cheese, beans and chillis wrapped in a flour tortilla."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_cheese_spicy"
+ icon_state = "spicycheesemeatburrito"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 6)
@@ -5143,47 +5462,56 @@
. = ..()
reagents.add_reagent("protein", 6)
-/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
- name = "fuego phoron burrito"
- desc = "A super spicy vegetarian burrito."
- icon_state = "fuegoburrito"
- nutriment_amt = 6
- nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize()
- . = ..()
- reagents.add_reagent("capsaicin", 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/breakfast_wrap
- name = "breakfast burrito"
- desc = "Bacon, eggs, cheese, and tortilla grilled to perfection."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "breakfast_wrap"
+/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan
+ name = "vegan burrito"
+ desc = "Tofu wrapped in a flour tortilla."
+ icon_state = "veganburrito"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
nutriment_desc = list("tortilla" = 6)
nutriment_amt = 6
+/obj/item/weapon/reagent_containers/food/snacks/burrito_vegan/Initialize()
+ . = ..()
+ reagents.add_reagent("tofu", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/breakfast_wrap
+ name = "breakfast wrap"
+ desc = "Bacon, eggs, cheese, and tortilla grilled to perfection."
+ icon_state = "breakfastwrap"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("tortilla" = 6)
+ nutriment_amt = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
+ name = "mystery meat burrito"
+ desc = "The mystery is, why aren't you BSAing it?"
+ icon_state = "mysteryburrito"
+ bitesize = 5
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("regret" = 6)
+ nutriment_amt = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
+ name = "el diablo"
+ desc = "Meat and an insane amount of chillis packed in a flour tortilla. The Chaplain will see you now."
+ icon_state = "hellfireburrito"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("hellfire" = 6)
+ nutriment_amt = 24// 10 Chilis is a lot.
+
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
. = ..()
reagents.add_reagent("protein", 9)
reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong
-/obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
- name = "mystery meat burrito"
- desc = "The mystery is, why aren't you BSAing it?"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_mystery"
- bitesize = 5
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("regret" = 6)
- nutriment_amt = 6
+//End Burritos///////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/hatchling_suprise
name = "hatchling suprise"
desc = "A poached egg on top of three slices of bacon. A typical breakfast for hungry Unathi children."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "hatchling_suprise"
trash = /obj/item/trash/snack_bowl
@@ -5195,7 +5523,6 @@
/obj/item/weapon/reagent_containers/food/snacks/red_sun_special
name = "red sun special"
desc = "One lousy piece of sausage sitting on melted cheese curds. A popular utilitarian meal for the Unathi of Moghes."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "red_sun_special"
trash = /obj/item/trash/plate
@@ -5206,7 +5533,6 @@
/obj/item/weapon/reagent_containers/food/snacks/riztizkzi_sea
name = "moghesian sea delight"
desc = "Three raw eggs floating in a sea of blood. An authentic replication of an ancient Unathi delicacy."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "riztizkzi_sea"
trash = /obj/item/trash/snack_bowl
@@ -5217,7 +5543,6 @@
/obj/item/weapon/reagent_containers/food/snacks/father_breakfast
name = "breakfast of champions"
desc = "A sausage and an omelette on top of a grilled steak."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "father_breakfast"
trash = /obj/item/trash/plate
@@ -5229,8 +5554,8 @@
/obj/item/weapon/reagent_containers/food/snacks/stuffed_meatball
name = "stuffed meatball" //YES
desc = "A meatball loaded with cheese."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "stuffed_meatball"
+ trash = /obj/item/trash/small_bowl
/obj/item/weapon/reagent_containers/food/snacks/stuffed_meatball/Initialize()
. = ..()
@@ -5239,7 +5564,6 @@
/obj/item/weapon/reagent_containers/food/snacks/egg_pancake
name = "meat pancake"
desc = "An omelette baked on top of a giant meat patty. This monstrousity is typically shared between four people during a dinnertime meal."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "egg_pancake"
trash = /obj/item/trash/plate
@@ -5248,34 +5572,10 @@
reagents.add_reagent("protein", 6)
reagents.add_reagent("egg", 2)
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
- name = "Njarir Merana Grill"
- desc = "A well-dressed fish, seared to perfection and adorned with herbs and spices in a traditional Nerahni Tajaran style. Can be sliced into proper serving sizes."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "grilled_carp"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
- slices_num = 6
- trash = /obj/item/trash/snacktray
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp/Initialize()
- . = ..()
- reagents.add_reagent("seafood", 12)
-
-/obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
- name = "korlaaskak slice"
- desc = "A well-dressed fillet of carp, seared to perfection and adorned with herbs and spices."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "grilled_carp_slice"
- trash = /obj/item/trash/plate
-
-
-// SYNNONO MEME FOODS EXPANSION - Credit to Synnono from Aurorastation. Come play here sometime :(
-
/obj/item/weapon/reagent_containers/food/snacks/redcurry
name = "red curry"
gender = PLURAL
desc = "A bowl of creamy red curry with meat and rice. This one looks savory."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "redcurry"
trash = /obj/item/trash/snack_bowl
filling_color = "#f73333"
@@ -5292,7 +5592,6 @@
name = "green curry"
gender = PLURAL
desc = "A bowl of creamy green curry with tofu, hot peppers and rice. This one looks spicy!"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "greencurry"
trash = /obj/item/trash/snack_bowl
filling_color = "#58b76c"
@@ -5310,7 +5609,6 @@
name = "yellow curry"
gender = PLURAL
desc = "A bowl of creamy yellow curry with potatoes, peanuts and rice. This one looks mild."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "yellowcurry"
trash = /obj/item/trash/snack_bowl
filling_color = "#bc9509"
@@ -5326,7 +5624,6 @@
/obj/item/weapon/reagent_containers/food/snacks/bearburger
name = "bearburger"
desc = "The solution to your unbearable hunger."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bearburger"
filling_color = "#5d5260"
center_of_mass = list("x"=15, "y"=11)
@@ -5336,50 +5633,9 @@
. = ..()
reagents.add_reagent("protein", 4) //So spawned burgers will not be empty I guess?
-/obj/item/weapon/reagent_containers/food/snacks/bearchili
- name = "bear chili"
- gender = PLURAL
- desc = "A dark, hearty chili. Can you bear the heat?"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "bearchili"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#702708"
- nutriment_amt = 3
- nutriment_desc = list("dark, hearty chili" = 3)
- center_of_mass = list("x"=15, "y"=9)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/bearchili/Initialize()
- . = ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- reagents.add_reagent("hyperzine", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/bearstew
- name = "bear stew"
- gender = PLURAL
- desc = "A thick, dark stew of bear meat and vegetables."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "bearstew"
- filling_color = "#9E673A"
- nutriment_amt = 6
- nutriment_desc = list("hearty stew" = 6)
- center_of_mass = list("x"=16, "y"=5)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/bearstew/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("hyperzine", 5)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
-
/obj/item/weapon/reagent_containers/food/snacks/bibimbap
name = "bibimbap bowl"
desc = "A traditional Korean meal of meat and mixed vegetables. It's served on a bed of rice, and topped with a fried egg."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "bibimbap"
trash = /obj/item/trash/snack_bowl
filling_color = "#4f2100"
@@ -5396,7 +5652,6 @@
name = "lo mein"
gender = PLURAL
desc = "A popular Chinese noodle dish. Chopsticks optional."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "lomein"
trash = /obj/item/trash/plate
filling_color = "#FCEE81"
@@ -5413,7 +5668,6 @@
name = "fried rice"
gender = PLURAL
desc = "A less-boring dish of less-boring rice!"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "friedrice"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
@@ -5425,7 +5679,6 @@
/obj/item/weapon/reagent_containers/food/snacks/chickenfillet
name = "chicken fillet sandwich"
desc = "Fried chicken, in sandwich format. Beauty is simplicity."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "chickenfillet"
filling_color = "#E9ADFF"
nutriment_amt = 4
@@ -5437,45 +5690,9 @@
. = ..()
reagents.add_reagent("protein", 8)
-/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup
- name = "chicken noodle soup"
- gender = PLURAL
- desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "chickennoodlesoup"
- filling_color = "#ead90c"
- nutriment_amt = 6
- nutriment_desc = list("warm soup" = 6)
- center_of_mass = list("x"=16, "y"=5)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("water", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/chilicheesefries
- name = "chili cheese fries"
- gender = PLURAL
- desc = "A mighty plate of fries, drowned in hot chili and cheese sauce. Because your arteries are overrated."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "chilicheesefries"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- nutriment_amt = 8
- nutriment_desc = list("hearty, cheesy fries" = 8)
- center_of_mass = list("x"=16, "y"=11)
- bitesize = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/chilicheesefries/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("capsaicin", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/friedmushroom
name = "fried mushroom"
desc = "A tender, beer-battered plump helmet, fried to crispy perfection."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "friedmushroom"
filling_color = "#EDDD00"
nutriment_amt = 4
@@ -5491,7 +5708,6 @@
name = "pisang goreng"
gender = PLURAL
desc = "Crispy, starchy, sweet banana fritters. Popular street food in parts of Sol."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "pisanggoreng"
trash = /obj/item/trash/plate
filling_color = "#301301"
@@ -5508,7 +5724,6 @@
name = "meat and leaf bun"
desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a meat and cabbage filling."
filling_color = "#DEDEAB"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "meatbun"
nutriment_amt = 5
nutriment_desc = list("fried meat" = 5)
@@ -5522,9 +5737,8 @@
/obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun
name = "char sui meat bun"
desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a traditionally spiced meat filling."
- icon = 'icons/obj/food_syn.dmi'
+ filling_color = "#EDD7D7"
icon_state = "meatbun"
- filling_color = "#edd7d7"
nutriment_amt = 5
nutriment_desc = list("char sui" = 5)
center_of_mass = list("x"=16, "y"=11)
@@ -5537,11 +5751,10 @@
/obj/item/weapon/reagent_containers/food/snacks/custardbun
name = "custard bun"
desc = "A soft, fluffy flour bun also known as baozi. This one is filled with an egg custard."
- icon = 'icons/obj/food_syn.dmi'
+ filling_color = "#EBEDC2"
icon_state = "meatbun"
nutriment_amt = 6
nutriment_desc = list("egg custard" = 6)
- filling_color = "#ebedc2"
center_of_mass = list("x"=16, "y"=11)
bitesize = 6
@@ -5553,7 +5766,6 @@
name = "chicken momo"
gender = PLURAL
desc = "A plate of spiced and steamed chicken dumplings. The style originates from south Asia."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "momo"
trash = /obj/item/trash/snacktray
filling_color = "#edd7d7"
@@ -5570,7 +5782,6 @@
name = "veggie momo"
gender = PLURAL
desc = "A plate of spiced and steamed vegetable dumplings. The style originates from south Asia."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "momo"
trash = /obj/item/trash/snacktray
filling_color = "#edd7d7"
@@ -5587,7 +5798,6 @@
name = "risotto"
gender = PLURAL
desc = "A creamy, savory rice dish from southern Europe, typically cooked slowly with wine and broth. This one has bits of mushroom."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "risotto"
trash = /obj/item/trash/snack_bowl
filling_color = "#edd7d7"
@@ -5604,7 +5814,6 @@
name = "risotto balls"
gender = PLURAL
desc = "Mushroom risotto that has been battered and deep fried. The best use of leftovers!"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "risottoballs"
trash = /obj/item/trash/snack_bowl
filling_color = "#edd7d7"
@@ -5613,22 +5822,9 @@
center_of_mass = list("x"=15, "y"=9)
bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/honeytoast
- name = "piece of honeyed toast"
- desc = "For those who like their breakfast sweet."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "honeytoast"
- trash = /obj/item/trash/plate
- filling_color = "#EDE5AD"
- nutriment_amt = 1
- nutriment_desc = list("sweet, crunchy bread" = 1)
- center_of_mass = list("x"=16, "y"=9)
- bitesize = 4
-
/obj/item/weapon/reagent_containers/food/snacks/poachedegg
name = "poached egg"
desc = "A delicately poached egg with a runny yolk. Healthier than its fried counterpart."
- icon = 'icons/obj/food_syn.dmi'
icon_state = "poachedegg"
trash = /obj/item/trash/plate
filling_color = "#FFDF78"
@@ -5645,7 +5841,6 @@
/obj/item/weapon/reagent_containers/food/snacks/ribplate
name = "plate of ribs"
desc = "A half-rack of ribs, brushed with some sort of honey-glaze. Why are there no napkins on board?"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "ribplate"
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
@@ -5661,290 +5856,6 @@
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("honey", 5)
-//Sliceables
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie
- name = "key lime pie"
- desc = "A tart, sweet dessert. What's a key lime, anyway?"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "keylimepie"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/keylimepieslice
- slices_num = 5
- filling_color = "#F5B951"
- nutriment_amt = 16
- nutriment_desc = list("lime" = 12, "graham crackers" = 4)
- center_of_mass = list("x"=16, "y"=10)
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/keylimepieslice
- name = "slice of key lime pie"
- desc = "A slice of tart pie, with whipped cream on top."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "keylimepieslice"
- trash = /obj/item/trash/plate
- filling_color = "#F5B951"
- bitesize = 3
- nutriment_desc = list("lime" = 1)
- center_of_mass = list("x"=16, "y"=12)
-
-/obj/item/weapon/reagent_containers/food/snacks/keylimepieslice/filled
- nutriment_amt = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/quiche
- name = "quiche"
- desc = "Real men eat this, contrary to popular belief."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "quiche"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/quicheslice
- slices_num = 5
- filling_color = "#F5B951"
- nutriment_amt = 10
- nutriment_desc = list("cheese" = 5, "egg" = 5)
- center_of_mass = list("x"=16, "y"=10)
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/quiche/Initialize()
- . = ..()
- reagents.add_reagent("protein", 10)
-
-/obj/item/weapon/reagent_containers/food/snacks/quicheslice
- name = "slice of quiche"
- desc = "A slice of delicious quiche. Eggy, cheesy goodness."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "quicheslice"
- trash = /obj/item/trash/plate
- filling_color = "#F5B951"
- bitesize = 3
- nutriment_desc = list("cheesy eggs" = 1)
- center_of_mass = list("x"=16, "y"=12)
-
-/obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled
- nutriment_amt = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/quicheslice/filled/Initialize()
- . = ..()
- reagents.add_reagent("protein", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies
- name = "brownies"
- gender = PLURAL
- desc = "Halfway to fudge, or halfway to cake? Who cares!"
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "brownies"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/browniesslice
- slices_num = 4
- trash = /obj/item/trash/brownies
- filling_color = "#301301"
- nutriment_amt = 8
- nutriment_desc = list("fudge" = 8)
- center_of_mass = list("x"=15, "y"=9)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/brownies/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/browniesslice
- name = "brownie"
- desc = "a dense, decadent chocolate brownie."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "browniesslice"
- trash = /obj/item/trash/plate
- filling_color = "#F5B951"
- bitesize = 2
- nutriment_desc = list("fudge" = 1)
- center_of_mass = list("x"=16, "y"=12)
-
-/obj/item/weapon/reagent_containers/food/snacks/browniesslice/filled
- nutriment_amt = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/browniesslice/filled/Initialize()
- . = ..()
- reagents.add_reagent("protein", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies
- name = "cosmic brownies"
- gender = PLURAL
- desc = "Like, ultra-trippy. Brownies HAVE no gender, man." //Except I had to add one!
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "cosmicbrownies"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice
- slices_num = 4
- trash = /obj/item/trash/brownies
- filling_color = "#301301"
- nutriment_amt = 8
- nutriment_desc = list("fudge" = 8)
- center_of_mass = list("x"=15, "y"=9)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("space_drugs", 2)
- reagents.add_reagent("bicaridine", 1)
- reagents.add_reagent("kelotane", 1)
- reagents.add_reagent("toxin", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice
- name = "cosmic brownie"
- desc = "a dense, decadent and fun-looking chocolate brownie."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "cosmicbrowniesslice"
- trash = /obj/item/trash/plate
- filling_color = "#F5B951"
- bitesize = 3
- nutriment_desc = list("fudge" = 1)
- center_of_mass = list("x"=16, "y"=12)
-
-/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled
- nutriment_amt = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/cosmicbrowniesslice/filled/Initialize()
- . = ..()
- reagents.add_reagent("protein", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/lasagna
- name = "lasagna"
- desc = "Meaty, tomato-y, and ready to eat-y. Favorite of cats."
- icon = 'icons/obj/food.dmi'
- icon_state = "lasagna"
- nutriment_amt = 5
- nutriment_desc = list("tomato" = 4, "meat" = 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/lasagna/Initialize()
- . = ..()
- reagents.add_reagent("protein", 2) //For meaty things.
-
-/obj/item/weapon/reagent_containers/food/snacks/gigapuddi
- name = "Astro-Pudding"
- desc = "A crème caramel of astronomical size."
- icon = 'icons/obj/food.dmi'
- icon_state = "gigapuddi"
- nutriment_amt = 20
- nutriment_desc = list("caramel" = 20)
- bitesize = 2
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/happy
- desc = "A crème caramel of astronomical size, made with extra love."
- icon = 'icons/obj/food.dmi'
- icon_state = "happypuddi"
-
-/obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
- desc = "A crème caramel of astronomical size, made with extra hate."
- icon_state = "angerpuddi"
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
- name = "\improper Buche de Noel"
- desc = "Yule love it!"
- icon = 'icons/obj/food.dmi'
- icon_state = "buche"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/bucheslice
- slices_num = 5
- w_class = 2
- nutriment_amt = 20
- nutriment_desc = list("spongy cake" = 20)
- bitesize = 3
- trash = /obj/item/trash/tray
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel/Initialize()
- . = ..()
- reagents.add_reagent("sugar", 9)
- reagents.add_reagent("coco", 5)
-
-/obj/item/weapon/reagent_containers/food/snacks/bucheslice
- name = "\improper Buche de Noel slice"
- desc = "A slice of winter magic."
- icon = 'icons/obj/food.dmi'
- icon_state = "buche_slice"
- trash = /obj/item/trash/plate
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
- name = "turkey"
- desc = "Tastes like chicken."
- icon = 'icons/obj/food.dmi'
- icon_state = "turkey"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
- slices_num = 6
- w_class = 2
- nutriment_amt = 20
- nutriment_desc = list("turkey" = 20)
- bitesize = 5
- trash = /obj/item/trash/tray
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey/Initialize()
- . = ..()
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("cornoil", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/turkeyslice
- name = "turkey drumstick"
- desc = "Forsooth!"
- icon = 'icons/obj/food.dmi'
- icon_state = "turkey_drumstick"
- trash = /obj/item/trash/plate
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter
- name = "suppermatter"
- desc = "Extremely dense and powerful food."
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/suppermattershard
- slices_num = 10
- icon = 'icons/obj/food.dmi'
- icon_state = "suppermatter"
- nutriment_amt = 48
- nutriment_desc = list("pure power" = 48)
- bitesize = 12
- w_class = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/suppermatter/Initialize()
- . = ..()
- set_light(1.4,2,"#FFFF00")
-
-/obj/item/weapon/reagent_containers/food/snacks/suppermattershard
- name = "suppermatter shard"
- desc = "A single portion of power."
- icon = 'icons/obj/food.dmi'
- icon_state = "suppermattershard"
- bitesize = 3
- trash = null
-
-/obj/item/weapon/reagent_containers/food/snacks/suppermattershard/Initialize()
- . = ..()
- set_light(1.4,1.4,"#FFFF00")
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter
- name = "exciting suppermatter"
- desc = "Extremely dense, powerful and exciting food!"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
- slices_num = 10
- icon = 'icons/obj/food.dmi'
- icon_state = "excitingsuppermatter"
- nutriment_amt = 60
- nutriment_desc = list("pure, indescribable power" = 60)
- bitesize = 12
- w_class = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter/Initialize()
- . = ..()
- set_light(1.4,2,"#FF0000")
-
-/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard
- name = "exciting suppermatter shard"
- desc = "A single portion of exciting power!"
- icon = 'icons/obj/food.dmi'
- icon_state = "excitingsuppermattershard"
- bitesize = 4
- trash = null
-
-/obj/item/weapon/reagent_containers/food/snacks/excitingsuppermattershard/Initialize()
- . = ..()
- set_light(1.4,1.4,"#FF0000")
-
/obj/item/weapon/reagent_containers/food/snacks/omurice
name = "omelette rice"
desc = "Just like your Japanese animes!"
@@ -5973,7 +5884,35 @@
nutriment_desc = list("cinnamon sugar" = 4, "frosting" = 4)
bitesize = 1
-////////////////////Candy Vend Items///////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////Candy Vend Items//////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/mint/Initialize()
+ . = ..()
+ reagents.add_reagent("mint", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/mint/admints
+ desc = "Spearmint, peppermint's non-festive cousin."
+ icon = 'icons/obj/food_snacks.dmi'
+ icon_state = "admint"
+
+/obj/item/weapon/storage/box/admints
+ name = "Ad-mints"
+ desc = "A pack of air fresheners for your mouth."
+ description_fluff = "Ad-mints earned their name, and reputation when a Major Bill's senior executive attended a meeting at a large a marketing firm and was so astounded by the quality of their complimentary mints, that he immediately bought the company - the mints company, not the ad agency - and began providing 'Ad-mints' on every MBT flight."
+ icon = 'icons/obj/food_snacks.dmi'
+ icon_state = "admint_pack"
+ item_state = "candy"
+ slot_flags = SLOT_EARS
+ w_class = 1
+ starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints = 6)
+ can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/mint/admints)
+ use_sound = 'sound/items/drop/paper.ogg'
+ drop_sound = 'sound/items/drop/wrapper.ogg'
+ max_storage_space = 6
+ foldable = null
+ trash = /obj/item/trash/admints
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
@@ -6010,7 +5949,7 @@
foldable = null
/obj/item/weapon/reagent_containers/food/snacks/candy
- name = "\improper Grandma Ellen's Hard Candy"
+ name = "\improper Grandma Ellen's Candy Bar"
desc = "Now without nuts!"
description_fluff = "Hard candies were banned from many early human colony ships due to the tendency for brittle, sticky chunks to find their way inside vital equipment in zero-G conditions. This only made them all the more popular to new arrivees, and the Grandma Ellen's brand was Tau Ceti's answer to that demand."
icon = 'icons/obj/food_snacks.dmi'
@@ -6100,7 +6039,9 @@
. = ..()
reagents.add_reagent("sugar", 4)
-////////////////////Candy Bars (1-10)///////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+//////////////////////////////Candy Bars (1-10)//////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/cb01
name = "\improper Tau Ceti Bar"
@@ -6289,6 +6230,16 @@
nutriment_amt = 3
nutriment_desc = list("salt" = 1, "barbeque sauce" = 2)
+/obj/item/weapon/reagent_containers/food/snacks/chips/snv
+ name = "\improper Mike's Salt & Vinegar Chips"
+ desc = "Painful to eat yet you just can't stop!"
+ description_fluff = "Mike's Salt & Vinegar chips have been a staple of parties and events for decades, the chosen secondary dish to ordinary chips."
+ icon = 'icons/obj/food_snacks.dmi'
+ icon_state = "chips_snv"
+ trash = /obj/item/trash/chips/snv
+ nutriment_amt = 3
+ nutriment_desc = list("salt" = 1, "vinegar" = 2)
+
/obj/item/weapon/reagent_containers/food/snacks/tastybread
name = "bread tube"
desc = "Bread in a tube. Chewy...and surprisingly tasty."
@@ -6952,38 +6903,26 @@
. = ..()
reagents.add_reagent("milk", 8)
-////////Packaged Food - break open and eat (ADDED 04/11/2021 - possible snack upgrade for later)///////
+/obj/item/weapon/reagent_containers/food/snacks/canned/ntbeans
+ name = "baked beans"
+ icon_state = "ntbeans"
+ desc = "Musical fruit in a slightly less musical container. Now with bacon!"
+ trash = /obj/item/trash/ntbeans
+ filling_color = "#FC6F28"
+ center_of_mass = list("x"=15, "y"=9)
+ nutriment_desc = list("beans" = 4)
+ nutriment_amt = 6
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/canned/ntbeans/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 2)
+
+//////////////Packaged Food - break open and eat//////////////
/obj/item/weapon/reagent_containers/food/snacks/packaged
- name = "void package"
- icon = 'icons/obj/food_canned.dmi'
- flags = 0
- var/sealed = TRUE
- var/waste_type = null
-
-/obj/item/weapon/reagent_containers/food/snacks/packaged/Initialize()
- . = ..()
- if(!sealed)
- unseal()
-
-/obj/item/weapon/reagent_containers/food/snacks/packaged/examine(mob/user)
- . = ..()
- to_chat(user, "It is [sealed ? "" : "un"]wrapped.")
-
-/obj/item/weapon/reagent_containers/food/snacks/packaged/proc/unseal()
- flags |= OPENCONTAINER
- sealed = FALSE
- update_icon()
-
-/obj/item/weapon/reagent_containers/food/snacks/packaged/attack_self(var/mob/user)
- if(sealed)
- playsound(loc,'sound/effects/packagedfoodopen.ogg', rand(10,50), 1)
- to_chat(user, "You unseal \the [src] with a tear of plastic.")
- unseal()
-
-/obj/item/weapon/reagent_containers/food/snacks/packaged/update_icon()
- if(!sealed)
- icon_state = "[initial(icon_state)]-open"
+ icon = 'icons/obj/food_package.dmi'
+ package = TRUE
//////////////Lunar Cakes - proof of concept//////////////
@@ -6991,7 +6930,8 @@
name = "\improper Lunar Cake"
icon_state = "lunacake"
desc = "Now with 20% less lawsuit enabling rhegolith!"
- //trash = /obj/item/trash/lunacakewrap //need to add code that drops trash but keeps -open state
+ package_trash = /obj/item/trash/lunacakewrap
+ package_open_state = "lunacake_open"
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
@@ -7002,7 +6942,8 @@
name = "\improper Dark Lunar Cake"
icon_state = "mooncake"
desc = "Explore the dark side! May contain trace amounts of reconstituted cocoa."
- //trash = /obj/item/trash/mooncakewrap //need to add code that drops trash but keeps -open state
+ package_trash = /obj/item/trash/mooncakewrap
+ package_open_state = "lunacake_open"
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
@@ -7013,7 +6954,8 @@
name = "\improper Mochi Cake"
icon_state = "mochicake"
desc = "Konnichiwa! Many go lucky rice cakes in future!"
- //trash = /obj/item/trash/mochicakewrap //need to add code that drops trash but keeps -open state
+ package_trash = /obj/item/trash/mochicakewrap
+ package_open_state = "lunacake_open"
filling_color = "#ffffff"
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 6
@@ -7022,16 +6964,18 @@
//////////////Advanced Package Foods//////////////
-/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie //ADDED 04/14/2021
+/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie
name = "\improper Spacer Snack Cake"
- icon = 'icons/obj/food_canned.dmi'
- icon_state = "spacer_cake"
+ icon_state = "spacercake"
desc = "Guaranteed to survive longer than you will."
- description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been statistically proven to lower survival rates on all missions where it is present."
- trash = /obj/item/trash/spacer_cake_wrap
+ description_fluff = "Despite Spacer advertisements consistently portraying their snack cakes as life-saving, \
+ tear-jerking survival food for spacers in all kinds of dramatic scenarios, the Spacer Snack Cake has been \
+ statistically proven to lower survival rates on all missions where it is present."
+ package_trash = /obj/item/trash/spacercake_wrap
+ package_open_state = "spacercake_open"
filling_color = "#FFE591"
center_of_mass = list("x"=15, "y"=11)
- nutriment_amt = 6
+ nutriment_amt = 4
nutriment_desc = list("sweetness" = 4, "cake" = 2)
bitesize = 2
@@ -7039,27 +6983,27 @@
. = ..()
reagents.add_reagent("sugar", 4)
-/obj/item/weapon/reagent_containers/food/snacks/packaged/genration //ADDED 04/20/2021
+/obj/item/weapon/reagent_containers/food/snacks/packaged/genration
name = "generic ration"
- icon = 'icons/obj/food_canned.dmi'
icon_state = "genration"
desc = "The most basic form of ration - meant to barely sustain life."
trash = /obj/item/trash/genration
+ package_open_state = "genration_open"
filling_color = "#FFFFFF"
center_of_mass = list("x"=15, "y"=11)
- nutriment_amt = 3
+ nutriment_amt = 4
nutriment_desc = list("chalk" = 6)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration //ADDED 04/20/2021
+/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration
name = "meat ration"
- icon = 'icons/obj/food_canned.dmi'
icon_state = "meatration"
desc = "A meat flavored ration. Emphasis on 'meat flavored' as there is likely no real meat in this."
trash = /obj/item/trash/meatration
+ package_open_state = "meatration_open"
filling_color = "#FFFFFF"
center_of_mass = list("x"=15, "y"=11)
- nutriment_amt = 6
+ nutriment_amt = 4
nutriment_desc = list("chalk" = 3, "meat" = 3)
bitesize = 2
@@ -7067,26 +7011,27 @@
. = ..()
reagents.add_reagent("protein", 3)
-/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration //ADDED 04/20/2021
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration
name = "veggie ration"
- icon = 'icons/obj/food_canned.dmi'
icon_state = "vegration"
desc = "Dried veggies in a bag. Depressing and near flavorless."
trash = /obj/item/trash/vegration
+ package_open_state = "vegration_open"
filling_color = "#FFFFFF"
center_of_mass = list("x"=15, "y"=11)
- nutriment_amt = 3
+ nutriment_amt = 4
nutriment_desc = list("sadness" = 3, "veggie" = 3)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration //ADDED 04/20/2021 (Contraband Item)
+/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration
name = "desert ration"
- icon = 'icons/obj/food_canned.dmi'
icon_state = "baseration"
desc = "A rare ration from an era gone by filled with a sweet tasty treat that no modern company has been able to recreate."
trash = /obj/item/trash/sweetration
+ package_open_state = "baseration_open"
filling_color = "#FFFFFF"
center_of_mass = list("x"=15, "y"=11)
+ nutriment_amt = 4
nutriment_desc = list("sweetness" = 5, "cake" = 1)
bitesize = 2
@@ -7094,35 +7039,41 @@
. = ..()
reagents.add_reagent("sugar", 6)
-/obj/item/weapon/reagent_containers/food/snacks/vendor_burger
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger
name = "packaged burger"
- icon_state = "packburger"
+ icon_state = "smolburger"
desc = "A burger stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!"
- package = TRUE
- package_trash = /obj/item/trash/vendor_burger
- package_open_state = "smolcheeseburger"
+ package_trash = /obj/item/trash/smolburger
+ package_open_state = "smolburger_open"
nutriment_amt = 3
nutriment_desc = list("stale burger" = 3)
- starts_with = list("sodiumchloride" = 1)
-/obj/item/weapon/reagent_containers/food/snacks/vendor_hotdog
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburger/Initialize()
+ . = ..()
+ reagents.add_reagent("sodiumchloride", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog
name = "packaged hotdog"
- icon_state = "packhotdog"
+ icon_state = "smolhotdog"
desc = "A hotdog stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!"
- package = TRUE
- package_trash = /obj/item/trash/vendor_hotdog
- package_open_state = "smolhotdog"
+ package_trash = /obj/item/trash/smolhotdog
+ package_open_state = "smolhotdog_open"
nutriment_amt = 3
nutriment_desc = list("stale hotdog" = 3)
- starts_with = list("sodiumchloride" = 1)
-/obj/item/weapon/reagent_containers/food/snacks/vendor_burrito
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendhotdog/Initialize()
+ . = ..()
+ reagents.add_reagent("sodiumchloride", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito
name = "packaged burrito"
- icon_state = "packburrito"
+ icon_state = "smolburrito"
desc = "A burrito stored in a plastic wrapping for vending machine distribution. Surely it tastes fine!"
- package = TRUE
- package_trash = /obj/item/trash/vendor_burrito
- package_open_state = "smolburrito"
+ package_trash = /obj/item/trash/smolburrito
+ package_open_state = "smolburrito_open"
nutriment_amt = 3
nutriment_desc = list("stale burrito" = 3)
- starts_with = list("sodiumchloride" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/packaged/vendburrito/Initialize()
+ . = ..()
+ reagents.add_reagent("sodiumchloride", 1)
diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm
index 394a8b9fc6..c95ddd3d1d 100644
--- a/code/modules/food/food/snacks/meat.dm
+++ b/code/modules/food/food/snacks/meat.dm
@@ -46,12 +46,11 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
desc = "Tastes like... well, you know."
-
+
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
name = "chicken"
- icon = 'icons/obj/food_syn.dmi'
icon_state = "chickenbreast"
- cooked_icon = "chickenbreast_cooked"
+ cooked_icon = "chickensteak"
filling_color = "#BBBBAA"
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize()
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index f8509d4392..132bba78ec 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -125,7 +125,7 @@
desc = "A soup both spicy and sour from ancient Earth cooking traditions. This one is made with tofu."
icon = 'icons/obj/food_vr.dmi'
icon_state = "hotandsoursoup"
- trash = /obj/item/trash/snack_bowl
+ trash = /obj/item/trash/asian_bowl
nutriment_amt = 6
nutriment_desc = list("spicyness" = 4, "sourness" = 4, "tofu" = 1)
@@ -139,7 +139,7 @@
desc = "A purported favorite of kitsunes in ancient japanese myth: udon noodles, fried egg, and tofu."
icon = 'icons/obj/food_vr.dmi'
icon_state = "kitsuneudon"
- trash = /obj/item/trash/snack_bowl
+ trash = /obj/item/trash/asian_bowl
nutriment_amt = 6
nutriment_desc = list("fried egg" = 2, "egg noodles" = 4)
@@ -152,7 +152,7 @@
desc = "Sweet, spicy, and fried. General's Chicken has been around for more than five-hundred years now, and still tastes good."
icon = 'icons/obj/food_vr.dmi'
icon_state = "generaltso"
- trash = /obj/item/trash/plate
+ trash = /obj/item/trash/asian_bowl
nutriment_amt = 6
nutriment_desc = list("sweet and spicy sauce" = 5, "chicken" = 3)
@@ -162,9 +162,9 @@
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
- name = "grubmeat"
+ name = "grub meat"
desc = "A slab of grub meat, it gives a gentle shock if you touch it"
- icon = 'icons/obj/food_vr.dmi'
+ icon = 'icons/obj/food.dmi'
icon_state = "grubmeat"
center_of_mass = list("x"=16, "y"=10)
@@ -388,6 +388,7 @@
desc = "Finally, some food for real men."
icon = 'icons/obj/food_vr.dmi'
icon_state = "sharkmeat_cooked"
+ trash = /obj/item/trash/small_bowl
nutriment_amt = 5
trash = /obj/item/trash/plate
nutriment_desc = list("manliness" = 1, "fish oil" = 2, "shark" = 2)
@@ -586,6 +587,20 @@
reagents.add_reagent("protein", 2)
bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/milosoup
+ name = "Miso soup"
+ desc = "The universes best soup! Yum!!!"
+ icon_state = "milosoup"
+ trash = /obj/item/trash/snack_bowl
+ center_of_mass = list("x"=16, "y"=7)
+ nutriment_amt = 8
+ nutriment_desc = list("soy" = 8)
+ bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/milosoup/Initialize()
+ . = ..()
+ reagents.add_reagent("water", 5)
+
/obj/item/weapon/reagent_containers/food/snacks/onionsoup
name = "Onion Soup"
desc = "A soup with layers."
diff --git a/code/modules/food/food/z_custom_food_vr.dm b/code/modules/food/food/z_custom_food_vr.dm
index bc466d3a44..c72718c7ba 100644
--- a/code/modules/food/food/z_custom_food_vr.dm
+++ b/code/modules/food/food/z_custom_food_vr.dm
@@ -8,7 +8,6 @@ var/global/ingredientLimit = 20000
/obj/item/weapon/reagent_containers/food/snacks/customizable
icon = 'icons/obj/food_custom.dmi'
- trash = /obj/item/trash/plate
bitesize = 2
var/ingMax = 20000
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index e51aca24cc..4619cf760c 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -308,7 +308,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
reagents = list("spacespice" = 1)
- result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker
+ result = /obj/item/weapon/reagent_containers/food/snacks/cheesetoast
result_quantity = 4
/datum/recipe/bacongrill
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index a84e4cae1b..95260876f4 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -123,12 +123,12 @@ I said no!
items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
-/datum/recipe/microchips
+/datum/recipe/microfries
appliance = MICROWAVE
items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawsticks
)
- result = /obj/item/weapon/reagent_containers/food/snacks/microchips
+ result = /obj/item/weapon/reagent_containers/food/snacks/microfries
/datum/recipe/bangersandmash
items = list(
@@ -330,9 +330,14 @@ I said no!
/datum/recipe/candiedapple
fruit = list("apple" = 1)
- reagents = list("water" = 5, "sugar" = 5)
+ reagents = list("water" = 5, "sugar" = 5) //Makes sense seeing as how it's just syrup on the exterior
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
+/datum/recipe/caramelapple
+ fruit = list("apple" = 1)
+ reagents = list("milk" = 5, "sugar" = 5) //Since caramel can be made with milk I thought this was appropriate
+ result = /obj/item/weapon/reagent_containers/food/snacks/caramelapple
+
/datum/recipe/twobread
reagents = list("wine" = 5)
items = list(
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index ff4fdc44f2..4b92b1e315 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -1,9 +1,9 @@
-/datum/recipe/ovenchips
+/datum/recipe/ovenfries
appliance = OVEN
items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawsticks
)
- result = /obj/item/weapon/reagent_containers/food/snacks/ovenchips
+ result = /obj/item/weapon/reagent_containers/food/snacks/ovenfries
//Roasts
//---------------
@@ -512,13 +512,23 @@
/datum/recipe/pancakes
appliance = OVEN
- fruit = list("berries" = 2)
+ reagents = list("milk" = 5, "sugar" = 15)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/pancakes
+/datum/recipe/pancakes/berry
+ appliance = OVEN
+ fruit = list("berries" = 2)
+ reagents = list("milk" = 5, "sugar" = 15)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
+ /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pancakes/berry
+
/datum/recipe/lasagna
appliance = OVEN
fruit = list("tomato" = 2, "eggplant" = 1)
diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm
index 8e10bedb70..0b611480ef 100644
--- a/code/modules/reagents/reagents/food_drinks.dm
+++ b/code/modules/reagents/reagents/food_drinks.dm
@@ -452,6 +452,14 @@
color = "#792300"
allergen_type = ALLERGEN_BEANS //Soy (beans)
+/datum/reagent/nutriment/vinegar
+ name = "Vinegar"
+ id = "vinegar"
+ description = "vinegar, great for fish and pickles."
+ taste_description = "vinegar"
+ reagent_state = LIQUID
+ nutriment_factor = 5
+ color = "#54410C"
/datum/reagent/nutriment/ketchup
name = "Ketchup"
@@ -463,6 +471,15 @@
color = "#731008"
allergen_type = ALLERGEN_FRUIT //Tomatoes are a fruit.
+/datum/reagent/nutriment/mustard
+ name = "Mustard"
+ id = "mustard"
+ description = "Delicious mustard. Good on Hot Dogs."
+ taste_description = "mustard"
+ reagent_state = LIQUID
+ nutriment_factor = 5
+ color = "#E3BD00"
+
/datum/reagent/nutriment/barbecue
name = "Barbeque Sauce"
id = "barbecue"
@@ -673,7 +690,7 @@
M.bodytemperature -= rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you cold.
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", pick("You feel like your insides are freezing!", "Your insides feel like they're turning to ice!"))
- // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent("capsaicin", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/frostoil/cryotoxin //A longer lasting version of frost oil.
name = "Cryotoxin"
@@ -719,7 +736,7 @@
M.bodytemperature += rand(1, 5) * M.species.spice_mod // Really fucks you up, cause it makes you overheat, too.
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", pick("You feel like your insides are burning!", "You feel like your insides are on fire!", "You feel like your belly is full of lava!"))
- // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/datum/reagent/condensedcapsaicin
name = "Condensed Capsaicin"
@@ -863,7 +880,7 @@
M.apply_effect(4, AGONY, 0)
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]", "You feel like your insides are burning!")
- // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
+ // holder.remove_reagent("frostoil", 5) // VOREStation Edit: Nop, we don't instadelete spices for free.
/* Drinks */
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index aac77fedc8..e10e8e42a4 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/food_canned.dmi b/icons/obj/food_canned.dmi
index 78177169de..606ca9f6e4 100644
Binary files a/icons/obj/food_canned.dmi and b/icons/obj/food_canned.dmi differ
diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi
index ee26eb7777..cc8a4dc84b 100644
Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ
diff --git a/icons/obj/food_package.dmi b/icons/obj/food_package.dmi
new file mode 100644
index 0000000000..f9c30c9608
Binary files /dev/null and b/icons/obj/food_package.dmi differ
diff --git a/icons/obj/food_snacks.dmi b/icons/obj/food_snacks.dmi
index f9d4b247f2..2bf14581c0 100644
Binary files a/icons/obj/food_snacks.dmi and b/icons/obj/food_snacks.dmi differ
diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi
deleted file mode 100644
index d76d214357..0000000000
Binary files a/icons/obj/food_syn.dmi and /dev/null differ
diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi
index b48ff80698..9adbcc00c5 100644
Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ
diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi
index 186a787734..98b6c9b60f 100644
Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ