diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm
index 645af5e8aea..2e953f3ec91 100644
--- a/code/datums/recipe.dm
+++ b/code/datums/recipe.dm
@@ -42,7 +42,7 @@
var/byproduct // example: = /obj/item/weapon/kitchen/mould // byproduct to return, such as a mould or trash
-/datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous
+/datum/recipe/proc/check_reagents(datum/reagents/avail_reagents) //1=precisely, 0=insufficiently, -1=superfluous
. = 1
for(var/r_r in reagents)
var/aval_r_amnt = avail_reagents.get_reagent_amount(r_r)
@@ -55,7 +55,7 @@
return -1
return .
-/datum/recipe/proc/check_fruit(var/obj/container)
+/datum/recipe/proc/check_fruit(obj/container)
. = 1
if(fruit && fruit.len)
var/list/checklist = list()
@@ -74,7 +74,7 @@
break
return .
-/datum/recipe/proc/check_items(var/obj/container as obj)
+/datum/recipe/proc/check_items(obj/container)
. = 1
if(items && items.len)
var/list/checklist = list()
@@ -96,7 +96,7 @@
return .
//general version
-/datum/recipe/proc/make(var/obj/container as obj)
+/datum/recipe/proc/make(obj/container)
var/obj/result_obj = new result(container)
for(var/obj/O in (container.contents-result_obj))
O.reagents.trans_to(result_obj, O.reagents.total_volume)
@@ -106,7 +106,7 @@
return result_obj
// food-related
-/datum/recipe/proc/make_food(var/obj/container as obj)
+/datum/recipe/proc/make_food(obj/container)
var/obj/result_obj = new result(container)
for(var/obj/O in (container.contents-result_obj))
if(O.reagents)
@@ -118,7 +118,7 @@
score_meals++
return result_obj
-/proc/select_recipe(var/list/datum/recipe/avaiable_recipes, var/obj/obj as obj, var/exact = 1 as num)
+/proc/select_recipe(list/datum/recipe/avaiable_recipes, obj/obj, exact = 1)
if(!exact)
exact = -1
var/list/datum/recipe/possible_recipes = new
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 15ce27b7d5c..0814bf988f4 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -81,7 +81,7 @@
refill = reagents.get_master_reagent_id()
refillName = reagents.get_master_reagent_name()
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+ var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, " You transfer [trans] units of the solution to [target].")
if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
@@ -102,22 +102,22 @@
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
- if(src.reagents)
- src.reagents.chem_temp += 15
+ if(reagents)
+ reagents.chem_temp += 15
to_chat(user, "You heat [src] with [I].")
- src.reagents.handle_reactions()
+ reagents.handle_reactions()
/obj/item/weapon/reagent_containers/food/drinks/examine(mob/user)
if(!..(user, 1))
return
- if(!reagents || reagents.total_volume==0)
+ if(!reagents || reagents.total_volume == 0)
to_chat(user, " \The [src] is empty!")
- else if(reagents.total_volume<=src.volume/4)
+ else if(reagents.total_volume <= volume/4)
to_chat(user, " \The [src] is almost empty!")
- else if(reagents.total_volume<=src.volume*0.66)
+ else if(reagents.total_volume <= volume*0.66)
to_chat(user, " \The [src] is half full!")// We're all optimistic, right?!
- else if(reagents.total_volume<=src.volume*0.90)
+ else if(reagents.total_volume <= volume*0.90)
to_chat(user, " \The [src] is almost full!")
else
to_chat(user, " \The [src] is full!")
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index 8928c5e8c57..7ee7509d8f1 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -22,9 +22,9 @@
else
user.drop_item()
user.put_in_active_hand(B)
- B.icon_state = src.icon_state
+ B.icon_state = icon_state
- var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
+ var/icon/I = new('icons/obj/drinks.dmi', icon_state)
I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
B.icon = I
@@ -99,11 +99,11 @@
//Display an attack message.
if(target != user)
- target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [src.name]!", \
- "[user] has hit [target][head_attack_message] with a bottle of [src.name]!")
+ target.visible_message("[user] has hit [target][head_attack_message] with a bottle of [name]!", \
+ "[user] has hit [target][head_attack_message] with a bottle of [name]!")
else
- user.visible_message("[target] hits \himself with a bottle of [src.name][head_attack_message]!", \
- "[target] hits \himself with a bottle of [src.name][head_attack_message]!")
+ user.visible_message("[target] hits \himself with a bottle of [name][head_attack_message]!", \
+ "[target] hits \himself with a bottle of [name][head_attack_message]!")
//Attack logs
add_logs(user, target, "attacked", src)
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index 6d72ec2221c..89deed5dedd 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -9,7 +9,7 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/attack_self(mob/user)
if(canopened == 0)
- playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1)
+ playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
to_chat(user, "You open the drink with an audible pop!")
canopened = 1
flags |= OPENCONTAINER
@@ -32,7 +32,7 @@
if(canopened == 0)
to_chat(user, "You need to open the drink!")
return
- else if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
+ else if(M == user && !reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
user.visible_message("[user] crushes ["\the [src]"] on \his forehead!", "You crush \the [src] on your forehead.")
crush(user)
return
diff --git a/code/modules/food_and_drinks/food/candy.dm b/code/modules/food_and_drinks/food/candy.dm
index d13eb7ec145..32a4a584a88 100644
--- a/code/modules/food_and_drinks/food/candy.dm
+++ b/code/modules/food_and_drinks/food/candy.dm
@@ -13,9 +13,6 @@
icon = 'icons/obj/food/candy.dmi'
icon_state = "candy"
-/obj/item/weapon/reagent_containers/food/snacks/candy/New()
- ..()
-
// ***********************************************************
// Candy Ingredients / Flavorings / Byproduct
// ***********************************************************
@@ -25,76 +22,53 @@
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("chocolate",4)
bitesize = 2
+ list_reagents = list("nutriment" = 2, "chocolate" = 4)
/obj/item/weapon/reagent_containers/food/snacks/candy/caramel
name = "Caramel"
desc = "Chewy and dense, yet it practically melts in your mouth!"
icon_state = "caramel"
filling_color = "#DB944D"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/caramel/New()
- ..()
- reagents.add_reagent("cream", 2)
- reagents.add_reagent("sugar", 2)
bitesize = 2
+ list_reagents = list("cream" = 2, "sugar" = 2)
+
/obj/item/weapon/reagent_containers/food/snacks/candy/toffee
name = "Toffee"
desc = "A hard, brittle candy with a distinctive taste."
icon_state = "toffee"
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/toffee/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 3)
bitesize = 2
+ list_reagents = list("nutriment" = 3, "sugar" = 3)
/obj/item/weapon/reagent_containers/food/snacks/candy/nougat
name = "Nougat"
desc = "A soft, chewy candy commonly found in candybars."
icon_state = "nougat"
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/nougat/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 3)
- spawn(1)
- reagents.del_reagent("egg")
- reagents.update_total()
bitesize = 2
+ list_reagents = list("nutriment" = 3, "sugar" = 3)
/obj/item/weapon/reagent_containers/food/snacks/candy/taffy
name = "Saltwater Taffy"
desc = "Old fashioned saltwater taffy. Chewy!"
icon_state = "candy1"
filling_color = "#7D5F46"
+ bitesize = 2
+ list_reagents = list("nutriment" = 3, "sugar" = 3)
/obj/item/weapon/reagent_containers/food/snacks/candy/taffy/New()
..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/fudge
name = "Fudge"
desc = "Chocolate fudge, a timeless classic treat."
icon_state = "fudge"
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/New()
- ..()
- reagents.add_reagent("cream", 3)
- reagents.add_reagent("chocolate",6)
bitesize = 3
+ list_reagents = list("cream" = 3, "chocolate" = 6)
/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/peanut
name = "Peanut Fudge"
@@ -113,10 +87,7 @@
desc = "An extra creamy fudge with bits of real chocolate cookie mixed in. Crunchy!"
icon_state = "fudge_cookies_n_cream"
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/cookies_n_cream/New()
- ..()
- reagents.add_reagent("cream", 3)
+ list_reagents = list("cream" = 6, "chocolate" = 6)
/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/turtle
name = "Turtle Fudge"
@@ -132,24 +103,16 @@
name = "Donor Candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/donor/New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("sugar", 3)
bitesize = 5
+ list_reagents = list("nutriment" = 10, "sugar" = 3)
/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
icon_state = "candycorn"
filling_color = "#FFFCB0"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/candy_corn/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
bitesize = 2
+ list_reagents = list("nutriment" = 4, "sugar" = 2)
// ***********************************************************
// Candy Products (plain / unflavored)
@@ -161,11 +124,8 @@
icon_state = "cottoncandy_plain"
trash = /obj/item/weapon/c_tube
filling_color = "#FFFFFF"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/New()
- ..()
- reagents.add_reagent("sugar", 15)
- bitesize = 3
+ bitesize = 4
+ list_reagents = list("sugar" = 15)
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar
name = "candy"
@@ -173,92 +133,64 @@
icon_state = "candy"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("chocolate",5)
bitesize = 3
+ list_reagents = list("nutriment" = 2, "chocolate" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/candycane
name = "candy cane"
desc = "A festive mint candy cane."
icon_state = "candycane"
filling_color = "#F2F2F2"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/candycane/New()
- ..()
- reagents.add_reagent("minttoxin", 1)
- reagents.add_reagent("sugar", 5)
bitesize = 2
+ list_reagents = list("minttoxin" = 1, "sugar" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear
name = "gummy bear"
desc = "A small edible bear. It's squishy and chewy!"
icon_state = "gbear"
filling_color = "#FFFFFF"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/New()
- ..()
- reagents.add_reagent("sugar", 10)
bitesize = 3
+ list_reagents = list("sugar" = 10)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
filling_color = "#FFFFFF"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/New()
- ..()
- reagents.add_reagent("sugar", 10)
bitesize = 3
+ list_reagents = list("sugar" = 10)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas."
icon_state = "jbean"
filling_color = "#FFFFFF"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/New()
- ..()
- reagents.add_reagent("sugar", 10)
bitesize = 3
+ list_reagents = list("sugar" = 10)
/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker
name = "jawbreaker"
desc = "An unbelievably hard candy. The name is fitting."
icon_state = "jawbreaker"
filling_color = "#ED0758"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker/New()
- ..()
- reagents.add_reagent("sugar", 10)
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
+ list_reagents = list("sugar" = 10)
/obj/item/weapon/reagent_containers/food/snacks/candy/cash
name = "candy cash"
desc = "Not legal tender. Tasty though."
icon_state = "candy_cash"
filling_color = "#302000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cash/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("chocolate", 4)
bitesize = 2
+ list_reagents = list("nutriment" = 2, "chocolate" = 4)
/obj/item/weapon/reagent_containers/food/snacks/candy/coin
name = "chocolate coin"
desc = "Probably won't work in the vending machines."
icon_state = "choc_coin"
filling_color = "#302000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/coin/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("chocolate",4)
bitesize = 3
+ list_reagents = list("nutriment" = 2, "chocolate" = 4)
/obj/item/weapon/reagent_containers/food/snacks/candy/gum
name = "bubblegum"
@@ -266,22 +198,15 @@
icon_state = "bubblegum"
trash = /obj/item/trash/gum
filling_color = "#FF7495"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gum/New()
- ..()
- reagents.add_reagent("sugar", 5)
bitesize = 0.2
+ list_reagents = list("sugar" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/sucker
name = "sucker"
desc = "For being such a good sport!"
icon_state = "sucker"
filling_color = "#FFFFFF"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/sucker/New()
- ..()
- reagents.add_reagent("sugar", 10)
- bitesize = 1
+ list_reagents = list("sugar" = 10)
// ***********************************************************
// Gummy Bear Flavors
@@ -292,91 +217,56 @@
desc = "A small edible bear. It's red!"
icon_state = "gbear_red"
filling_color = "#801E28"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/red/New()
- ..()
- reagents.add_reagent("cherryjelly", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "cherryjelly" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue/New()
- ..()
- reagents.add_reagent("berryjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "berryjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison
name = "gummy bear"
desc = "A small edible bear. It's blue!"
icon_state = "gbear_blue"
filling_color = "#863353"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison/New()
- ..()
- reagents.add_reagent("poisonberryjuice", 12)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 3
+ list_reagents = list("poisonberryjuice" = 12)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green
name = "gummy bear"
desc = "A small edible bear. It's green!"
icon_state = "gbear_green"
filling_color = "#365E30"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green/New()
- ..()
- reagents.add_reagent("limejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "limejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow
name = "gummy bear"
desc = "A small edible bear. It's yellow!"
icon_state = "gbear_yellow"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow/New()
- ..()
- reagents.add_reagent("lemonjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "lemonjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange
name = "gummy bear"
desc = "A small edible bear. It's orange!"
icon_state = "gbear_orange"
filling_color = "#E78108"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange/New()
- ..()
- reagents.add_reagent("orangejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "orangejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple
name = "gummy bear"
desc = "A small edible bear. It's purple!"
icon_state = "gbear_purple"
filling_color = "#993399"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple/New()
- ..()
- reagents.add_reagent("grapejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "grapejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf
name = "gummy bear"
desc = "A small bear. Wait... what?"
icon_state = "gbear_wtf"
filling_color = "#60A584"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf/New()
- ..()
- reagents.add_reagent("space_drugs", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "space_drugs" = 2)
// ***********************************************************
// Gummy Worm Flavors
@@ -387,91 +277,56 @@
desc = "An edible worm, made from gelatin. It's red!"
icon_state = "gworm_red"
filling_color = "#801E28"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/red/New()
- ..()
- reagents.add_reagent("cherryjelly", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "cherryjelly" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue/New()
- ..()
- reagents.add_reagent("berryjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "berryjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's blue!"
icon_state = "gworm_blue"
filling_color = "#863353"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison/New()
- ..()
- reagents.add_reagent("poisonberryjuice", 12)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 3
+ list_reagents = list("poisonberryjuice" = 12)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's green!"
icon_state = "gworm_green"
filling_color = "#365E30"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green/New()
- ..()
- reagents.add_reagent("limejuice", 10)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "limejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's yellow!"
icon_state = "gworm_yellow"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow/New()
- ..()
- reagents.add_reagent("lemonjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "lemonjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's orange!"
icon_state = "gworm_orange"
filling_color = "#E78108"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange/New()
- ..()
- reagents.add_reagent("orangejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "orangejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple
name = "gummy worm"
desc = "An edible worm, made from gelatin. It's purple!"
icon_state = "gworm_purple"
filling_color = "#993399"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple/New()
- ..()
- reagents.add_reagent("grapejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "grapejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf
name = "gummy worm"
desc = "An edible worm. Did it just move?"
icon_state = "gworm_wtf"
filling_color = "#60A584"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf/New()
- ..()
- reagents.add_reagent("space_drugs", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "space_drugs" = 2)
// ***********************************************************
// Jelly Bean Flavors
@@ -482,146 +337,91 @@
desc = "A candy bean, guarenteed to not give you gas. It's red!"
icon_state = "jbean_red"
filling_color = "#801E28"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/red/New()
- ..()
- reagents.add_reagent("cherryjelly", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "cherryjelly" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue/New()
- ..()
- reagents.add_reagent("berryjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "berryjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's blue!"
icon_state = "jbean_blue"
filling_color = "#863353"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison/New()
- ..()
- reagents.add_reagent("poisonberryjuice", 12)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 3
+ list_reagents = list("poisonberryjuice" = 12)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's green!"
icon_state = "jbean_green"
filling_color = "#365E30"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green/New()
- ..()
- reagents.add_reagent("limejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "limejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's yellow!"
icon_state = "jbean_yellow"
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow/New()
- ..()
- reagents.add_reagent("lemonjuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "lemonjuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's orange!"
icon_state = "jbean_orange"
filling_color = "#E78108"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange/New()
- ..()
- reagents.add_reagent("orangejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "orangejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's purple!"
icon_state = "jbean_purple"
filling_color = "#993399"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple/New()
- ..()
- reagents.add_reagent("grapejuice", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "grapejuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's chocolate!"
icon_state = "jbean_choc"
filling_color = "#302000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate/New()
- ..()
- reagents.add_reagent("chocolate",2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "chocolate" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's popcorn flavored!"
icon_state = "jbean_popcorn"
filling_color = "#664330"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's Cola flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola/New()
- ..()
- reagents.add_reagent("cola", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "cola" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's Dr. Gibb flavored!"
icon_state = "jbean_cola"
filling_color = "#102000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb/New()
- ..()
- reagents.add_reagent("dr_gibb", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "dr_gibb" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. It's Coffee flavored!"
icon_state = "jbean_choc"
filling_color = "#482000"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee/New()
- ..()
- reagents.add_reagent("coffee", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "coffee" = 2)
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf
name = "jelly bean"
desc = "A candy bean, guarenteed to not give you gas. You aren't sure what color it is."
icon_state = "jbean_wtf"
filling_color = "#60A584"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf/New()
- ..()
- reagents.add_reagent("space_drugs", 2)
- bitesize = 3
+ list_reagents = list("sugar" = 10, "space_drugs" = 2)
// ***********************************************************
// Cotton Candy Flavors
@@ -633,11 +433,7 @@
icon_state = "cottoncandy_red"
trash = /obj/item/weapon/c_tube
filling_color = "#801E28"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red/New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "cherryjelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue
name = "cotton candy"
@@ -645,11 +441,7 @@
icon_state = "cottoncandy_blue"
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue/New()
- ..()
- reagents.add_reagent("berryjuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "berryjuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison
name = "cotton candy"
@@ -657,14 +449,7 @@
icon_state = "cottoncandy_blue"
trash = /obj/item/weapon/c_tube
filling_color = "#863353"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison/New()
- ..()
- reagents.add_reagent("poisonberryjuice", 20)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 4
+ list_reagents = list("poisonberryjuice" = 20)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green
name = "cotton candy"
@@ -672,11 +457,7 @@
icon_state = "cottoncandy_green"
trash = /obj/item/weapon/c_tube
filling_color = "#365E30"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green/New()
- ..()
- reagents.add_reagent("limejuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "limejuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow
name = "cotton candy"
@@ -684,11 +465,7 @@
icon_state = "cottoncandy_yellow"
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow/New()
- ..()
- reagents.add_reagent("lemonjuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "lemonjuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange
name = "cotton candy"
@@ -696,11 +473,7 @@
icon_state = "cottoncandy_orange"
trash = /obj/item/weapon/c_tube
filling_color = "#E78108"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange/New()
- ..()
- reagents.add_reagent("orangejuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "orangejuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple
name = "cotton candy"
@@ -708,11 +481,7 @@
icon_state = "cottoncandy_purple"
trash = /obj/item/weapon/c_tube
filling_color = "#993399"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple/New()
- ..()
- reagents.add_reagent("grapejuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "grapejuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink
name = "cotton candy"
@@ -720,11 +489,7 @@
icon_state = "cottoncandy_pink"
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink/New()
- ..()
- reagents.add_reagent("watermelonjuice", 5)
- bitesize = 4
+ list_reagents = list("sugar" = 15, "watermelonjuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow
name = "cotton candy"
@@ -732,14 +497,7 @@
icon_state = "cottoncandy_rainbow"
trash = /obj/item/weapon/c_tube
filling_color = "#C8A5DC"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow/New()
- ..()
- reagents.add_reagent("omnizine", 20)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 4
+ list_reagents = list("omnizine" = 20)
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow
name = "cotton candy"
@@ -747,14 +505,7 @@
icon_state = "cottoncandy_rainbow"
trash = /obj/item/weapon/c_tube
filling_color = "#32127A"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow/New()
- ..()
- reagents.add_reagent("sulfonal", 20)
- spawn(1)
- reagents.del_reagent("sugar")
- reagents.update_total()
- bitesize = 4
+ list_reagents = list("sulfonal" = 20)
// ***********************************************************
// Candybar Flavors
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 931e84b892b..d7ffca96843 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -82,7 +82,7 @@
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, "you can't add anymore to [target]!")
return
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+ var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "You transfer [trans] units of the condiment to [target].")
/obj/item/weapon/reagent_containers/food/condiment/on_reagent_change()
@@ -223,7 +223,7 @@
return
else
to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.")
- src.reagents.trans_to(target, amount_per_transfer_from_this)
+ reagents.trans_to(target, amount_per_transfer_from_this)
qdel(src)
/obj/item/weapon/reagent_containers/food/condiment/pack/on_reagent_change()
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 78651f97b0c..77e3f22a1e8 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -1,4 +1,4 @@
-/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/S = new(get_turf(user))
S.attackby(W,user, params)
@@ -6,13 +6,13 @@
else
..()
-/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/food/snacks/bun/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/burger/S = new(get_turf(user))
S.attackby(W,user, params)
qdel(src)
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza/S = new(get_turf(user))
S.attackby(W,user, params)
@@ -21,7 +21,7 @@
..()
-/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/pasta/S = new(get_turf(user))
S.attackby(W,user, params)
@@ -30,7 +30,7 @@
..()
-/obj/item/trash/plate/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/trash/plate/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/fullycustom/S = new(get_turf(user))
S.attackby(W,user, params)
@@ -44,7 +44,7 @@
icon = 'icons/obj/food/food.dmi'
icon_state = "soup"
-/obj/item/trash/bowl/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/trash/bowl/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/reagent_containers/food/snacks) && !(W.flags & NODROP))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/soup/S = new(get_turf(user))
@@ -54,7 +54,6 @@
..()
/obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich
- /obj/item/weapon/reagent_containers/food/snacks/customizable
name = "sandwich"
desc = "A sandwich! A timeless classic."
icon_state = "breadslice"
@@ -79,12 +78,7 @@
trash = /obj/item/trash/plate
bitesize = 2
var/list/ingredients = list()
-
- New()
- ..()
-
- reagents.add_reagent("nutriment", 8)
-
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza
name = "personal pizza"
@@ -323,7 +317,7 @@
toptype = new /obj/item/weapon/reagent_containers/food/snacks/bun()
/obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params)
- if(src.contents.len > sandwich_limit)
+ if(contents.len > sandwich_limit)
to_chat(user, "If you put anything else in or on [src] it's going to make a mess.")
return
if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks))
@@ -351,7 +345,7 @@
for(var/obj/item/O in ingredients)
i++
if(!fullycustom)
- var/image/I = new(src.icon, "[baseicon]_filling")
+ var/image/I = new(icon, "[baseicon]_filling")
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks))
var/obj/item/weapon/reagent_containers/food/snacks/food = O
if(!food.filling_color == "#FFFFFF")
@@ -372,7 +366,7 @@
overlays += O.overlays
if(top)
- var/image/T = new(src.icon, "[baseicon]_top")
+ var/image/T = new(icon, "[baseicon]_top")
T.pixel_x = pick(list(-1,0,1))
T.pixel_y = (ingredients.len * 2)+1
overlays += T
@@ -388,24 +382,6 @@
to_chat(user, " You think you can see [whatsinside] in there.")
-/*
-/obj/item/weapon/reagent_containers/food/snacks/customizable/attack(mob/M as mob, mob/user as mob, def_zone) //SNOOOOOOOWFLAAAAAAAAAAAAAAAAAKES
-
- var/obj/item/shard
- for(var/obj/item/O in contents)
- if(istype(O,/obj/item/weapon/shard))
- shard = O
- break
-
- var/mob/living/H
- if(istype(M,/mob/living))
- H = M
-
- if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable.
- to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!")
- H.adjustBruteLoss(5) //TODO: Target head if human.
- ..()
-*/
/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/newname()
var/unsorteditems[0]
@@ -487,7 +463,7 @@
sendback = "[pick(list("absurd","colossal","enormous","ridiculous","massive","oversized","cardiac-arresting","pipe-clogging","edible but sickening","sickening","gargantuan","mega","belly-burster","chest-burster"))] [basename]"
return sendback
-/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/sortlist(var/list/unsorted, var/highest)
+/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/sortlist(list/unsorted, highest)
var/sorted[0]
for(var/i = 1, i<= highest, i++)
for(var/it in unsorted)
diff --git a/code/modules/food_and_drinks/food/meat.dm b/code/modules/food_and_drinks/food/meat.dm
index 76de76530ea..4635f6eb9b1 100644
--- a/code/modules/food_and_drinks/food/meat.dm
+++ b/code/modules/food_and_drinks/food/meat.dm
@@ -4,16 +4,11 @@
icon_state = "meat"
health = 180
filling_color = "#FF1C1C"
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3)
-/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if( \
- istype(W, /obj/item/weapon/kitchen/knife) || \
- istype(W, /obj/item/weapon/scalpel) \
- )
+/obj/item/weapon/reagent_containers/food/snacks/meat/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/kitchen/knife) || istype(W, /obj/item/weapon/scalpel))
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src)
@@ -49,6 +44,4 @@
/obj/item/weapon/reagent_containers/food/snacks/meat/ham
name = "Ham"
desc = "Taste like bacon."
- New()
- ..()
- reagents.add_reagent("porktonium", 10)
+ list_reagents = list("protein" = 3, "porktonium" = 10)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/seafood.dm b/code/modules/food_and_drinks/food/seafood.dm
index 410c225247c..c0a95d39315 100644
--- a/code/modules/food_and_drinks/food/seafood.dm
+++ b/code/modules/food_and_drinks/food/seafood.dm
@@ -5,12 +5,8 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishfillet"
filling_color = "#FFDEFE"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("carpotoxin", 3)
- src.bitesize = 6
+ bitesize = 6
+ list_reagents = list("protein" = 3, "carpotoxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/salmonmeat
name = "raw salmon"
@@ -18,11 +14,8 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishfillet"
filling_color = "#FFDEFE"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/salmonsteak
name = "Salmon steak"
@@ -31,14 +24,8 @@
icon_state = "salmonsteak"
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 3
-
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "sodiumchloride" = 1, "blackpepper" = 1)
/obj/item/weapon/reagent_containers/food/snacks/catfishmeat
name = "raw catfish"
@@ -46,11 +33,8 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishfillet"
filling_color = "#FFDEFE"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/fishfingers
name = "Fish Fingers"
@@ -58,15 +42,8 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishfingers"
filling_color = "#FFDEFE"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("carpotoxin", 3)
- spawn(1)
- reagents.del_reagent("egg")
- reagents.update_total()
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "carpotoxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/fishburger
name = "Fillet -o- Carp Sandwich"
@@ -74,12 +51,8 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishburger"
filling_color = "#FFDEFE"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "carpotoxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
@@ -88,13 +61,8 @@
icon_state = "cubancarp"
trash = /obj/item/trash/plate
filling_color = "#E9ADFF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- reagents.add_reagent("capsaicin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "carpotoxin" = 3, "capsaicin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -102,168 +70,117 @@
icon = 'icons/obj/food/seafood.dmi'
icon_state = "fishandchips"
filling_color = "#E3D796"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "carpotoxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/sashimi
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sashimi"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("toxin", 5)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "toxin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/fried_shrimp
name = "fried shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
icon_state = "shrimp_fried"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/boiled_shrimp
name = "boiled shrimp"
desc = "Just one of the many things you can do with shrimp!"
icon = 'icons/obj/food/seafood.dmi'
icon_state = "shrimp_cooked"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Ebi
name = "Ebi Sushi"
desc = "A simple sushi consisting of cooked shrimp and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Ebi"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Ikura
name = "Ikura Sushi"
desc = "A simple sushi consisting of salmon roe."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Ikura"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("protein", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2, "protein" = 1)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Sake
name = "Sake Sushi"
desc = "A simple sushi consisting of raw salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Sake"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_SmokedSalmon
name = "Smoked Salmon Sushi"
desc = "A simple sushi consisting of cooked salmon and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_SmokedSalmon"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Tamago
name = "Tamago Sushi"
desc = "A simple sushi consisting of egg and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Tamago"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Inari
name = "Inari Sushi"
desc = "A piece of fried tofu stuffed with rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Inari"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Masago
name = "Masago Sushi"
desc = "A simple sushi consisting of goldfish roe."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Masago"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("protein", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2, "protein" = 1)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Tobiko
name = "Tobiko Sushi"
desc = "A simple sushi consisting of shark roe."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Masago"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("protein", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2, "protein" = 1)
/obj/item/weapon/reagent_containers/food/snacks/sushi_TobikoEgg
name = "Tobiko and Egg Sushi"
desc = "A sushi consisting of shark roe and an egg."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_TobikoEgg"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("protein", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2, "protein" = 1)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Tai
name = "Tai Sushi"
desc = "A simple sushi consisting of catfish and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Tai"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sushi_Unagi
name = "Unagi Sushi"
desc = "A simple sushi consisting of eel and rice."
icon = 'icons/obj/food/seafood.dmi'
icon_state = "sushi_Hokki"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
\ No newline at end of file
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index d403b4aae4b..49cd0c1fa3b 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -4,7 +4,6 @@
desc = "yummy"
icon = 'icons/obj/food/food.dmi'
icon_state = null
- bitesize = 1
var/bitecount = 0
var/trash = null
var/slice_path
@@ -38,10 +37,10 @@
/obj/item/weapon/reagent_containers/food/snacks/proc/Post_Consume(mob/living/M)
return
-/obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user as mob)
+/obj/item/weapon/reagent_containers/food/snacks/attack_self(mob/user)
return
-/obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone)
+/obj/item/weapon/reagent_containers/food/snacks/attack(mob/M, mob/user, def_zone)
if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it.
to_chat(user, "None of [src] left, oh no!")
M.unEquip(src) //so icons update :[
@@ -64,11 +63,11 @@
if(bitecount==0)
return
else if(bitecount==1)
- to_chat(user, "\blue \The [src] was bitten by someone!")
+ to_chat(user, "[src] was bitten by someone!")
else if(bitecount<=3)
- to_chat(user, "\blue \The [src] was bitten [bitecount] times!")
+ to_chat(user, "[src] was bitten [bitecount] times!")
else
- to_chat(user, "\blue \The [src] was bitten multiple times!")
+ to_chat(user, "[src] was bitten multiple times!")
/obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W, mob/user, params)
@@ -93,10 +92,10 @@
"You scoop up some [src] with \the [U]!" \
)
- src.bitecount++
+ bitecount++
U.overlays.Cut()
var/image/I = new(U.icon, "loadedfood")
- I.color = src.filling_color
+ I.color = filling_color
U.overlays += I
var/obj/item/weapon/reagent_containers/food/snacks/collected = new type
@@ -136,7 +135,7 @@
else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
if(!iscarbon(user))
return 1
- to_chat(user, "\red You slip [W] inside [src].")
+ to_chat(user, "You slip [W] inside [src].")
user.unEquip(W)
if((user.client && user.s_active != src))
user.client.screen -= W
@@ -147,28 +146,28 @@
else
return 1
if( \
- !isturf(src.loc) || \
- !(locate(/obj/structure/table) in src.loc) && \
- !(locate(/obj/machinery/optable) in src.loc) && \
- !(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \
+ !isturf(loc) || \
+ !(locate(/obj/structure/table) in loc) && \
+ !(locate(/obj/machinery/optable) in loc) && \
+ !(locate(/obj/item/weapon/storage/bag/tray) in loc) \
)
- to_chat(user, "\red You cannot slice [src] here! You need a table or at least a tray to do it.")
+ to_chat(user, "You cannot slice [src] here! You need a table or at least a tray to do it.")
return 1
var/slices_lost = 0
if(!inaccurate)
user.visible_message( \
- "\blue [user] slices \the [src]!", \
- "\blue You slice \the [src]!" \
+ "[user] slices [src]!", \
+ "You slice [src]!" \
)
else
user.visible_message( \
- "\blue [user] crudely slices \the [src] with [W]!", \
- "\blue You crudely slice \the [src] with your [W]!" \
+ "[user] crudely slices [src] with [W]!", \
+ "You crudely slice [src] with your [W]!" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
- var/obj/slice = new slice_path (src.loc)
+ var/obj/slice = new slice_path (loc)
reagents.trans_to(slice,reagents_per_slice)
qdel(src)
@@ -185,19 +184,19 @@
M.changeNext_move(CLICK_CD_MELEE)
if(iscorgi(M))
if(bitecount >= 4)
- M.visible_message("[M] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where \the [src] was")].","You swallow up the last part of \the [src].")
- playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+ M.visible_message("[M] [pick("burps from enjoyment", "yaps for more", "woofs twice", "looks at the area where [src] was")].","You swallow up the last part of [src].")
+ playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
var/mob/living/simple_animal/pet/corgi/C = M
C.adjustBruteLoss(-5)
C.adjustFireLoss(-5)
qdel(src)
else
- M.visible_message("[M] takes a bite of \the [src].","You take a bite of \the [src].")
- playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
+ M.visible_message("[M] takes a bite of [src].","You take a bite of [src].")
+ playsound(loc,'sound/items/eatfood.ogg', rand(10,50), 1)
bitecount++
else if(ismouse(M))
var/mob/living/simple_animal/mouse/N = M
- to_chat(N, text("\blue You nibble away at [src]."))
+ to_chat(N, text("You nibble away at [src]."))
if(prob(50))
N.visible_message("[N] nibbles away at [src].", "")
//N.emote("nibbles away at the [src]")
@@ -255,49 +254,8 @@
icon_state = "aesirsalad"
trash = /obj/item/trash/snack_bowl
filling_color = "#468C00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("omnizine", 8)
- bitesize = 3
-
-/*
-/obj/item/weapon/reagent_containers/food/snacks/candy
- name = "candy"
- desc = "Nougat, love it or hate it."
- icon_state = "candy"
- trash = /obj/item/trash/candy
- filling_color = "#7D5F46"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("sugar", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/donor
- name = "Donor Candy"
- desc = "A little treat for blood donors."
- trash = /obj/item/trash/candy
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("sugar", 3)
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/candy_corn
- name = "candy corn"
- desc = "It's a handful of candy corn. Cannot be stored in a detective's hat, alas."
- icon_state = "candy_corn"
- filling_color = "#FFFCB0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- bitesize = 2
-*/
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "omnizine" = 8)
/obj/item/weapon/reagent_containers/food/snacks/chips
name = "chips"
@@ -305,12 +263,7 @@
icon_state = "chips"
trash = /obj/item/trash/chips
filling_color = "#E8C31E"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 1
+ list_reagents = list("nutriment" = 3, "sodiumchloride" = 1)
/obj/item/weapon/reagent_containers/food/snacks/cornchips
name = "corn chips"
@@ -318,123 +271,79 @@
icon_state = "chips"
trash = /obj/item/trash/chips
filling_color = "#E8C31E"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
icon_state = "COOKIE!!!"
filling_color = "#DBC94F"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "Chocolate Bar"
desc = "Such sweet, fattening food."
icon_state = "chocolatebar"
filling_color = "#7D5F46"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("chocolate",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2, "chocolate" = 4)
/obj/item/weapon/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
name = "Pile of Chocolate"
desc = "A pile of pure chocolate pieces."
icon_state = "cocoa"
filling_color = "#7D5F46"
-
- New()
- ..()
- reagents.add_reagent("chocolate",5) //no longer can be used to generate the reagent infinitely
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("chocolate" = 5)
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
name = "Chocolate Egg"
desc = "Such sweet, fattening food."
icon_state = "chocolateegg"
filling_color = "#7D5F46"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("chocolate",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 3, "chocolate" = 4)
/obj/item/weapon/reagent_containers/food/snacks/donut
name = "donut"
desc = "Goes great with Robust Coffee."
icon_state = "donut1"
filling_color = "#D9C386"
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/donut/normal
name = "donut"
desc = "Goes great with Robust Coffee."
icon_state = "donut1"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- src.bitesize = 3
- if(prob(30))
- src.icon_state = "donut2"
- src.name = "frosted donut"
- reagents.add_reagent("sprinkles", 2)
+ list_reagents = list("nutriment" = 3, "sprinkles" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New()
+ ..()
+ if(prob(30))
+ icon_state = "donut2"
+ name = "frosted donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/sprinkles
name = "frosted donut"
icon_state = "donut2"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 3)
+ list_reagents = list("nutriment" = 3, "sprinkles" = 3)
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos
name = "Chaos Donut"
desc = "Like life, it never quite tastes the same."
icon_state = "donut1"
filling_color = "#ED11E6"
+ bitesize = 10
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sprinkles", 1)
- bitesize = 10
- var/chaosselect = pick(1,2,3,4,5,6,7,8,9,10)
- switch(chaosselect)
- if(1)
- reagents.add_reagent("nutriment", 3)
- if(2)
- reagents.add_reagent("capsaicin", 3)
- if(3)
- reagents.add_reagent("frostoil", 3)
- if(4)
- reagents.add_reagent("sprinkles", 3)
- if(5)
- reagents.add_reagent("plasma", 3)
- if(6)
- reagents.add_reagent("chocolate", 3)
- if(7)
- reagents.add_reagent("slimejelly", 3)
- if(8)
- reagents.add_reagent("banana", 3)
- if(9)
- reagents.add_reagent("berryjuice", 3)
- if(10)
- reagents.add_reagent("omnizine", 3)
- if(prob(30))
- src.icon_state = "donut2"
- src.name = "Frosted Chaos Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
+ ..()
+ var/extra_reagent = pick("nutriment", "capsaicin", "frostoil", "sprinkles", "plasma", "chocolate", "slimejelly", "banana", "berryjuice", "omnizine")
+ reagents.add_reagent("[extra_reagent]", 3)
+ if(prob(30))
+ icon_state = "donut2"
+ name = "Frosted Chaos Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/jelly
@@ -442,85 +351,75 @@
desc = "You jelly?"
icon_state = "jdonut1"
filling_color = "#ED1169"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "sprinkles" = 1, "berryjuice" = 5)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
+ ..()
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
name = "Jelly Donut"
desc = "You jelly?"
icon_state = "jdonut1"
filling_color = "#ED1169"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "sprinkles" = 1, "slimejelly" = 5)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("slimejelly", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New()
+ ..()
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
name = "Jelly Donut"
desc = "You jelly?"
icon_state = "jdonut1"
filling_color = "#ED1169"
+ bitesize = 5
+ list_reagents = list("nutriment" = 3, "sprinkles" = 1, "cherryjelly" = 5)
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("cherryjelly", 5)
- bitesize = 5
- if(prob(30))
- src.icon_state = "jdonut2"
- src.name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New()
+ ..()
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
desc = "An egg!"
icon_state = "egg"
filling_color = "#FDFFD1"
+ list_reagents = list("protein" = 1, "egg" = 5)
- New()
+/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
+ ..()
+ var/turf/T = get_turf(hit_atom)
+ new/obj/effect/decal/cleanable/egg_smudge(T)
+ if(reagents)
+ reagents.reaction(hit_atom, TOUCH)
+ qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype( W, /obj/item/toy/crayon ))
+ var/obj/item/toy/crayon/C = W
+ var/clr = C.colourName
+
+ if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
+ to_chat(usr, "The egg refuses to take on this color!")
+ return
+
+ to_chat(usr, "You color \the [src] [clr]")
+ icon_state = "egg-[clr]"
+ item_color = clr
+ else
..()
- reagents.add_reagent("protein", 1)
- reagents.add_reagent("egg", 5)
-
- throw_impact(atom/hit_atom)
- ..()
- var/turf/T = get_turf(hit_atom)
- new/obj/effect/decal/cleanable/egg_smudge(T)
- if(reagents)
- reagents.reaction(hit_atom, TOUCH)
- qdel(src)
-
- attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if(istype( W, /obj/item/toy/crayon ))
- var/obj/item/toy/crayon/C = W
- var/clr = C.colourName
-
- if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))
- to_chat(usr, "\blue The egg refuses to take on this color!")
- return
-
- to_chat(usr, "\blue You color \the [src] [clr]")
- icon_state = "egg-[clr]"
- item_color = clr
- else
- ..()
/obj/item/weapon/reagent_containers/food/snacks/egg/blue
icon_state = "egg-blue"
@@ -559,25 +458,14 @@
desc = "A fried egg, with a touch of salt and pepper."
icon_state = "friedegg"
filling_color = "#FFDF78"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("egg", 5)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 1
+ list_reagents = list("nutriment" = 2, "egg" = 5, "sodiumchloride" = 1, "blackpepper" = 1)
/obj/item/weapon/reagent_containers/food/snacks/boiledegg
name = "Boiled egg"
desc = "A hard boiled egg."
icon_state = "egg"
filling_color = "#FFFFFF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("egg", 5)
+ list_reagents = list("nutriment" = 2, "egg" = 5)
/obj/item/weapon/reagent_containers/food/snacks/organ
@@ -586,11 +474,8 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "appendix"
filling_color = "#E00D34"
-
- New()
- ..()
- reagents.add_reagent("protein", 4)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 4)
/obj/item/weapon/reagent_containers/food/snacks/appendix
//yes, this is the same as meat. I might do something different in future
@@ -599,11 +484,8 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "appendix"
filling_color = "#E00D34"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/appendix/inflamed
name = "inflamed appendix"
@@ -616,179 +498,125 @@
icon_state = "tofu"
desc = "We all love tofu."
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("plantmatter" = 3)
/obj/item/weapon/reagent_containers/food/snacks/fried_tofu
name = "Fried Tofu"
icon_state = "tofu"
desc = "Proof that even vegetarians crave unhealthy foods."
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/tofurkey
name = "Tofurkey"
desc = "A fake turkey made from tofu."
icon_state = "tofurkey"
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("ether", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 12, "ether" = 3)
/obj/item/weapon/reagent_containers/food/snacks/stuffing
name = "Stuffing"
desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
icon_state = "stuffing"
filling_color = "#C9AC83"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
filling_color = "#E0D7C5"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 3)
- reagents.add_reagent("psilocybin", 3)
- src.bitesize = 6
+ bitesize = 6
+ list_reagents = list("plantmatter" = 3, "psilocybin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
desc = "A slice from a huge tomato"
icon_state = "tomatomeat"
filling_color = "#DB0000"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 6
+ bitesize = 6
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
filling_color = "#DB0000"
-
- New()
- ..()
- reagents.add_reagent("protein", 12)
- reagents.add_reagent("methamphetamine", 5)
- src.bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 12, "methamphetamine" = 5)
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
name = "meat"
desc = "A slab of meat"
icon_state = "xenomeat"
filling_color = "#43DE18"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- src.bitesize = 6
+ bitesize = 6
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/spidermeat
name = "spider meat"
desc = "A slab of spider meat."
icon_state = "spidermeat"
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("toxin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3, "toxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/lizardmeat
name = "mutant lizard meat"
desc = "Seems to be a slab of meat from some mutant lizard thing?"
icon_state = "xenomeat"
filling_color = "#43DE18"
-
- New()
- ..()
- reagents.add_reagent("protein", 3)
- reagents.add_reagent("toxin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("protein" = 3, "toxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/spiderleg
name = "spider leg"
desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
icon_state = "spiderleg"
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("toxin", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 2, "toxin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/meatball
name = "Meatball"
desc = "A great meal all round."
icon_state = "meatball"
filling_color = "#DB0000"
- New()
- ..()
- reagents.add_reagent("protein", 3)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 3)
/obj/item/weapon/reagent_containers/food/snacks/sausage
name = "Sausage"
desc = "A piece of mixed, long meat."
icon_state = "sausage"
filling_color = "#DB0000"
-
- New()
- ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("porktonium", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 6, "porktonium" = 10)
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket
name = "Warm Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
+ list_reagents = list("nutriment" = 4)
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
-
- Post_Consume(mob/living/M)
- M.reagents.add_reagent("omnizine", 15)
+/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket/Post_Consume(mob/living/M)
+ M.reagents.add_reagent("omnizine", 15)
/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak
name = "Lightly Warm Donk-pocket"
desc = "The food of choice for the seasoned traitor. This one is lukewarm."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
-
-/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket_weak/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("weak_omnizine", 3)
+ list_reagents = list("nutriment" = 4, "weak_omnizine" = 3)
/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket
name = "Donk-pocket"
@@ -796,42 +624,31 @@
icon_state = "donkpocket"
filling_color = "#DEDEAB"
bitesize = 100 //nom the whole thing at once.
+ list_reagents = list("nutriment" = 1)
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
-
- Post_Consume(mob/living/M)
- M.reagents.add_reagent("omnizine", 15)
- M.reagents.add_reagent("teporone", 15)
- M.reagents.add_reagent("synaptizine", 15)
- M.reagents.add_reagent("salglu_solution", 15)
- M.reagents.add_reagent("salbutamol", 15)
- M.reagents.add_reagent("methamphetamine", 15)
+/obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket/Post_Consume(mob/living/M)
+ M.reagents.add_reagent("omnizine", 15)
+ M.reagents.add_reagent("teporone", 15)
+ M.reagents.add_reagent("synaptizine", 15)
+ M.reagents.add_reagent("salglu_solution", 15)
+ M.reagents.add_reagent("salbutamol", 15)
+ M.reagents.add_reagent("methamphetamine", 15)
/obj/item/weapon/reagent_containers/food/snacks/brainburger
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
icon_state = "brainburger"
filling_color = "#F2B6EA"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("prions", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6, "prions" = 10)
/obj/item/weapon/reagent_containers/food/snacks/ghostburger
name = "Ghost Burger"
desc = "Spooky! It doesn't look very filling."
icon_state = "ghostburger"
filling_color = "#FFF2FF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
-
+ bitesize = 2
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/human
var/hname = ""
@@ -842,52 +659,38 @@
name = "-burger"
desc = "A bloody burger."
icon_state = "hburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/cheeseburger
name = "cheeseburger"
desc = "The cheese adds a good flavor."
icon_state = "cheeseburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/monkeyburger
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
filling_color = "#D63C3C"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/tofuburger
name = "Tofu Burger"
desc = "What.. is that meat?"
icon_state = "tofuburger"
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/roburger
name = "roburger"
desc = "The lettuce is the only organic component. Beep."
icon_state = "roburger"
filling_color = "#CCCCCC"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("nanomachines", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2, "nanomachines" = 10)
/obj/item/weapon/reagent_containers/food/snacks/roburgerbig
name = "roburger"
@@ -895,49 +698,32 @@
icon_state = "roburger"
filling_color = "#CCCCCC"
volume = 100
-
- New()
- ..()
- reagents.add_reagent("nanomachines", 100)
- bitesize = 0.1
+ bitesize = 0.1
+ list_reagents = list("nanomachines" = 100)
/obj/item/weapon/reagent_containers/food/snacks/xenoburger
name = "xenoburger"
desc = "Smells caustic. Tastes like heresy."
icon_state = "xburger"
filling_color = "#43DE18"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/clownburger
name = "Clown Burger"
desc = "This tastes funny..."
icon_state = "clownburger"
filling_color = "#FF00FF"
-
- New()
- ..()
-/*
- var/datum/disease/F = new /datum/disease/pierrot_throat(0)
- var/list/data = list("viruses"= list(F))
- reagents.add_reagent("blood", 4, data)
-*/
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/mimeburger
name = "Mime Burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
filling_color = "#FFFFFF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/omelette
name = "Omelette Du Fromage"
@@ -945,23 +731,15 @@
icon_state = "omelette"
trash = /obj/item/trash/plate
filling_color = "#FFF9A8"
-
- //var/herp = 0
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 1
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/muffin
name = "Muffin"
desc = "A delicious and spongy little cake"
icon_state = "muffin"
filling_color = "#E0CF9B"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/pie
name = "Banana Cream Pie"
@@ -969,17 +747,13 @@
icon_state = "pie"
trash = /obj/item/trash/plate
filling_color = "#FBFFB8"
-
-/obj/item/weapon/reagent_containers/food/snacks/pie/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("banana",5)
bitesize = 3
+ list_reagents = list("nutriment" = 4, "banana" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
..()
- new/obj/effect/decal/cleanable/pie_smudge(src.loc)
- src.visible_message("\red [src.name] splats.","\red You hear a splat.")
+ new/obj/effect/decal/cleanable/pie_smudge(loc)
+ visible_message("[src] splats.","You hear a splat.")
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis
@@ -987,11 +761,8 @@
desc = "No black birds, this is a good sign."
icon_state = "berryclafoutis"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("berryjuice", 5)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "berryjuice" = 5)
/obj/item/weapon/reagent_containers/food/snacks/waffles
name = "waffles"
@@ -999,11 +770,8 @@
icon_state = "waffles"
trash = /obj/item/trash/waffles
filling_color = "#E6DEB5"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "Eggplant Parmigiana"
@@ -1011,11 +779,8 @@
icon_state = "eggplantparm"
trash = /obj/item/trash/plate
filling_color = "#4D2F5E"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "Soylent Green"
@@ -1023,11 +788,8 @@
icon_state = "soylent_green"
trash = /obj/item/trash/waffles
filling_color = "#B8E6B5"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "Soylen Virdians"
@@ -1035,12 +797,8 @@
icon_state = "soylent_yellow"
trash = /obj/item/trash/waffles
filling_color = "#E6FA61"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
-
+ bitesize = 2
+ list_reagents = list("nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/meatpie
name = "Meat-pie"
@@ -1048,11 +806,8 @@
desc = "An old barber recipe, very delicious!"
trash = /obj/item/trash/plate
filling_color = "#948051"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/tofupie
name = "Tofu-pie"
@@ -1060,42 +815,31 @@
desc = "A delicious tofu pie."
trash = /obj/item/trash/plate
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
filling_color = "#FFCCCC"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("amanitin", 3)
- reagents.add_reagent("psilocybin", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "amanitin" = 3, "psilocybin" = 1)
/obj/item/weapon/reagent_containers/food/snacks/plump_pie
name = "plump pie"
desc = "I bet you love stuff made out of plump helmets!"
icon_state = "plump_pie"
filling_color = "#B8279B"
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
- New()
- ..()
- if(prob(10))
- name = "exceptional plump pie"
- desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!"
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("omnizine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/plump_pie/New()
+ ..()
+ if(prob(10))
+ name = "exceptional plump pie"
+ desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump pie!" // What
+ reagents.add_reagent("omnizine", 5)
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "Xeno-pie"
@@ -1103,11 +847,8 @@
desc = "A delicious meatpie. Probably heretical."
trash = /obj/item/trash/plate
filling_color = "#43DE18"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
name = "Wing Fang Chu"
@@ -1115,12 +856,8 @@
icon_state = "wingfangchu"
trash = /obj/item/trash/snack_bowl
filling_color = "#43DE18"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/human/kabob
name = "-kabob"
@@ -1128,11 +865,8 @@
desc = "A human meat, on a stick."
trash = /obj/item/stack/rods
filling_color = "#A85340"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
name = "Meat-kabob"
@@ -1140,11 +874,8 @@
desc = "Delicious meat, on a stick."
trash = /obj/item/stack/rods
filling_color = "#A85340"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
name = "Tofu-kabob"
@@ -1152,11 +883,8 @@
desc = "Vegan meat, on a stick."
trash = /obj/item/stack/rods
filling_color = "#FFFEE0"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "Popcorn"
@@ -1165,18 +893,18 @@
trash = /obj/item/trash/popcorn
var/unpopped = 0
filling_color = "#FFFAD4"
+ bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
+ list_reagents = list("nutriment" = 2)
- New()
- ..()
- unpopped = rand(1,10)
- reagents.add_reagent("nutriment", 2)
- bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
- On_Consume(mob/M, mob/user)
- if(prob(unpopped)) //lol ...what's the point?
- to_chat(user, "\red You bite down on an un-popped kernel!")
- unpopped = max(0, unpopped-1)
- ..()
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
+ ..()
+ unpopped = rand(1,10)
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume(mob/M, mob/user)
+ if(prob(unpopped)) //lol ...what's the point?
+ to_chat(user, "You bite down on an un-popped kernel!")
+ unpopped = max(0, unpopped-1)
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
@@ -1184,11 +912,8 @@
desc = "Beef jerky made from the finest space cows."
trash = /obj/item/trash/sosjerky
filling_color = "#631212"
-
- New()
- ..()
- reagents.add_reagent("protein", 4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 4)
/obj/item/weapon/reagent_containers/food/snacks/pistachios
name = "Pistachios"
@@ -1196,11 +921,7 @@
desc = "A snack of deliciously salted pistachios. A perfectly valid choice..."
trash = /obj/item/trash/pistachios
filling_color = "#BAD145"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 6)
- reagents.add_reagent("sodiumchloride", 1)
+ list_reagents = list("plantmatter" = 6, "sodiumchloride" = 1)
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
name = "4no Raisins"
@@ -1208,21 +929,15 @@
desc = "Best raisins in the universe. Not sure why."
trash = /obj/item/trash/raisins
filling_color = "#343834"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 6)
+ list_reagents = list("plantmatter" = 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "Space Twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer then you will."
filling_color = "#FFE591"
-
- New()
- ..()
- reagents.add_reagent("sugar", 4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("sugar" = 4)
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -1230,79 +945,53 @@
desc = "Bite sized cheesie snacks that will honk all over your mouth"
trash = /obj/item/trash/cheesie
filling_color = "#FFA305"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("fake_cheese", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 4, "fake_cheese" = 2)
/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein
name = "chow mein"
desc = "What is in this anyways?"
icon_state = "chinese1"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("beans", 3)
- reagents.add_reagent("msg",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6, "beans" = 3, "msg" = 4)
/obj/item/weapon/reagent_containers/food/snacks/chinese/tao
name = "Admiral Yamamoto carp"
desc = "Tastes like chicken."
icon_state = "chinese2"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("msg",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 4, "protein" = 2, "msg" = 4)
/obj/item/weapon/reagent_containers/food/snacks/chinese/newdles
name = "chinese newdles"
desc = "Made fresh, weekly!"
icon_state = "chinese3"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("msg",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6, "msg" = 4)
/obj/item/weapon/reagent_containers/food/snacks/chinese/rice
name = "fried rice"
desc = "A timeless classic."
icon_state = "chinese4"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("rice", 3)
- reagents.add_reagent("msg",4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 3, "rice" = 3, "msg" = 4)
/obj/item/weapon/reagent_containers/food/snacks/syndicake
name = "Syndi-Cakes"
icon_state = "syndi_cakes"
desc = "An extremely moist snack cake that tastes just as good after being nuked."
filling_color = "#FF5D05"
-
trash = /obj/item/trash/syndi_cakes
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("salglu_solution", 5)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "salglu_solution" = 5)
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
name = "Loaded Baked Potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
filling_color = "#9C7A68"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "Space Fries"
@@ -1310,11 +999,8 @@
icon_state = "fries"
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/soydope
name = "Soy Dope"
@@ -1322,22 +1008,15 @@
icon_state = "soydope"
trash = /obj/item/trash/plate
filling_color = "#C4BF76"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/spagetti
name = "Spagetti"
desc = "A bundle of raw spaghetti."
icon_state = "spagetti"
filling_color = "#EDDD00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 1
+ list_reagents = list("nutriment" = 1)
/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
name = "Cheesy Fries"
@@ -1345,38 +1024,30 @@
icon_state = "cheesyfries"
trash = /obj/item/trash/plate
filling_color = "#EDDD00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "Fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
filling_color = "#E8E79E"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
filling_color = "#211F02"
+ bitesize = 2
+ list_reagents = list("????" = 5, "carbon" = 3)
- New()
- ..()
- reagents.add_reagent("????", 5)
- reagents.add_reagent("carbon", 3)
- bitesize = 2
-
- // it's burned! it should start off being classed as any cooktype that burns
- cooktype["grilled"] = 1
- cooktype["deep fried"] = 1
+/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
+ ..()
+ // it's burned! it should start off being classed as any cooktype that burns
+ cooktype["grilled"] = 1
+ cooktype["deep fried"] = 1
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
name = "Meat steak"
@@ -1384,13 +1055,8 @@
icon_state = "meatstake"
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4, "sodiumchloride" = 1, "blackpepper" = 1)
/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
name = "Spacy Liberty Duff"
@@ -1398,12 +1064,8 @@
icon_state = "spacylibertyduff"
trash = /obj/item/trash/snack_bowl
filling_color = "#42B873"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("psilocybin", 6)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "psilocybin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1411,13 +1073,8 @@
icon_state = "amanitajelly"
trash = /obj/item/trash/snack_bowl
filling_color = "#ED0758"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("amanitin", 6)
- reagents.add_reagent("psilocybin", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "amanitin" = 6, "psilocybin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1425,12 +1082,7 @@
icon_state = "poppypretzel"
bitesize = 2
filling_color = "#916E36"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/meatballsoup
name = "Meatball soup"
@@ -1438,50 +1090,32 @@
icon_state = "meatballsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#785210"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 8, "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"
filling_color = "#C4DBA0"
-
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("slimejelly" = 5, "water" = 10)
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
desc = "Smells like copper"
icon_state = "tomatosoup"
filling_color = "#FF0000"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("blood", 10)
- reagents.add_reagent("water", 5)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5)
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
desc = "Not very funny."
icon_state = "clownstears"
filling_color = "#C4FBFF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 4, "banana" = 5, "water" = 10)
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -1489,12 +1123,8 @@
icon_state = "vegetablesoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 8, "water" = 5)
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -1502,13 +1132,8 @@
icon_state = "nettlesoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#AFC4B5"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("omnizine", 5)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 8, "water" = 5, "omnizine" = 5)
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
name = "Mystery soup"
@@ -1516,46 +1141,46 @@
icon_state = "mysterysoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#F082FF"
+ bitesize = 5
- New()
- ..()
- var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
- switch(mysteryselect)
- if(1)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(2)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- if(3)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("omnizine", 5)
- if(4)
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("water", 10)
- if(5)
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("banana", 10)
- if(6)
- reagents.add_reagent("nutriment", 6)
- 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)
- reagents.add_reagent("tomatojuice", 10)
- if(10)
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("oculine", 5)
- bitesize = 5
+/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/New()
+ ..()
+ var/mysteryselect = pick(1,2,3,4,5,6,7,8,9,10)
+ switch(mysteryselect)
+ if(1)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(2)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ if(3)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("omnizine", 5)
+ if(4)
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("water", 10)
+ if(5)
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("banana", 10)
+ if(6)
+ reagents.add_reagent("nutriment", 6)
+ 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)
+ reagents.add_reagent("tomatojuice", 10)
+ if(10)
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("oculine", 5)
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
@@ -1563,14 +1188,14 @@
icon_state = "wishsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#D1F4FF"
+ bitesize = 5
+ list_reagents = list("water" = 10)
- New()
- ..()
- reagents.add_reagent("water", 10)
- bitesize = 5
- if(prob(25))
- src.desc = "A wish come true!"
- reagents.add_reagent("nutriment", 8)
+/obj/item/weapon/reagent_containers/food/snacks/wishsoup/New()
+ ..()
+ if(prob(25))
+ desc = "A wish come true!" // hue
+ reagents.add_reagent("nutriment", 8)
/obj/item/weapon/reagent_containers/food/snacks/hotchili
name = "Hot Chili"
@@ -1578,50 +1203,31 @@
icon_state = "hotchili"
trash = /obj/item/trash/snack_bowl
filling_color = "#FF3C00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
-
+ bitesize = 5
+ list_reagents = list("nutriment" = 6, "capsaicin" = 3, "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"
-
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
+ bitesize = 5
+ list_reagents = list("nutriment" = 6, "frostoil" = 3, "tomatojuice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/raw_bacon
name = "raw bacon"
desc = "It's fleshy and pink!"
icon_state = "raw_bacon"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("porktonium", 10)
+ list_reagents = list("nutriment" = 1, "porktonium" = 10)
/obj/item/weapon/reagent_containers/food/snacks/bacon
name = "bacon"
desc = "It looks juicy and tastes amazing!"
icon_state = "bacon2"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("porktonium", 10)
- reagents.add_reagent("msg", 4)
-
+ list_reagents = list("nutriment" = 4, "porktonium" = 10, "msg" = 4)
/obj/item/weapon/reagent_containers/food/snacks/telebacon
name = "Tele Bacon"
@@ -1629,15 +1235,16 @@
icon_state = "bacon"
var/obj/item/device/radio/beacon/bacon/baconbeacon
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("porktonium", 10)
- baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
- On_Consume(mob/M, mob/user)
- if(!reagents.total_volume)
- baconbeacon.loc = user
- baconbeacon.digest_delay()
+ list_reagents = list("nutriment" = 4, "porktonium" = 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/New()
+ ..()
+ baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume(mob/M, mob/user)
+ if(!reagents.total_volume)
+ baconbeacon.loc = user
+ baconbeacon.digest_delay()
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
@@ -1647,13 +1254,11 @@
bitesize = 12
filling_color = "#ADAC7F"
var/monkey_type = "Monkey"
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New()
- ..()
- reagents.add_reagent("protein",10)
+ list_reagents = list("protein" = 10)
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(istype(O,/obj/structure/sink) && !wrapped)
to_chat(user, "You place [src] under a stream of water...")
user.drop_item()
@@ -1737,22 +1342,16 @@
desc = "This is absolutely Ei Nath."
icon_state = "spellburger"
filling_color = "#D505FF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
name = "Big Bite Burger"
desc = "Forget the Big Mac. THIS is the future!"
icon_state = "bigbiteburger"
filling_color = "#E3D681"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 14)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 14)
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
name = "Enchiladas"
@@ -1760,12 +1359,8 @@
icon_state = "enchiladas"
trash = /obj/item/trash/tray
filling_color = "#A36A1F"
-
- New()
- ..()
- reagents.add_reagent("nutriment",8)
- reagents.add_reagent("capsaicin", 6)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 8, "capsaicin" = 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito
name = "Burrito"
@@ -1773,10 +1368,7 @@
icon_state = "burrito"
trash = /obj/item/trash/plate
filling_color = "#A36A1F"
-
-/obj/item/weapon/reagent_containers/food/snacks/burrito/New()
- ..()
- reagents.add_reagent("nutriment", 5)
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/chimichanga
name = "Chimichanga"
@@ -1784,11 +1376,7 @@
icon_state = "chimichanga"
trash = /obj/item/trash/plate
filling_color = "#A36A1F"
-
-/obj/item/weapon/reagent_containers/food/snacks/chimichanga/New()
- ..()
- reagents.add_reagent("omnizine", 4) //Deadpool reference. Deal with it.
- reagents.add_reagent("cheese", 2)
+ list_reagents = list("omnizine" = 4, "cheese" = 2) //Deadpool reference. Deal with it.
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
name = "monkey's Delight"
@@ -1796,27 +1384,16 @@
icon_state = "monkeysdelight"
trash = /obj/item/trash/tray
filling_color = "#5C3C11"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 6
+ bitesize = 6
+ list_reagents = list("nutriment" = 10, "banana" = 5, "blackpepper" = 1, "sodiumchloride" = 1)
/obj/item/weapon/reagent_containers/food/snacks/baguette
name = "Baguette"
desc = "Bon appetit!"
icon_state = "baguette"
filling_color = "#E3D796"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 6, "blackpepper" = 1, "sodiumchloride" = 1)
/obj/item/weapon/reagent_containers/food/snacks/sandwich
name = "Sandwich"
@@ -1824,11 +1401,8 @@
icon_state = "sandwich"
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "Toasted Sandwich"
@@ -1836,12 +1410,8 @@
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carbon", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6, "carbon" = 2)
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -1849,11 +1419,8 @@
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
filling_color = "#D9BE29"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 7)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 7) //why make a regualr sandwhich when you can make grilled cheese, with this nutriment value?
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -1861,12 +1428,8 @@
icon_state = "tomatosoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#D92929"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 5, "tomatojuice" = 10)
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "Roffle Waffles"
@@ -1874,26 +1437,16 @@
icon_state = "rofflewaffles"
trash = /obj/item/trash/waffles
filling_color = "#FF00F7"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("psilocybin", 8)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 8, "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"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("oculine", 5)
- reagents.add_reagent("water", 5)
- bitesize = 10
+ bitesize = 10
+ list_reagents = list("nutriment" = 10, "tomatojuice" = 5, "oculine" = 5, "water" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -1901,63 +1454,44 @@
icon_state = "jellytoast"
trash = /obj/item/trash/plate
filling_color = "#B572AB"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 1)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+ list_reagents = list("nutriment" = 1, "cherryjelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+ list_reagents = list("nutriment" = 1, "slimejelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jellyburger
name = "Jelly Burger"
desc = "Culinary delight..?"
icon_state = "jellyburger"
filling_color = "#B572AB"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jellyburger/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+ list_reagents = list("nutriment" = 5, "slimejelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+ list_reagents = list("nutriment" = 5, "cherryjelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/milosoup
name = "Milosoup"
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 8, "water" = 5)
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
name = "Stewed Soy Meat"
desc = "Even non-vegetarians will LOVE this!"
icon_state = "stewedsoymeat"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/boiledspagetti
name = "Boiled Spagetti"
@@ -1965,11 +1499,8 @@
icon_state = "spagettiboiled"
trash = /obj/item/trash/plate
filling_color = "#FCEE81"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/boiledrice
name = "Boiled Rice"
@@ -1977,11 +1508,8 @@
icon_state = "boiledrice"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/ricepudding
name = "Rice Pudding"
@@ -1989,11 +1517,8 @@
icon_state = "rpudding"
trash = /obj/item/trash/snack_bowl
filling_color = "#FFFBDB"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "Spagetti"
@@ -2001,12 +1526,8 @@
icon_state = "pastatomato"
trash = /obj/item/trash/plate
filling_color = "#DE4545"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 6, "tomatojuice" = 10)
/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
name = "Spagetti & Meatballs"
@@ -2014,35 +1535,24 @@
icon_state = "meatballspagetti"
trash = /obj/item/trash/plate
filling_color = "#DE4545"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("synaptizine", 5)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8, "synaptizine" = 5)
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
desc = "A lawyers favourite"
icon_state = "spesslaw"
filling_color = "#DE4545"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("synaptizine", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 8, "synaptizine" = 10)
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "Poppy Pretzel"
desc = "A large soft pretzel full of POP!"
icon_state = "poppypretzel"
filling_color = "#AB7D2E"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "Carrot Fries"
@@ -2050,68 +1560,48 @@
icon_state = "carrotfries"
trash = /obj/item/trash/plate
filling_color = "#FAA005"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 3)
- reagents.add_reagent("oculine", 3)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("plantmatter" = 3, "oculine" = 3)
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger
name = "Super Bite Burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
filling_color = "#CCA26A"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 50)
- bitesize = 10
+ bitesize = 10
+ list_reagents = list("nutriment" = 50)
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
name = "Candied Apple"
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
filling_color = "#F21873"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 3) // A candy apple without sugar...
/obj/item/weapon/reagent_containers/food/snacks/applepie
name = "Apple Pie"
desc = "A pie containing sweet sweet love... or apple."
icon_state = "applepie"
filling_color = "#E0EDC5"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
-
+ bitesize = 3
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/cherrypie
name = "Cherry Pie"
desc = "Taste so good, make a grown man cry."
icon_state = "cherrypie"
filling_color = "#FF525A"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "Two Bread"
desc = "It is very bitter and winy."
icon_state = "twobread"
filling_color = "#DBCC9A"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "Jelly Sandwich"
@@ -2119,41 +1609,28 @@
icon_state = "jellysandwich"
trash = /obj/item/trash/plate
filling_color = "#9E3A78"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+ list_reagents = list("nutriment" = 2, "slimejelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+ list_reagents = list("nutriment" = 2, "cherryjelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
name = "Boiled Slime Core"
desc = "A boiled red thing."
icon_state = "boiledrorocore"
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("slimejelly" = 5)
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
icon_state = "mint"
filling_color = "#F2F2F2"
-
- New()
- ..()
- reagents.add_reagent("minttoxin", 1)
- bitesize = 1
+ list_reagents = list("minttoxin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
@@ -2161,29 +1638,24 @@
icon_state = "mushroomsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#E386BF"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
/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."
icon_state = "phelmbiscuit"
filling_color = "#CFB4C4"
+ bitesize = 2
+ list_reagents = list("nutriment" = 5)
- New()
- ..()
- if(prob(10))
- name = "exceptional plump helmet biscuit"
- desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("omnizine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
+ ..()
+ if(prob(10))
+ name = "exceptional plump helmet biscuit"
+ desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!" // Is this a reference?
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("omnizine", 5)
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2191,11 +1663,7 @@
icon_state = "chawanmushi"
trash = /obj/item/trash/snack_bowl
filling_color = "#F0F2E4"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2203,24 +1671,24 @@
icon_state = "beetsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#FAC9FF"
+ bitesize = 2
+ list_reagents = list("nutriment" = 8)
- New()
- ..()
- switch(rand(1,6))
- if(1)
- name = "borsch"
- if(2)
- name = "bortsch"
- if(3)
- name = "borstch"
- if(4)
- name = "borsh"
- if(5)
- name = "borshch"
- if(6)
- name = "borscht"
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+/obj/item/weapon/reagent_containers/food/snacks/beetsoup/New()
+ ..()
+ switch(rand(1,6))
+ if(1)
+ name = "borsch"
+ if(2)
+ name = "bortsch"
+ if(3)
+ name = "borstch"
+ if(4)
+ name = "borsh"
+ if(5)
+ name = "borshch"
+ if(6)
+ name = "borscht"
/obj/item/weapon/reagent_containers/food/snacks/herbsalad
name = "herb salad"
@@ -2228,11 +1696,8 @@
icon_state = "herbsalad"
trash = /obj/item/trash/snack_bowl
filling_color = "#76B87F"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 8)
/obj/item/weapon/reagent_containers/food/snacks/validsalad
name = "valid salad"
@@ -2240,12 +1705,8 @@
icon_state = "validsalad"
trash = /obj/item/trash/snack_bowl
filling_color = "#76B87F"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("omnizine", 5)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "omnizine" = 5)
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
@@ -2253,33 +1714,24 @@
icon_state = "gappletart"
trash = /obj/item/trash/plate
filling_color = "#FFFF00"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("gold", 5)
- spawn(1)
- reagents.del_reagent("egg")
- reagents.update_total()
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 8, "gold" = 5)
/obj/item/weapon/reagent_containers/food/snacks/dough_ball
name = "ball of raw dough"
desc = "A ball of raw dough, ready to be molded into new recipes."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
- attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if(istype(W,/obj/item/weapon/kitchen/rollingpin))
- user.visible_message( \
- "[user] flattens the dough with the rolling pin!", \
- "\blue You flatten the dough with your rolling pin!" \
- )
- new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(src.loc)
- qdel(src)
+ list_reagents = list("nutriment" = 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/dough_ball/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W,/obj/item/weapon/kitchen/rollingpin))
+ user.visible_message( \
+ "[user] flattens the dough with the rolling pin!", \
+ "You flatten the dough with your rolling pin!" \
+ )
+ new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(loc)
+ qdel(src)
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -2293,10 +1745,7 @@
icon_state = "flatdough"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice
slices_num = 3
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "slice of dough"
@@ -2312,11 +1761,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
slices_num = 5
filling_color = "#FF7575"
- New()
- ..()
- reagents.add_reagent("protein", 20)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 20, "nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
name = "meatbread slice"
@@ -2333,11 +1779,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
slices_num = 5
filling_color = "#8AFF75"
- New()
- ..()
- reagents.add_reagent("protein", 20)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 20, "nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
@@ -2353,12 +1796,8 @@
icon_state = "spidermeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("protein", 20)
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("toxin", 15)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15)
/obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
@@ -2366,9 +1805,7 @@
icon_state = "xenobreadslice"
trash = /obj/item/trash/plate
bitesize = 2
- New()
- ..()
- reagents.add_reagent("toxin", 2)
+ list_reagents = list("toxin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
name = "Banana-nut bread"
@@ -2377,11 +1814,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
slices_num = 5
filling_color = "#EDE5AD"
- New()
- ..()
- reagents.add_reagent("banana", 20)
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("banana" = 20, "nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
name = "Banana-nut bread slice"
@@ -2398,10 +1832,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
slices_num = 5
filling_color = "#F7FFE0"
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 30)
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
name = "Tofubread slice"
@@ -2411,7 +1843,6 @@
filling_color = "#F7FFE0"
bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
name = "Carrot Cake"
desc = "A favorite desert of a certain wascally wabbit. Not a lie."
@@ -2419,11 +1850,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
slices_num = 5
filling_color = "#FFD675"
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("oculine", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 25, "oculine" = 10)
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
name = "Carrot Cake slice"
@@ -2440,12 +1868,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice
slices_num = 5
filling_color = "#E6AEDB"
- New()
- ..()
- reagents.add_reagent("protein", 15)
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("mannitol", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 15, "nutriment" = 10, "mannitol" = 10)
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
name = "Brain Cake slice"
@@ -2462,10 +1886,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
slices_num = 5
filling_color = "#FAF7AF"
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 25)
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
name = "Cheese Cake slice"
@@ -2482,9 +1904,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
slices_num = 5
filling_color = "#F7EDD5"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+ list_reagents = list("nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
name = "Vanilla Cake slice"
@@ -2501,9 +1921,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
slices_num = 5
filling_color = "#FADA8E"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+ list_reagents = list("nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
name = "Orange Cake slice"
@@ -2520,9 +1938,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice
slices_num = 5
filling_color = "#CBFA8E"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+ list_reagents = list("nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice
name = "Lime Cake slice"
@@ -2539,9 +1955,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
slices_num = 5
filling_color = "#FAFA8E"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+ list_reagents = list("nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
name = "Lemon Cake slice"
@@ -2558,10 +1972,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
slices_num = 5
filling_color = "#805930"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("chocolate",20)
+ list_reagents = list("nutriment" = 20, "chocolate" = 20)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "Chocolate Cake slice"
@@ -2578,11 +1989,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
slices_num = 5
filling_color = "#FFF700"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("cheese", 20)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 20, "cheese" = 20)
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
name = "Cheese wedge"
@@ -2597,12 +2005,7 @@
icon_state = "weirdcheesewedge"
filling_color = "#00FF33"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("mercury", 5)
- reagents.add_reagent("lsd", 5)
- reagents.add_reagent("ethanol", 5)
- reagents.add_reagent("weird_cheese", 5)
+ list_reagents = list("mercury" = 5, "lsd" = 5, "ethanol" = 5, "weird_cheese" = 5)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
name = "Birthday Cake"
@@ -2611,11 +2014,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
slices_num = 5
filling_color = "#FFD6D6"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("sprinkles", 10)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 20, "sprinkles" = 10)
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
name = "Birthday Cake slice"
@@ -2632,14 +2032,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice
slices_num = 6
filling_color = "#FFE396"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- spawn(1)
- reagents.del_reagent("egg")
- reagents.update_total()
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/breadslice
name = "Bread slice"
@@ -2648,10 +2042,7 @@
trash = /obj/item/trash/plate
filling_color = "#D27332"
bitesize = 2
-
- New()
- ..()
- reagents.add_reagent("bread", 5)
+ list_reagents = list("bread" = 5)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
name = "Cream Cheese Bread"
@@ -2660,10 +2051,8 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
slices_num = 5
filling_color = "#FFF896"
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 20)
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
name = "Cream Cheese Bread slice"
@@ -2673,7 +2062,6 @@
filling_color = "#FFF896"
bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice
name = "Watermelon Slice"
desc = "A slice of watery goodness."
@@ -2681,7 +2069,6 @@
filling_color = "#FF3867"
bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
name = "Apple Cake"
desc = "A cake centred with Apple"
@@ -2689,9 +2076,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice
slices_num = 5
filling_color = "#EBF5B8"
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+ list_reagents = list("nutriment" = 15)
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice
name = "Apple Cake slice"
@@ -2708,10 +2093,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
slices_num = 5
filling_color = "#F5B951"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+ list_reagents = list("nutriment" = 15)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "Pumpkin Pie slice"
@@ -2726,10 +2108,7 @@
desc = "It's a salted cracker."
icon_state = "cracker"
filling_color = "#F5DEB8"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
+ list_reagents = list("nutriment" = 1)
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
name = "raw cutlet"
@@ -2737,17 +2116,16 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawcutlet"
bitesize = 1
- New()
- ..()
- reagents.add_reagent("protein", 1)
- attackby(obj/item/weapon/W, mob/user, params)
- if(istype(W,/obj/item/weapon/kitchen/knife))
- user.visible_message( \
- "[user] cuts the raw cutlet with the knife!", \
- "You cut the raw cutlet with your knife!" \
- )
- new /obj/item/weapon/reagent_containers/food/snacks/raw_bacon(src.loc)
- qdel(src)
+ list_reagents = list("protein" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W,/obj/item/weapon/kitchen/knife))
+ user.visible_message( \
+ "[user] cuts the raw cutlet with the knife!", \
+ "You cut the raw cutlet with your knife!" \
+ )
+ new /obj/item/weapon/reagent_containers/food/snacks/raw_bacon(loc)
+ qdel(src)
/////////////////////////////////////////////////PIZZA////////////////////////////////////////
@@ -2762,11 +2140,8 @@
icon_state = "pizzamargherita"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/margheritaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("nutriment", 40)
- reagents.add_reagent("tomatojuice", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 40, "tomatojuice" = 6)
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice
name = "Margherita slice"
@@ -2781,12 +2156,8 @@
icon_state = "meatpizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("protein", 30)
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("tomatojuice", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 30, "nutriment" = 20, "tomatojuice" = 6)
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
name = "Meatpizza slice"
@@ -2801,11 +2172,8 @@
icon_state = "mushroompizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("plantmatter", 25)
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("plantmatter" = 25, "nutriment" = 10)
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
name = "Mushroompizza slice"
@@ -2820,13 +2188,8 @@
icon_state = "vegetablepizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("plantmatter", 20)
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("oculine", 12)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("plantmatter" = 20, "nutriment" = 10, "tomatojuice" = 6, "oculine" = 12)
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
name = "Vegetable pizza slice"
@@ -2898,18 +2261,16 @@
icon_state = "pizzabox[boxes.len+1]"
-/obj/item/pizzabox/attack_hand( mob/user as mob )
-
- if( open && pizza )
- user.put_in_hands( pizza )
-
- to_chat(user, "\red You take the [src.pizza] out of the [src].")
- src.pizza = null
+/obj/item/pizzabox/attack_hand(mob/user)
+ if(open && pizza)
+ user.put_in_hands(pizza)
+ to_chat(user, "You take the [pizza] out of the [src].")
+ pizza = null
update_icon()
return
- if( boxes.len > 0 )
- if( user.get_inactive_hand() != src )
+ if(boxes.len > 0)
+ if(user.get_inactive_hand() != src)
..()
return
@@ -2917,15 +2278,14 @@
boxes -= box
user.put_in_hands( box )
- to_chat(user, "\red You remove the topmost [src] from your hand.")
+ to_chat(user, "You remove the topmost [src] from your hand.")
box.update_icon()
update_icon()
return
..()
-/obj/item/pizzabox/attack_self( mob/user as mob )
-
- if( boxes.len > 0 )
+/obj/item/pizzabox/attack_self(mob/user)
+ if(boxes.len > 0)
return
open = !open
@@ -2935,11 +2295,11 @@
update_icon()
-/obj/item/pizzabox/attackby( obj/item/I as obj, mob/user as mob , params)
- if( istype(I, /obj/item/pizzabox/) )
+/obj/item/pizzabox/attackby( obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/pizzabox/))
var/obj/item/pizzabox/box = I
- if( !box.open && !src.open )
+ if(!box.open && !open)
// Make a list of all boxes to be added
var/list/boxestoadd = list()
boxestoadd += box
@@ -2951,36 +2311,36 @@
box.loc = src
box.boxes = list() // Clear the box boxes so we don't have boxes inside boxes. - Xzibit
- src.boxes.Add( boxestoadd )
+ boxes.Add( boxestoadd )
box.update_icon()
update_icon()
- to_chat(user, "\red You put the [box] ontop of the [src]!")
+ to_chat(user, "You put the [box] ontop of the [src]!")
else
- to_chat(user, "\red The stack is too high!")
+ to_chat(user, "The stack is too high!")
else
- to_chat(user, "\red Close the [box] first!")
+ to_chat(user, "Close the [box] first!")
return
- if( istype(I, /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/) ) // Long ass fucking object name
+ if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/)) // Long ass fucking object name
- if( src.open )
+ if(open)
user.drop_item()
I.loc = src
- src.pizza = I
+ pizza = I
update_icon()
- to_chat(user, "\red You put the [I] in the [src]!")
+ to_chat(user, "You put the [I] in the [src]!")
else
- to_chat(user, "\red You try to push the [I] through the lid but it doesn't work!")
+ to_chat(user, "You try to push the [I] through the lid but it doesn't work!")
return
- if( istype(I, /obj/item/weapon/pen/) )
+ if(istype(I, /obj/item/weapon/pen/))
- if( src.open )
+ if(open)
return
var/t = input("Enter what you want to add to the tag:", "Write", null, null) as text
@@ -3017,110 +2377,63 @@
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "wrap"
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/beans
name = "tin of beans"
desc = "Musical fruit in a slightly less musical container."
icon_state = "beans"
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("beans",10)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 10, "beans" = 10)
/obj/item/weapon/reagent_containers/food/snacks/benedict
name = "eggs benedict"
desc = "There is only one egg on this, how rude."
icon_state = "benedict"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("egg", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 3, "egg" = 3)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
desc = "Fresh footlong ready to go down on."
icon_state = "hotdog"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("ketchup", 3)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 3, "ketchup" = 3)
/obj/item/weapon/reagent_containers/food/snacks/meatbun
name = "meat bun"
desc = "Has the potential to not be Dog."
icon_state = "meatbun"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 6
+ bitesize = 6
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "icecream sandwich"
desc = "Portable Ice-cream in it's own packaging."
icon_state = "icecreamsandwich"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("ice", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2, "ice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
icon_state = "notasandwich"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
name = "sugar cookie"
desc = "Just like your little sister used to make."
icon_state = "sugarcookie"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 5)
- spawn(1)
- reagents.del_reagent("egg")
- reagents.update_total()
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 2, "sugar" = 5)
/obj/item/weapon/reagent_containers/food/snacks/friedbanana
name = "Fried Banana"
desc = "Goreng Pisang, also known as fried bananas."
icon_state = "friedbanana"
- New()
- ..()
- reagents.add_reagent("sugar", 5)
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("cornoil", 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/tofurkey
- name = "Tofurkey"
- desc = "A fake turkey made from tofu."
- icon_state = "tofurkey"
- New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("ether", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/stuffing
- name = "Stuffing"
- desc = "Moist, peppery breadcrumbs for filling the body cavities of dead birds. Dig in!"
- icon_state = "stuffing"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+ list_reagents = list("sugar" = 5, "nutriment" = 8, "cornoil" = 4)
/obj/item/weapon/reagent_containers/food/snacks/dionaroast
name = "roast diona"
@@ -3128,46 +2441,31 @@
icon_state = "dionaroast"
trash = /obj/item/trash/plate
filling_color = "#75754B"
-
- New()
- ..()
- reagents.add_reagent("plantmatter", 4)
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("radium", 2)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("plantmatter" = 4, "nutriment" = 2, "radium" = 2)
/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
name = "boiled spider leg"
desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
icon_state = "spiderlegcooked"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("toxin", 2)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 3, "toxin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/spidereggs
name = "spider eggs"
desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
icon_state = "spidereggs"
- New()
- ..()
- reagents.add_reagent("protein", 2)
- reagents.add_reagent("toxin", 3)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 2, "toxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/spidereggsham
name = "green eggs and ham"
desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
icon_state = "spidereggsham"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("toxin", 3)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 6, "sodiumchloride" = 1, "toxin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
name = "Turkey"
@@ -3175,11 +2473,8 @@
icon_state = "turkey"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/turkeyslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("protein", 24)
- reagents.add_reagent("nutriment", 18)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("protein" = 24, "nutriment" = 18)
/obj/item/weapon/reagent_containers/food/snacks/turkeyslice
name = "turkey serving"
@@ -3196,56 +2491,41 @@
trash = /obj/item/trash/plate
filling_color = "#D6D9C1"
bitesize = 2
-
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("gravy", 5)
- reagents.add_reagent("mashedpotatoes", 10)
- bitesize = 2
+ list_reagents = list("nutriment" = 5, "gravy" = 5, "mashedpotatoes" = 10)
////////////////////////////////ICE CREAM///////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/icecream
- name = "ice cream"
- desc = "Delicious ice cream."
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "icecream_cone"
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("sugar",1)
- bitesize = 1
- update_icon()
+ name = "ice cream"
+ desc = "Delicious ice cream."
+ icon = 'icons/obj/kitchen.dmi'
+ icon_state = "icecream_cone"
+ list_reagents = list("nutriment" = 1, "sugar" = 1)
- update_icon()
- overlays.Cut()
- var/image/filling = image('icons/obj/kitchen.dmi', src, "icecream_color")
- filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+/obj/item/weapon/reagent_containers/food/snacks/icecream/New()
+ ..()
+ update_icon()
+
+/obj/item/weapon/reagent_containers/food/snacks/icecream/update_icon()
+ overlays.Cut()
+ var/image/filling = image('icons/obj/kitchen.dmi', src, "icecream_color")
+ filling.icon += mix_color_from_reagents(reagents.reagent_list)
+ overlays += filling
/obj/item/weapon/reagent_containers/food/snacks/icecream/icecreamcone
- name = "ice cream cone"
- desc = "Delicious ice cream."
- icon_state = "icecream_cone"
- volume = 50
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar",6)
- reagents.add_reagent("ice",2)
- bitesize = 3
+ name = "ice cream cone"
+ desc = "Delicious ice cream."
+ icon_state = "icecream_cone"
+ volume = 50
+ bitesize = 3
+ list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/icecream/icecreamcup
- name = "chocolate ice cream cone"
- desc = "Delicious ice cream."
- icon_state = "icecream_cup"
- volume = 50
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("chocolate",8)
- reagents.add_reagent("ice",2)
- bitesize = 6
+ name = "chocolate ice cream cone"
+ desc = "Delicious ice cream."
+ icon_state = "icecream_cup"
+ volume = 50
+ bitesize = 6
+ list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2)
/obj/item/weapon/reagent_containers/food/snacks/cereal
name = "box of cereal"
@@ -3253,18 +2533,15 @@
icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ list_reagents = list("nutriment" = 3)
+
/obj/item/weapon/reagent_containers/food/snacks/deepfryholder
name = "Deep Fried Foods Holder Obj"
desc = "If you can see this description the code for the deep fryer fucked up."
icon = 'icons/obj/food/food.dmi'
icon_state = "deepfried_holder_icon"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
@@ -3272,9 +2549,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ list_reagents = list("nutriment" = 3)
// Dough + rolling pin = flat dough
/obj/item/weapon/reagent_containers/food/snacks/dough/attackby(obj/item/I, mob/user, params)
@@ -3296,9 +2571,7 @@
icon_state = "flat dough"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice
slices_num = 3
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
@@ -3306,29 +2579,22 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "doughslice"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
+ list_reagents = list("nutriment" = 1)
/obj/item/weapon/reagent_containers/food/snacks/bun
name = "bun"
desc = "The base for any self-respecting burger."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "bun"
- bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+ bitesize = 3
+ list_reagents = list("nutriment" = 4)
/obj/item/weapon/reagent_containers/food/snacks/taco
name = "taco"
desc = "Take a bite!"
icon_state = "taco"
bitesize = 3
- New()
- ..()
- reagents.add_reagent("nutriment", 7)
+ list_reagents = list("nutriment" = 7)
/obj/item/weapon/reagent_containers/food/snacks/cutlet
name = "cutlet"
@@ -3336,9 +2602,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "cutlet"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("protein", 2)
+ list_reagents = list("protein" = 2)
/obj/item/weapon/reagent_containers/food/snacks/rawmeatball
name = "raw meatball"
@@ -3346,18 +2610,14 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawmeatball"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("protein", 2)
+ list_reagents = list("protein" = 2)
/obj/item/weapon/reagent_containers/food/snacks/hotdog
name = "hotdog"
desc = "Unrelated to dogs, maybe."
icon_state = "hotdog"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("protein", 6)
+ list_reagents = list("protein" = 6)
/obj/item/weapon/reagent_containers/food/snacks/flatbread
name = "flatbread"
@@ -3365,9 +2625,7 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flatbread"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
+ list_reagents = list("nutriment" = 3)
/obj/item/weapon/reagent_containers/food/snacks/rawsticks
name = "raw potato sticks"
@@ -3375,18 +2633,14 @@
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawsticks"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("plantmatter", 3)
+ list_reagents = list("plantmatter" = 3)
/obj/item/weapon/reagent_containers/food/snacks/ectoplasm
name = "ectoplasm"
desc = "A luminescent blob of what scientists refer to as 'ghost goo'."
icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"
- New()
- ..()
- reagents.add_reagent("ectoplasm", 10)
+ list_reagents = list("ectoplasm" = 10)
/obj/item/weapon/reagent_containers/food/snacks/liquidfood
name = "\improper LiquidFood Ration"
@@ -3394,12 +2648,8 @@
icon_state = "liquidfood"
trash = /obj/item/trash/liquidfood
filling_color = "#A8A8A8"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("iron", 3)
- bitesize = 4
+ bitesize = 4
+ list_reagents = list("nutriment" = 20, "iron" = 3)
/obj/item/weapon/reagent_containers/food/snacks/tastybread
@@ -3408,8 +2658,5 @@
icon_state = "tastybread"
trash = /obj/item/trash/tastybread
filling_color = "#A66829"
-
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+ bitesize = 2
+ list_reagents = list("nutriment" = 6)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index b71bb0be2d4..fafa983cf1d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -52,13 +52,13 @@
else
overlays += image('icons/obj/kitchen.dmi', "gridle")
-/obj/machinery/gibber/relaymove(mob/user as mob)
+/obj/machinery/gibber/relaymove(mob/user)
if(locked)
return
go_out()
-/obj/machinery/gibber/attack_hand(mob/user as mob)
+/obj/machinery/gibber/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN))
return
@@ -73,7 +73,7 @@
else
startgibbing(user)
-/obj/machinery/gibber/attackby(obj/item/P as obj, mob/user as mob, params)
+/obj/machinery/gibber/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = P
if(G.state < 2)
@@ -126,7 +126,7 @@
return
user.visible_message("[user] starts to put [victim] into the gibber!")
- src.add_fingerprint(user)
+ add_fingerprint(user)
if(do_after(user, 30, target = victim) && user.Adjacent(src) && victim.Adjacent(user) && !occupant)
user.visible_message("[user] stuffs [victim] into the gibber!")
@@ -155,7 +155,7 @@
return
for(var/obj/O in src)
- O.loc = src.loc
+ O.loc = loc
occupant.forceMove(get_turf(src))
occupant = null
@@ -212,11 +212,11 @@
/obj/machinery/gibber/proc/startgibbing(var/mob/user, var/UserOverride=0)
if(!istype(user) && !UserOverride)
- log_debug("Some shit just went down with the gibber at X[x], Y[y], Z[z] with an invalid user. (JMP)")
+ log_debug("Some shit just went down with the gibber at X[x], Y[y], Z[z] with an invalid user. (JMP)")
return
if(UserOverride)
- msg_admin_attack("[key_name_admin(occupant)] was gibbed by an autogibber (\the [src]) (JMP)")
+ msg_admin_attack("[key_name_admin(occupant)] was gibbed by an autogibber (\the [src]) (JMP)")
if(operating)
return
@@ -236,7 +236,7 @@
var/slab_name = occupant.name
var/slab_count = 3
var/slab_type = /obj/item/weapon/reagent_containers/food/snacks/meat/human //gibber can only gib humans on paracode, no need to check meat type
- var/slab_nutrition = src.occupant.nutrition / 15
+ var/slab_nutrition = occupant.nutrition / 15
slab_nutrition /= slab_count
@@ -352,7 +352,7 @@
feedinTopanim()
return 1
-/obj/machinery/gibber/autogibber/proc/ejectclothes(var/mob/living/carbon/human/H)
+/obj/machinery/gibber/autogibber/proc/ejectclothes(mob/living/carbon/human/H)
if(!istype(H)) return 0
if(H != occupant) return 0 //only using H as a shortcut to typecast
for(var/obj/O in H)
@@ -367,7 +367,7 @@
if(O.flags & NODROP)
qdel(O) //they are already dead by now
H.unEquip(O)
- O.loc = src.loc
+ O.loc = loc
O.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
sleep(1)
@@ -375,7 +375,7 @@
if(C.flags & NODROP)
qdel(C)
H.unEquip(C)
- C.loc = src.loc
+ C.loc = loc
C.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
sleep(1)
@@ -385,7 +385,7 @@
var/spats = 0 //keeps track of how many items get spit out. Don't show a message if none are found.
for(var/obj/O in src)
if(istype(O))
- O.loc = src.loc
+ O.loc = loc
O.throw_at(get_edge_target_turf(src,gib_throw_dir),rand(1,5),15)
spats++
sleep(1)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat_2.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat_2.dm
index f0fb01efad2..19da4fb85ac 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat_2.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat_2.dm
@@ -63,11 +63,11 @@ var/list/ingredients_source = list(
while(ingredients.len < 11)
ingredients.Add(5)
-/obj/machinery/icecream_vat/attack_hand(mob/user as mob)
+/obj/machinery/icecream_vat/attack_hand(mob/user)
user.set_machine(src)
interact(user)
-/obj/machinery/icecream_vat/interact(mob/user as mob)
+/obj/machinery/icecream_vat/interact(mob/user)
var/dat
dat += "Dispense vanilla icecream There is [ingredients[ICECREAM_VANILLA]] scoops of vanilla icecream left (made from milk and ice).
"
dat += "Dispense strawberry icecream There is [ingredients[FLAVOUR_STRAWBERRY]] dollops of strawberry flavouring left (obtained from berry juice.
"
@@ -91,7 +91,7 @@ var/list/ingredients_source = list(
popup.set_content(dat)
popup.open(0)
-/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/icecream_vat/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/reagent_containers))
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream))
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
@@ -99,7 +99,7 @@ var/list/ingredients_source = list(
if(ingredients[ICECREAM_VANILLA] > 0)
var/flavour_name = get_icecream_flavour_string(dispense_flavour)
if(dispense_flavour < 11 && ingredients[dispense_flavour] > 0)
- src.visible_message("[bicon(src)] [user] scoops delicious [flavour_name] flavoured icecream into [I].")
+ visible_message("[bicon(src)] [user] scoops delicious [flavour_name] flavoured icecream into [I].")
ingredients[dispense_flavour] -= 1
ingredients[ICECREAM_VANILLA] -= 1
@@ -127,7 +127,7 @@ var/list/ingredients_source = list(
else
var/obj/item/weapon/reagent_containers/R = O
if(R.reagents)
- src.visible_message("[user] has emptied all of [R] into [src].")
+ visible_message("[user] has emptied all of [R] into [src].")
for(var/datum/reagent/current_reagent in R.reagents.reagent_list)
if(ingredients_source[current_reagent.id])
add(ingredients_source[current_reagent.id], current_reagent.volume / 2)
@@ -151,7 +151,7 @@ var/list/ingredients_source = list(
ingredients[INGR_FLOUR] -= amount
ingredients[INGR_SUGAR] -= amount
ingredients[CONE_WAFFLE] += amount
- src.visible_message("[user] cooks up some waffle cones.")
+ visible_message("[user] cooks up some waffle cones.")
else
to_chat(user, "You require sugar and flour to make waffle cones.")
if(CONE_CHOC)
@@ -160,7 +160,7 @@ var/list/ingredients_source = list(
ingredients[CONE_WAFFLE] -= amount
ingredients[FLAVOUR_CHOCOLATE] -= amount
ingredients[CONE_CHOC] += amount
- src.visible_message("[user] cooks up some chocolate cones.")
+ visible_message("[user] cooks up some chocolate cones.")
else
to_chat(user, "You require waffle cones and chocolate flavouring to make chocolate cones.")
if(ICECREAM_VANILLA)
@@ -169,7 +169,7 @@ var/list/ingredients_source = list(
ingredients[INGR_ICE] -= amount
ingredients[INGR_MILK] -= amount
ingredients[ICECREAM_VANILLA] += amount
- src.visible_message("[user] whips up some vanilla icecream.")
+ visible_message("[user] whips up some vanilla icecream.")
else
to_chat(user, "You require milk and ice to make vanilla icecream.")
updateDialog()
@@ -179,7 +179,7 @@ var/list/ingredients_source = list(
return
if(href_list["dispense"])
dispense_flavour = text2num(href_list["dispense"])
- src.visible_message("\blue[usr] sets [src] to dispense [get_icecream_flavour_string(dispense_flavour)] flavoured icecream.")
+ visible_message("\blue[usr] sets [src] to dispense [get_icecream_flavour_string(dispense_flavour)] flavoured icecream.")
if(href_list["cone"])
var/dispense_cone = text2num(href_list["cone"])
@@ -187,11 +187,11 @@ var/list/ingredients_source = list(
var/cone_name = get_icecream_flavour_string(dispense_cone)
if(ingredients[dispense_cone] >= 1)
ingredients[dispense_cone] -= 1
- var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(src.loc)
+ var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = new(loc)
I.cone_type = cone_name
I.icon_state = "icecream_cone_[cone_name]"
I.desc = "Delicious [cone_name] cone, but no ice cream."
- src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].")
+ visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].")
else
to_chat(usr, "There are no [cone_name] cones left!")
updateDialog()
@@ -202,7 +202,7 @@ var/list/ingredients_source = list(
if(href_list["eject"])
if(held_container)
- held_container.forceMove(src.loc)
+ held_container.forceMove(loc)
held_container = null
updateDialog()
@@ -231,7 +231,7 @@ var/list/ingredients_source = list(
/obj/item/weapon/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour)
var/flavour_name = get_icecream_flavour_string(flavour)
name = "[flavour_name] icecream"
- src.overlays += "icecream_[flavour_name]"
+ overlays += "icecream_[flavour_name]"
desc = "Delicious [cone_type] cone with a dollop of [flavour_name] ice cream."
ice_creamed = 1
diff --git a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
index e1cb054690f..03ceb5c0034 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/juicer.dm
@@ -35,7 +35,7 @@
return
-/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/juicer/attackby(obj/item/O, mob/user, params)
if(istype(O,/obj/item/weapon/reagent_containers/glass) || \
istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
if(beaker)
@@ -46,9 +46,9 @@
return 0
O.forceMove(src)
beaker = O
- src.verbs += /obj/machinery/juicer/verb/detach
+ verbs += /obj/machinery/juicer/verb/detach
update_icon()
- src.updateUsrDialog()
+ updateUsrDialog()
return 0
if(!is_type_in_list(O, allowed_items))
to_chat(user, "It doesn't look like that contains any juice.")
@@ -57,24 +57,24 @@
to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]")
return 0
O.forceMove(src)
- src.updateUsrDialog()
+ updateUsrDialog()
return 0
-/obj/machinery/juicer/attack_ai(mob/user as mob)
+/obj/machinery/juicer/attack_ai(mob/user)
return 0
-/obj/machinery/juicer/attack_hand(mob/user as mob)
+/obj/machinery/juicer/attack_hand(mob/user)
user.set_machine(src)
interact(user)
-/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/juicer/interact(mob/user) // The microwave Menu
var/is_chamber_empty = 0
var/is_beaker_ready = 0
var/processing_chamber = ""
var/beaker_contents = ""
for(var/i in allowed_items)
- for(var/obj/item/O in src.contents)
+ for(var/obj/item/O in contents)
if(!istype(O,i))
continue
processing_chamber+= "some [O]
"
@@ -119,7 +119,7 @@
if("detach")
detach()
- src.updateUsrDialog()
+ updateUsrDialog()
return
/obj/machinery/juicer/verb/detach()
@@ -130,8 +130,8 @@
return
if(!beaker)
return
- src.verbs -= /obj/machinery/juicer/verb/detach
- beaker.forceMove(src.loc)
+ verbs -= /obj/machinery/juicer/verb/detach
+ beaker.forceMove(loc)
beaker = null
update_icon()
@@ -159,8 +159,8 @@
return
if(!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
return
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
- for(var/obj/item/weapon/reagent_containers/food/snacks/O in src.contents)
+ playsound(loc, 'sound/machines/juicer.ogg', 50, 1)
+ for(var/obj/item/weapon/reagent_containers/food/snacks/O in contents)
var/r_id = get_juice_id(O)
beaker.reagents.add_reagent(r_id,get_juice_amount(O))
qdel(O)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index 648f228bb54..15458648513 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -56,7 +56,7 @@
* Item Adding
********************/
-/obj/machinery/kitchen_machine/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/kitchen_machine/attackby(obj/item/O, mob/user, params)
if(operating)
return
if(!broken && dirty < 100)
@@ -77,8 +77,8 @@
default_deconstruction_crowbar(O)
- if(src.broken > 0)
- if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver
+ if(broken > 0)
+ if(broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver
user.visible_message( \
"[user] starts to fix part of \the [src].", \
"You start to fix part of \the [src]." \
@@ -88,8 +88,8 @@
"[user] fixes part of \the [src].", \
"You have fixed part of \the [src]." \
)
- src.broken = 1 // Fix it a bit
- else if(src.broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench
+ broken = 1 // Fix it a bit
+ else if(broken == 1 && istype(O, /obj/item/weapon/wrench)) // If it's broken and they're doing the wrench
user.visible_message( \
"[user] starts to fix part of \the [src].", \
"You start to fix part of \the [src]." \
@@ -99,14 +99,14 @@
"[user] fixes \the [src].", \
"You have fixed \the [src]." \
)
- src.icon_state = off_icon
- src.broken = 0 // Fix it!
- src.dirty = 0 // just to be sure
- src.flags = OPENCONTAINER
+ icon_state = off_icon
+ broken = 0 // Fix it!
+ dirty = 0 // just to be sure
+ flags = OPENCONTAINER
else
to_chat(user, "It's broken!")
return 1
- else if(src.dirty==100) // The machine is all dirty so can't be used!
+ else if(dirty==100) // The machine is all dirty so can't be used!
if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them
user.visible_message( \
"[user] starts to clean \the [src].", \
@@ -117,10 +117,10 @@
"[user] has cleaned \the [src].", \
"You have cleaned \the [src]." \
)
- src.dirty = 0 // It's clean!
- src.broken = 0 // just to be sure
- src.icon_state = off_icon
- src.flags = OPENCONTAINER
+ dirty = 0 // It's clean!
+ broken = 0 // just to be sure
+ icon_state = off_icon
+ flags = OPENCONTAINER
else //Otherwise bad luck!!
to_chat(user, "It's dirty!")
return 1
@@ -161,12 +161,12 @@
else
to_chat(user, "You have no idea what you can cook with this [O].")
return 1
- src.updateUsrDialog()
+ updateUsrDialog()
-/obj/machinery/kitchen_machine/attack_ai(mob/user as mob)
+/obj/machinery/kitchen_machine/attack_ai(mob/user)
return 0
-/obj/machinery/kitchen_machine/attack_hand(mob/user as mob)
+/obj/machinery/kitchen_machine/attack_hand(mob/user)
user.set_machine(src)
interact(user)
@@ -174,15 +174,15 @@
* Machine Menu *
********************/
-/obj/machinery/kitchen_machine/interact(mob/user as mob) // The microwave Menu
+/obj/machinery/kitchen_machine/interact(mob/user) // The microwave Menu
if(panel_open || !anchored)
return
var/dat = ""
- if(src.broken > 0)
+ if(broken > 0)
dat = {"Bzzzzttttt"}
- else if(src.operating)
- dat = {"[pick(src.cook_verbs)] in progress!
Please wait...!"}
- else if(src.dirty==100)
+ else if(operating)
+ dat = {"[pick(cook_verbs)] in progress!
Please wait...!"}
+ else if(dirty==100)
dat = {"This [src] is dirty!
Please clean it before use!"}
else
var/list/items_counts = new
@@ -237,7 +237,7 @@
var/datum/browser/popup = new(user, name, name, 400, 400)
popup.set_content(dat)
popup.open(0)
- onclose(user, "[src.name]")
+ onclose(user, "[name]")
return
@@ -298,14 +298,14 @@
byproduct = recipe.get_byproduct()
stop()
if(cooked)
- cooked.forceMove(src.loc)
+ cooked.forceMove(loc)
for(var/i=1,i\The [src] turns on.", "You hear \a [src].")
- src.operating = 1
- src.icon_state = on_icon
- src.updateUsrDialog()
+ visible_message("\The [src] turns on.", "You hear \a [src].")
+ operating = 1
+ icon_state = on_icon
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/abort()
- src.operating = 0 // Turn it off again aferwards
- src.icon_state = off_icon
- src.updateUsrDialog()
+ operating = 0 // Turn it off again aferwards
+ icon_state = off_icon
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/stop()
- playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- src.operating = 0 // Turn it off again aferwards
- src.icon_state = off_icon
- src.updateUsrDialog()
+ playsound(loc, 'sound/machines/ding.ogg', 50, 1)
+ operating = 0 // Turn it off again aferwards
+ icon_state = off_icon
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/dispose()
for(var/obj/O in contents)
- O.forceMove(src.loc)
- if(src.reagents.total_volume)
- src.dirty++
- src.reagents.clear_reagents()
+ O.forceMove(loc)
+ if(reagents.total_volume)
+ dirty++
+ reagents.clear_reagents()
to_chat(usr, "You dispose of \the [src]'s contents.")
- src.updateUsrDialog()
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/muck_start()
- playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound
- src.icon_state = dirty_icon // Make it look dirty!!
+ playsound(loc, 'sound/effects/splat.ogg', 50, 1) // Play a splat sound
+ icon_state = dirty_icon // Make it look dirty!!
/obj/machinery/kitchen_machine/proc/muck_finish()
- playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- src.visible_message("\The [src] gets covered in muck!")
- src.dirty = 100 // Make it dirty so it can't be used util cleaned
- src.flags = null //So you can't add condiments
- src.icon_state = dirty_icon // Make it look dirty too
- src.operating = 0 // Turn it off again aferwards
- src.updateUsrDialog()
+ playsound(loc, 'sound/machines/ding.ogg', 50, 1)
+ visible_message("\The [src] gets covered in muck!")
+ dirty = 100 // Make it dirty so it can't be used util cleaned
+ flags = null //So you can't add condiments
+ icon_state = dirty_icon // Make it look dirty too
+ operating = 0 // Turn it off again aferwards
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/broke()
var/datum/effect/system/spark_spread/s = new
s.set_up(2, 1, src)
s.start()
- src.icon_state = broken_icon // Make it look all busted up and shit
- src.visible_message("The [src] breaks!") //Let them know they're stupid
- src.broken = 2 // Make it broken so it can't be used util fixed
- src.flags = null //So you can't add condiments
- src.operating = 0 // Turn it off again aferwards
- src.updateUsrDialog()
+ icon_state = broken_icon // Make it look all busted up and shit
+ visible_message("The [src] breaks!") //Let them know they're stupid
+ broken = 2 // Make it broken so it can't be used util fixed
+ flags = null //So you can't add condiments
+ operating = 0 // Turn it off again aferwards
+ updateUsrDialog()
/obj/machinery/kitchen_machine/proc/fail()
var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/ffuu = new(src)
@@ -382,7 +382,7 @@
if(id)
amount+=O.reagents.get_reagent_amount(id)
qdel(O)
- src.reagents.clear_reagents()
+ reagents.clear_reagents()
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
ffuu.forceMove(get_turf(src))
@@ -392,8 +392,8 @@
return
usr.set_machine(src)
- if(src.operating)
- src.updateUsrDialog()
+ if(operating)
+ updateUsrDialog()
return
switch(href_list["action"])
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index dc283e65d6c..e70ac59209e 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -33,7 +33,7 @@
cube_production = cubes_made
required_grind = req_grind
-/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/monkey_recycler/attackby(obj/item/O, mob/user, params)
if(default_deconstruction_screwdriver(user, "grinder_open", "grinder", O))
return
@@ -62,7 +62,7 @@
cycle_through = 0
to_chat(user, "You change the monkeycube type to [initial(cube_type.name)].")
- if(src.stat != 0) //NOPOWER etc
+ if(stat != 0) //NOPOWER etc
return
if(istype(O, /obj/item/weapon/grab))
var/obj/item/weapon/grab/G = O
@@ -76,11 +76,11 @@
user.drop_item()
qdel(target)
to_chat(user, "You stuff the monkey in the machine.")
- playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
+ playsound(loc, 'sound/machines/juicer.ogg', 50, 1)
var/offset = prob(50) ? -2 : 2
animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
use_power(500)
- src.grinded++
+ grinded++
sleep(50)
pixel_x = initial(pixel_x)
to_chat(user, "The machine now has [grinded] monkey\s worth of material stored.")
@@ -90,15 +90,15 @@
to_chat(user, "The machine only accepts monkeys!")
return
-/obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob)
- if(src.stat != 0) //NOPOWER etc
+/obj/machinery/monkey_recycler/attack_hand(mob/user)
+ if(stat != 0) //NOPOWER etc
return
if(grinded >= required_grind)
to_chat(user, "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube.")
- playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1)
+ playsound(loc, 'sound/machines/hiss.ogg', 50, 1)
grinded -= required_grind
for(var/i = 0, i < cube_production, i++) // Forgot to fix this bit the first time through
- new cube_type(src.loc)
+ new cube_type(loc)
to_chat(user, "The machine's display flashes that it has [grinded] monkey\s worth of material left.")
else // I'm not sure if the \s macro works with a word in between; I'll play it safe
to_chat(user, "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/oven.dm b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
index 796e8c4bd4b..6a47eb94ff5 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/oven.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/oven.dm
@@ -60,7 +60,7 @@
food_choices.Remove(U)
for(var/U in subtypesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/cook))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/cook/V = new U
- src.food_choices += V
+ food_choices += V
return
/obj/machinery/cooking/candy
@@ -75,5 +75,5 @@
food_choices.Remove(U)
for(var/U in subtypesof(/obj/item/weapon/reagent_containers/food/snacks/customizable/candy))
var/obj/item/weapon/reagent_containers/food/snacks/customizable/candy/V = new U
- src.food_choices += V
+ food_choices += V
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index d2b810dc7bb..5183fe6a4fa 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -58,9 +58,9 @@
var/time = 40
/datum/food_processor_process/proc/process_food(loc, what, obj/machinery/processor/processor)
- if(src.output && loc && processor)
+ if(output && loc && processor)
for(var/i = 0, i < processor.rating_amount, i++)
- new src.output(loc)
+ new output(loc)
if(what)
qdel(what)
@@ -154,9 +154,9 @@
return P
return 0
-/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/processor/attackby(obj/item/O, mob/user, params)
- if(src.processing)
+ if(processing)
to_chat(user, "\the [src] is already processing something!")
return 1
@@ -191,25 +191,25 @@
what.loc = src
return
-/obj/machinery/processor/attack_hand(var/mob/user as mob)
+/obj/machinery/processor/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN)) //no power or broken
return
- if(src.processing)
+ if(processing)
to_chat(user, "\the [src] is already processing something!")
return 1
- if(src.contents.len == 0)
+ if(contents.len == 0)
to_chat(user, "\the [src] is empty.")
return 1
- src.processing = 1
+ processing = 1
user.visible_message("[user] turns on [src].", \
"You turn on [src].", \
"You hear a food processor.")
- playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
+ playsound(loc, 'sound/machines/blender.ogg', 50, 1)
use_power(500)
var/total_time = 0
- for(var/O in src.contents)
+ for(var/O in contents)
var/datum/food_processor_process/P = select_recipe(O)
if(!P)
log_debug("The [O] in processor([src]) does not have a suitable recipe, but it was somehow put inside of the processor anyways.")
@@ -217,14 +217,14 @@
total_time += P.time
sleep(total_time / rating_speed)
- for(var/O in src.contents)
+ for(var/O in contents)
var/datum/food_processor_process/P = select_recipe(O)
if(!P)
log_debug("The [O] in processor([src]) does not have a suitable recipe, but it was somehow put inside of the processor anyways.")
continue
- P.process_food(src.loc, O, src)
- src.processing = 0
+ P.process_food(loc, O, src)
+ processing = 0
- src.visible_message("\the [src] has finished processing.", \
+ visible_message("\the [src] has finished processing.", \
"\the [src] has finished processing.", \
"You hear a food processor stopping.")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index c6f7e54a003..2446b74ad22 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -53,7 +53,7 @@
A.forceMove(loc)
return ..()
-/obj/machinery/smartfridge/proc/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/proc/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/grown/) || istype(O,/obj/item/seeds/))
return 1
return 0
@@ -66,7 +66,7 @@
icon_on = "seeds"
icon_off = "seeds-off"
-/obj/machinery/smartfridge/seeds/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/seeds/accept_check(obj/item/O)
if(istype(O,/obj/item/seeds/))
return 1
return 0
@@ -77,7 +77,7 @@
icon_state = "smartfridge" //To fix the icon in the map editor.
icon_on = "smartfridge_chem"
-/obj/machinery/smartfridge/medbay/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/medbay/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/glass/))
return 1
if(istype(O,/obj/item/weapon/storage/pill_bottle/))
@@ -91,7 +91,7 @@
desc = "A refrigerated storage unit for slime extracts"
req_access_txt = "47"
-/obj/machinery/smartfridge/secure/extract/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/extract/accept_check(obj/item/O)
if(istype(O,/obj/item/slime_extract))
return 1
return 0
@@ -103,7 +103,7 @@
icon_on = "smartfridge_chem"
req_one_access_txt = "5;33"
-/obj/machinery/smartfridge/secure/medbay/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/medbay/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/glass/))
return 1
if(istype(O,/obj/item/weapon/storage/pill_bottle/))
@@ -134,7 +134,7 @@
nanomanager.update_uis(src)
amount--
-/obj/machinery/smartfridge/chemistry/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/chemistry/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/storage/pill_bottle) || istype(O,/obj/item/weapon/reagent_containers))
return 1
return 0
@@ -154,7 +154,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/plasma = 1,
/obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine = 1)
-/obj/machinery/smartfridge/secure/chemistry/virology/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/secure/chemistry/virology/accept_check(obj/item/O)
if(istype(O, /obj/item/weapon/reagent_containers/syringe) || istype(O, /obj/item/weapon/reagent_containers/glass/bottle) || istype(O, /obj/item/weapon/reagent_containers/glass/beaker))
return 1
return 0
@@ -163,17 +163,17 @@
name = "\improper Drink Showcase"
desc = "A refrigerated storage unit for tasty tasty alcohol."
-/obj/machinery/smartfridge/drinks/accept_check(var/obj/item/O as obj)
+/obj/machinery/smartfridge/drinks/accept_check(obj/item/O)
if(istype(O,/obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks) || istype(O,/obj/item/weapon/reagent_containers/food/condiment))
return 1
/obj/machinery/smartfridge/process()
if(stat & (BROKEN|NOPOWER))
return
- if(src.seconds_electrified > 0)
- src.seconds_electrified--
- if(src.shoot_inventory && prob(2))
- src.throw_item()
+ if(seconds_electrified > 0)
+ seconds_electrified--
+ if(shoot_inventory && prob(2))
+ throw_item()
/obj/machinery/smartfridge/power_change()
var/old_stat = stat
@@ -192,9 +192,9 @@
* Item Adding
********************/
-/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/smartfridge/attackby(obj/item/O, mob/user)
if(istype(O, /obj/item/weapon/screwdriver) && anchored)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
panel_open = !panel_open
to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
overlays.Cut()
@@ -271,20 +271,20 @@
return 1
return 0
-/obj/machinery/smartfridge/attack_ai(mob/user as mob)
+/obj/machinery/smartfridge/attack_ai(mob/user)
return 0
-/obj/machinery/smartfridge/attack_ghost(mob/user as mob)
- return src.attack_hand(user)
+/obj/machinery/smartfridge/attack_ghost(mob/user)
+ return attack_hand(user)
-/obj/machinery/smartfridge/attack_hand(mob/user as mob)
+/obj/machinery/smartfridge/attack_hand(mob/user)
if(stat & (NOPOWER|BROKEN))
return
wires.Interact(user)
ui_interact(user)
//Drag pill bottle to fridge to empty it into the fridge
-/obj/machinery/smartfridge/MouseDrop_T(obj/over_object as obj, mob/user as mob)
+/obj/machinery/smartfridge/MouseDrop_T(obj/over_object, mob/user)
if(!istype(over_object, /obj/item/weapon/storage/pill_bottle)) //Only pill bottles, please
return
@@ -305,7 +305,7 @@
to_chat(user, "Some items are refused.")
nanomanager.update_uis(src)
-/obj/machinery/smartfridge/secure/emag_act(user as mob)
+/obj/machinery/smartfridge/secure/emag_act(user)
emagged = 1
locked = -1
to_chat(user, "You short out the product lock on [src].")
@@ -314,7 +314,7 @@
* SmartFridge Menu
********************/
-/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
user.set_machine(src)
var/data[0]
@@ -336,7 +336,7 @@
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if(!ui)
- ui = new(user, src, ui_key, "smartfridge.tmpl", src.name, 400, 500)
+ ui = new(user, src, ui_key, "smartfridge.tmpl", name, 400, 500)
ui.set_initial_data(data)
ui.open()
@@ -346,7 +346,7 @@
var/mob/user = usr
var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
- src.add_fingerprint(user)
+ add_fingerprint(user)
if(href_list["close"])
user.unset_machine()
@@ -387,7 +387,7 @@
item_quants[O]--
for(var/obj/T in contents)
if(T.name == O)
- T.forceMove(src.loc)
+ T.forceMove(loc)
throw_item = T
break
break
@@ -395,7 +395,7 @@
return 0
spawn(0)
throw_item.throw_at(target,16,3,src)
- src.visible_message("[src] launches [throw_item.name] at [target.name]!")
+ visible_message("[src] launches [throw_item.name] at [target.name]!")
return 1
/************************
diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm
index 2ab54fc0e27..98f969a17ec 100644
--- a/code/modules/food_and_drinks/recipes/recipes_candy.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm
@@ -78,6 +78,11 @@
items = list(/obj/item/weapon/reagent_containers/food/snacks/egg)
result = /obj/item/weapon/reagent_containers/food/snacks/candy/nougat
+/datum/recipe/candy/nougat/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/candy/nougat/being_cooked = ..()
+ being_cooked.reagents.del_reagent("egg")
+ return being_cooked
+
// ***********************************************************
// Base Candy Recipes (unflavored / plain)
// ***********************************************************
diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm
index 4c459b737ff..5845e860c9d 100644
--- a/code/modules/food_and_drinks/recipes/recipes_grill.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm
@@ -89,6 +89,11 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
+/datum/recipe/grill/fishfingers/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/fishfingers/being_cooked = ..()
+ being_cooked.reagents.del_reagent("egg")
+ return being_cooked
+
/datum/recipe/grill/cutlet
items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 0f58955a2bf..5903e191b4e 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -205,10 +205,11 @@
reagents = list("water" = 5, "vodka" = 5)
fruit = list("amanita" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/amanitajelly
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("amanitin")
- return being_cooked
+
+/datum/recipe/microwave/amanitajelly/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/being_cooked = ..()
+ being_cooked.reagents.del_reagent("amanitin")
+ return being_cooked
/datum/recipe/microwave/meatballsoup
reagents = list("water" = 10)
@@ -538,10 +539,11 @@ datum/recipe/microwave/slimesandwich
/datum/recipe/microwave/herbsalad
fruit = list("ambrosia" = 3, "apple" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("toxin")
- return being_cooked
+
+/datum/recipe/microwave/herbsalad/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..()
+ being_cooked.reagents.del_reagent("toxin")
+ return being_cooked
/datum/recipe/microwave/aesirsalad
fruit = list("ambrosiadeus" = 3, "goldapple" = 1)
@@ -553,10 +555,11 @@ datum/recipe/microwave/slimesandwich
/obj/item/weapon/reagent_containers/food/snacks/meatball,
)
result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("toxin")
- return being_cooked
+
+/datum/recipe/microwave/validsalad/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..()
+ being_cooked.reagents.del_reagent("toxin")
+ return being_cooked
////////////////////////////FOOD ADDITTIONS///////////////////////////////
diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm
index 9ee3ff3343e..d20c06e260f 100644
--- a/code/modules/food_and_drinks/recipes/recipes_oven.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm
@@ -176,20 +176,22 @@
/obj/item/weapon/paper,
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
- make_food(var/obj/container as obj)
+
+/datum/recipe/oven/fortunecookie/make_food(obj/container)
+ var/obj/item/weapon/paper/paper = locate() in container
+ paper.loc = null //prevent deletion
+ var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..()
+ paper.loc = being_cooked
+ being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
+ return being_cooked
+
+/datum/recipe/oven/fortunecookie/check_items(obj/container)
+ . = ..()
+ if(.)
var/obj/item/weapon/paper/paper = locate() in container
- paper.loc = null //prevent deletion
- var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
- paper.loc = being_cooked
- being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
- return being_cooked
- check_items(var/obj/container as obj)
- . = ..()
- if(.)
- var/obj/item/weapon/paper/paper = locate() in container
- if(!paper || !paper.info)
- return -1
- return .
+ if(!paper || !paper.info)
+ return -1
+ return .
/datum/recipe/oven/pizzamargherita
fruit = list("tomato" = 1)
@@ -293,6 +295,11 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
+/datum/recipe/oven/bread/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread/being_cooked = ..()
+ being_cooked.reagents.del_reagent("egg")
+ return being_cooked
+
/datum/recipe/oven/applepie
fruit = list("apple" = 1)
items = list(
@@ -377,6 +384,11 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/appletart
+/datum/recipe/oven/appletart/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/appletart/being_cooked = ..()
+ being_cooked.reagents.del_reagent("egg")
+ return being_cooked
+
/datum/recipe/oven/cracker
reagents = list("sodiumchloride" = 1)
items = list(
@@ -392,6 +404,11 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
+/datum/recipe/oven/sugarcookie/make_food(obj/container)
+ var/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/being_cooked = ..()
+ being_cooked.reagents.del_reagent("egg")
+ return being_cooked
+
/datum/recipe/oven/flatbread
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 1da5f07b2e5..a6fd792e795 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -80,12 +80,6 @@
icon_state = "pill8"
list_reagents = list("haloperidol" = 15)
-/obj/item/weapon/reagent_containers/food/pill/paroxetine
- name = "Paroxetine pill"
- desc = "Heavy anti-depressant."
- icon_state = "pill8"
- list_reagents = list("paroxetine" = 15)
-
/obj/item/weapon/reagent_containers/food/pill/happy
name = "Happy pill"
desc = "Happy happy joy joy!"