diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 26b35cdc487..b3ec99101bf 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -11,37 +11,24 @@
possible_transfer_amounts = list(5,10,25)
volume = 50
- on_reagent_change()
- if (gulp_size < 5) gulp_size = 5
- else gulp_size = max(round(reagents.total_volume / 5), 5)
+/obj/item/weapon/reagent_containers/food/drinks/on_reagent_change()
+ if (gulp_size < 5) gulp_size = 5
+ else gulp_size = max(round(reagents.total_volume / 5), 5)
- attack_self(mob/user as mob)
- return
+/obj/item/weapon/reagent_containers/food/drinks/attack_self(mob/user as mob)
+ return
- attack(mob/M as mob, mob/user as mob, def_zone)
+/obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone)
- if(!reagents || !reagents.total_volume)
- user << "None of [src] left, oh no!"
- return 0
+ if(!reagents || !reagents.total_volume)
+ user << "None of [src] left, oh no!"
+ return 0
- if(!canconsume(M, user))
- return 0
+ if(!canconsume(M, user))
+ return 0
- if(M == user)
- M << "You swallow a gulp of [src]."
- if(reagents.total_volume)
- reagents.reaction(M, INGEST)
- spawn(5)
- reagents.trans_to(M, gulp_size)
-
- playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
- return 1
-
- M.visible_message("[user] attempts to feed [src] to [M].", "You attempt to feed [src] to [M].")
- if(!do_mob(user, M)) return
- if(!reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding
- M.visible_message("[user] feeds [src] to [M].", "You feed [src] to [M].")
- add_logs(user, M, "fed", object="[reagentlist(src)]")
+ if(M == user)
+ M << "You swallow a gulp of [src]."
if(reagents.total_volume)
reagents.reaction(M, INGEST)
spawn(5)
@@ -50,57 +37,70 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
+ M.visible_message("[user] attempts to feed [src] to [M].", "You attempt to feed [src] to [M].")
+ if(!do_mob(user, M)) return
+ if(!reagents.total_volume) return // The drink might be empty after the delay, such as by spam-feeding
+ M.visible_message("[user] feeds [src] to [M].", "You feed [src] to [M].")
+ add_logs(user, M, "fed", object="[reagentlist(src)]")
+ if(reagents.total_volume)
+ reagents.reaction(M, INGEST)
+ spawn(5)
+ reagents.trans_to(M, gulp_size)
- afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
- if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
+ playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
+ return 1
- if(!target.reagents.total_volume)
- user << "[target] is empty."
- return
- if(reagents.total_volume >= reagents.maximum_volume)
- user << "[src] is full."
- return
+/obj/item/weapon/reagent_containers/food/drinks/afterattack(obj/target, mob/user , proximity)
+ if(!proximity) return
+ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
- var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
- user << "You fill [src] with [trans] units of the contents of [target]."
+ if(!target.reagents.total_volume)
+ user << "[target] is empty."
+ return
- else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
- if(!reagents.total_volume)
- user << "[src] is empty."
- return
+ if(reagents.total_volume >= reagents.maximum_volume)
+ user << "[src] is full."
+ return
- if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "[target] is full."
- return
+ var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
+ user << "You fill [src] with [trans] units of the contents of [target]."
- var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
- user << " You transfer [trans] units of the solution to [target]."
+ else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it.
+ if(!reagents.total_volume)
+ user << "[src] is empty."
+ return
- if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
- var/mob/living/silicon/robot/bro = user
- bro.cell.use(30)
- var/refill = reagents.get_master_reagent_id()
- spawn(600)
- reagents.add_reagent(refill, trans)
+ if(target.reagents.total_volume >= target.reagents.maximum_volume)
+ user << "[target] is full."
+ return
- return
+ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+ user << " You transfer [trans] units of the solution to [target]."
- examine()
- set src in view()
- ..()
- if (!(usr in range(0)) && usr!=src.loc) return
- if(!reagents || reagents.total_volume==0)
- usr << "\The [src] is empty!"
- else if (reagents.total_volume<=src.volume/4)
- usr << "\The [src] is almost empty!"
- else if (reagents.total_volume<=src.volume*0.66)
- usr << "\The [src] is half full!"
- else if (reagents.total_volume<=src.volume*0.90)
- usr << "\The [src] is almost full!"
- else
- usr << "\The [src] is full!"
+ if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
+ var/mob/living/silicon/robot/bro = user
+ bro.cell.use(30)
+ var/refill = reagents.get_master_reagent_id()
+ spawn(600)
+ reagents.add_reagent(refill, trans)
+
+ return
+
+/obj/item/weapon/reagent_containers/food/drinks/examine()
+ set src in view()
+ ..()
+ if (!(usr in range(0)) && usr!=src.loc) return
+ if(!reagents || reagents.total_volume==0)
+ usr << "\The [src] is empty!"
+ else if (reagents.total_volume<=src.volume/4)
+ usr << "\The [src] is almost empty!"
+ else if (reagents.total_volume<=src.volume*0.66)
+ usr << "\The [src] is half full!"
+ else if (reagents.total_volume<=src.volume*0.90)
+ usr << "\The [src] is almost full!"
+ else
+ usr << "\The [src] is full!"
////////////////////////////////////////////////////////////////////////////////
@@ -134,11 +134,12 @@
desc = "It's milk. White and nutritious goodness!"
icon_state = "milk"
item_state = "carton"
- New()
- ..()
- reagents.add_reagent("milk", 50)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/milk/New()
+ ..()
+ reagents.add_reagent("milk", 50)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/flour
name = "flour sack"
@@ -146,95 +147,104 @@
icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
- New()
- ..()
- reagents.add_reagent("flour", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/flour/New()
+ ..()
+ reagents.add_reagent("flour", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soymilk
name = "SoyMilk"
desc = "It's soy milk. White and nutritious goodness!"
icon_state = "soymilk"
item_state = "carton"
- New()
- ..()
- reagents.add_reagent("soymilk", 50)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soymilk/New()
+ ..()
+ reagents.add_reagent("soymilk", 50)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/coffee
name = "Robust Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
icon_state = "coffee"
- New()
- ..()
- reagents.add_reagent("coffee", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/coffee/New()
+ ..()
+ reagents.add_reagent("coffee", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/tea
name = "Duke Purple Tea"
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
icon_state = "tea"
item_state = "coffee"
- New()
- ..()
- reagents.add_reagent("tea", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/tea/New()
+ ..()
+ reagents.add_reagent("tea", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/ice
name = "Ice Cup"
desc = "Careful, cold ice, do not chew."
icon_state = "coffee"
- New()
- ..()
- reagents.add_reagent("ice", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/ice/New()
+ ..()
+ reagents.add_reagent("ice", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/h_chocolate
name = "Dutch Hot Coco"
desc = "Made in Space South America."
icon_state = "tea"
item_state = "coffee"
- New()
- ..()
- reagents.add_reagent("hot_coco", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/h_chocolate/New()
+ ..()
+ reagents.add_reagent("hot_coco", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/dry_ramen
name = "Cup Ramen"
desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
icon_state = "ramen"
- New()
- ..()
- reagents.add_reagent("dry_ramen", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/dry_ramen/New()
+ ..()
+ reagents.add_reagent("dry_ramen", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/beer
name = "Space Beer"
desc = "Beer. In space."
icon_state = "beer"
- New()
- ..()
- reagents.add_reagent("beer", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/beer/New()
+ ..()
+ reagents.add_reagent("beer", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/ale
name = "Magm-Ale"
desc = "A true dorf's drink of choice."
icon_state = "alebottle"
item_state = "beer"
- New()
- ..()
- reagents.add_reagent("ale", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/ale/New()
+ ..()
+ reagents.add_reagent("ale", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/sillycup
name = "Paper Cup"
@@ -242,15 +252,17 @@
icon_state = "water_cup_e"
possible_transfer_amounts = null
volume = 10
- New()
- ..()
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
- on_reagent_change()
- if(reagents.total_volume)
- icon_state = "water_cup"
- else
- icon_state = "water_cup_e"
+
+/obj/item/weapon/reagent_containers/food/drinks/sillycup/New()
+ ..()
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/sillycup/on_reagent_change()
+ if(reagents.total_volume)
+ icon_state = "water_cup"
+ else
+ icon_state = "water_cup_e"
//////////////////////////drinkingglass and shaker//
//Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink
@@ -292,87 +304,96 @@
name = "Space Cola"
desc = "Cola. in space."
icon_state = "cola"
- New()
- ..()
- reagents.add_reagent("cola", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola/New()
+ ..()
+ reagents.add_reagent("cola", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic
name = "T-Borg's Tonic Water"
desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
icon_state = "tonic"
- New()
- ..()
- reagents.add_reagent("tonic", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic/New()
+ ..()
+ reagents.add_reagent("tonic", 50)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater
name = "Soda Water"
desc = "A can of soda water. Why not make a scotch and soda?"
icon_state = "sodawater"
- New()
- ..()
- reagents.add_reagent("sodawater", 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater/New()
+ ..()
+ reagents.add_reagent("sodawater", 50)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime
name = "Orange Soda"
desc = "You wanted ORANGE. It gave you Lemon Lime."
icon_state = "lemon-lime"
- New()
- ..()
- name = "Lemon-Lime Soda"
- reagents.add_reagent("lemon_lime", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime/New()
+ ..()
+ name = "Lemon-Lime Soda"
+ reagents.add_reagent("lemon_lime", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up
name = "Space-Up"
desc = "Tastes like a hull breach in your mouth."
icon_state = "space-up"
- New()
- ..()
- reagents.add_reagent("space_up", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up/New()
+ ..()
+ reagents.add_reagent("space_up", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist
name = "Star-kist"
desc = "The taste of a star in liquid form. And, a bit of tuna...?"
icon_state = "starkist"
- New()
- ..()
- reagents.add_reagent("cola", 15)
- reagents.add_reagent("orangejuice", 15)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist/New()
+ ..()
+ reagents.add_reagent("cola", 15)
+ reagents.add_reagent("orangejuice", 15)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind
name = "Space Mountain Wind"
desc = "Blows right through you like a space wind."
icon_state = "space_mountain_wind"
- New()
- ..()
- reagents.add_reagent("spacemountainwind", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind/New()
+ ..()
+ reagents.add_reagent("spacemountainwind", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko
name = "Thirteen Loko"
desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably."
icon_state = "thirteen_loko"
- New()
- ..()
- reagents.add_reagent("thirteenloko", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko/New()
+ ..()
+ reagents.add_reagent("thirteenloko", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb
name = "Dr. Gibb"
desc = "A delicious mixture of 42 different flavors."
icon_state = "dr_gibb"
- New()
- ..()
- reagents.add_reagent("dr_gibb", 30)
- src.pixel_x = rand(-10.0, 10)
- src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb/New()
+ ..()
+ reagents.add_reagent("dr_gibb", 30)
+ src.pixel_x = rand(-10.0, 10)
+ src.pixel_y = rand(-10.0, 10)
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index 90673de7f8b..3864c80e917 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -130,105 +130,118 @@
name = "Griffeater Gin"
desc = "A bottle of high quality gin, produced in the New London Space Station."
icon_state = "ginbottle"
- New()
- ..()
- reagents.add_reagent("gin", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/gin/New()
+ ..()
+ reagents.add_reagent("gin", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey
name = "Uncle Git's Special Reserve"
desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES."
icon_state = "whiskeybottle"
- New()
- ..()
- reagents.add_reagent("whiskey", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey/New()
+ ..()
+ reagents.add_reagent("whiskey", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka
name = "Tunguska Triple Distilled"
desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide."
icon_state = "vodkabottle"
- New()
- ..()
- reagents.add_reagent("vodka", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/New()
+ ..()
+ reagents.add_reagent("vodka", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
icon_state = "tequillabottle"
- New()
- ..()
- reagents.add_reagent("tequilla", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla/New()
+ ..()
+ reagents.add_reagent("tequilla", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
desc = "A bottle filled with nothing"
icon_state = "bottleofnothing"
- New()
- ..()
- reagents.add_reagent("nothing", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing/New()
+ ..()
+ reagents.add_reagent("nothing", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/patron
name = "Wrapp Artiste Patron"
desc = "Silver laced tequilla, served in space night clubs across the galaxy."
icon_state = "patronbottle"
- New()
- ..()
- reagents.add_reagent("patron", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/patron/New()
+ ..()
+ reagents.add_reagent("patron", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/rum
name = "Captain Pete's Cuban Spiced Rum"
desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle."
icon_state = "rumbottle"
- New()
- ..()
- reagents.add_reagent("rum", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/rum/New()
+ ..()
+ reagents.add_reagent("rum", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater
name = "Flask of Holy Water"
desc = "A flask of the chaplain's holy water."
icon_state = "holyflask"
- New()
- ..()
- reagents.add_reagent("holywater", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/New()
+ ..()
+ reagents.add_reagent("holywater", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth
name = "Goldeneye Vermouth"
desc = "Sweet, sweet dryness~"
icon_state = "vermouthbottle"
- New()
- ..()
- reagents.add_reagent("vermouth", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth/New()
+ ..()
+ reagents.add_reagent("vermouth", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua
name = "Robert Robust's Coffee Liqueur"
desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK"
icon_state = "kahluabottle"
- New()
- ..()
- reagents.add_reagent("kahlua", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua/New()
+ ..()
+ reagents.add_reagent("kahlua", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager
name = "College Girl Goldschlager"
desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps."
icon_state = "goldschlagerbottle"
- New()
- ..()
- reagents.add_reagent("goldschlager", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/goldschlager/New()
+ ..()
+ reagents.add_reagent("goldschlager", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac
name = "Chateau De Baton Premium Cognac"
desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time."
icon_state = "cognacbottle"
- New()
- ..()
- reagents.add_reagent("cognac", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cognac/New()
+ ..()
+ reagents.add_reagent("cognac", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/wine
name = "Doublebeard Bearded Special Wine"
desc = "A faint aura of unease and asspainery surrounds the bottle."
icon_state = "winebottle"
- New()
- ..()
- reagents.add_reagent("wine", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/wine/New()
+ ..()
+ reagents.add_reagent("wine", 100)
//////////////////////////JUICES AND STUFF ///////////////////////
@@ -238,9 +251,10 @@
icon_state = "orangejuice"
item_state = "carton"
isGlass = 0
- New()
- ..()
- reagents.add_reagent("orangejuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice/New()
+ ..()
+ reagents.add_reagent("orangejuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/cream
name = "Milk Cream"
@@ -248,9 +262,10 @@
icon_state = "cream"
item_state = "carton"
isGlass = 0
- New()
- ..()
- reagents.add_reagent("cream", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/cream/New()
+ ..()
+ reagents.add_reagent("cream", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice
name = "Tomato Juice"
@@ -258,9 +273,10 @@
icon_state = "tomatojuice"
item_state = "carton"
isGlass = 0
- New()
- ..()
- reagents.add_reagent("tomatojuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice/New()
+ ..()
+ reagents.add_reagent("tomatojuice", 100)
/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice
name = "Lime Juice"
@@ -268,6 +284,7 @@
icon_state = "limejuice"
item_state = "carton"
isGlass = 0
- New()
- ..()
- reagents.add_reagent("limejuice", 100)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice/New()
+ ..()
+ reagents.add_reagent("limejuice", 100)
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index 353cb8e6f9f..6320f340a6d 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -7,450 +7,450 @@
amount_per_transfer_from_this = 10
volume = 50
- on_reagent_change()
- if (reagents.reagent_list.len > 0)
- switch(reagents.get_master_reagent_id())
- if("beer")
- icon_state = "beerglass"
- name = "glass of beer"
- desc = "A freezing pint of beer"
- if("beer2")
- icon_state = "beerglass"
- name = "glass of beer"
- desc = "A freezing pint of beer"
- if("greenbeer")
- icon_state = "greenbeerglass"
- name = "glass of green beer"
- desc = "A freezing pint of green beer. Festive."
- if("ale")
- icon_state = "aleglass"
- name = "glass of ale"
- desc = "A freezing pint of delicious Ale"
- if("milk")
- icon_state = "glass_white"
- name = "glass of milk"
- desc = "White and nutritious goodness!"
- if("cream")
- icon_state = "glass_white"
- name = "glass of cream"
- desc = "Ewwww..."
- if("hot_coco")
- icon_state = "chocolateglass"
- name = "glass of chocolate"
- desc = "Tasty"
- if("lemonjuice")
- icon_state = "lemonglass"
- name = "glass of lemon juice"
- desc = "Sour..."
- if("holywater")
- icon_state = "glass_clear"
- name = "glass of Holy Water"
- desc = "A glass of holy water."
- if("potato")
- icon_state = "glass_brown"
- name = "glass of potato juice"
- desc = "Bleh..."
- if("watermelonjuice")
- icon_state = "glass_red"
- name = "glass of watermelon juice"
- desc = "A glass of watermelon juice."
- if("cola")
- icon_state = "glass_brown"
- name = "glass of space Cola"
- desc = "A glass of refreshing Space Cola"
- if("nuka_cola")
- icon_state = "nuka_colaglass"
- name = "Nuka Cola"
- desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
- if("orangejuice")
- icon_state = "glass_orange"
- name = "glass of orange juice"
- desc = "Vitamins! Yay!"
- if("tomatojuice")
- icon_state = "glass_red"
- name = "glass of tomato juice"
- desc = "Are you sure this is tomato juice?"
- if("blood")
- icon_state = "glass_red"
- name = "glass of tomato juice"
- desc = "Are you sure this is tomato juice?"
- if("limejuice")
- icon_state = "glass_green"
- name = "glass of lime juice"
- desc = "A glass of sweet-sour lime juice."
- if("whiskey")
- icon_state = "whiskeyglass"
- name = "glass of whiskey"
- desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
- if("gin")
- icon_state = "ginvodkaglass"
- name = "glass of gin"
- desc = "A crystal clear glass of Griffeater gin."
- if("vodka")
- icon_state = "ginvodkaglass"
- name = "glass of vodka"
- desc = "The glass contain wodka. Xynta."
- if("goldschlager")
- icon_state = "ginvodkaglass"
- name = "glass of Goldschlager"
- desc = "100 proof that teen girls will drink anything with gold in it."
- if("wine")
- icon_state = "wineglass"
- name = "glass of wine"
- desc = "A very classy looking drink."
- if("cognac")
- icon_state = "cognacglass"
- name = "glass of cognac"
- desc = "Damn, you feel like some kind of French aristocrat just by holding this."
- if ("kahlua")
- icon_state = "kahluaglass"
- name = "glass of RR Coffee Liquor"
- desc = "DAMN, THIS THING LOOKS ROBUST"
- if("vermouth")
- icon_state = "vermouthglass"
- name = "glass of vermouth"
- desc = "You wonder why you're even drinking this straight."
- if("tequilla")
- icon_state = "tequillaglass"
- name = "glass of tequilla"
- desc = "Now all that's missing is the weird colored shades!"
- if("patron")
- icon_state = "patronglass"
- name = "glass of patron"
- desc = "Drinking patron in the bar, with all the subpar ladies."
- if("rum")
- icon_state = "rumglass"
- name = "glass of rum"
- desc = "Now you want to Pray for a pirate suit, don't you?"
- if("gintonic")
- icon_state = "gintonicglass"
- name = "Gin and Tonic"
- desc = "A mild but still great cocktail. Drink up, like a true Englishman."
- if("whiskeycola")
- icon_state = "whiskeycolaglass"
- name = "Whiskey Cola"
- desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
- if("whiterussian")
- icon_state = "whiterussianglass"
- name = "White Russian"
- desc = "A very nice looking drink. But that's just, like, your opinion, man."
- if("screwdrivercocktail")
- icon_state = "screwdriverglass"
- name = "Screwdriver"
- desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
- if("bloodymary")
- icon_state = "bloodymaryglass"
- name = "Bloody Mary"
- desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
- if("martini")
- icon_state = "martiniglass"
- name = "Classic Martini"
- desc = "Damn, the bartender even stirred it, not shook it."
- if("vodkamartini")
- icon_state = "martiniglass"
- name = "Vodka martini"
- desc ="A bastardisation of the classic martini. Still great."
- if("gargleblaster")
- icon_state = "gargleblasterglass"
- name = "Pan-Galactic Gargle Blaster"
- desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
- if("bravebull")
- icon_state = "bravebullglass"
- name = "Brave Bull"
- desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
- if("tequillasunrise")
- icon_state = "tequillasunriseglass"
- name = "Tequilla Sunrise"
- desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
- if("toxinsspecial")
- icon_state = "toxinsspecialglass"
- name = "Toxins Special"
- desc = "Whoah, this thing is on FIRE"
- if("beepskysmash")
- icon_state = "beepskysmashglass"
- name = "Beepsky Smash"
- desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
- if("doctorsdelight")
- icon_state = "doctorsdelightglass"
- name = "Doctor's Delight"
- desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
- if("manlydorf")
- icon_state = "manlydorfglass"
- name = "The Manly Dorf"
- desc = "A manly concotion made from Ale and Beer. Intended for true men only."
- if("irishcream")
- icon_state = "irishcreamglass"
- name = "Irish Cream"
- desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
- if("cubalibre")
- icon_state = "cubalibreglass"
- name = "Cuba Libre"
- desc = "A classic mix of rum and cola."
- if("b52")
- icon_state = "b52glass"
- name = "B-52"
- desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
- if("atomicbomb")
- icon_state = "atomicbombglass"
- name = "Atomic Bomb"
- desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
- if("longislandicedtea")
- icon_state = "longislandicedteaglass"
- name = "Long Island Iced Tea"
- desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- if("threemileisland")
- icon_state = "threemileislandglass"
- name = "Three Mile Island Ice Tea"
- desc = "A glass of this is sure to prevent a meltdown."
- if("margarita")
- icon_state = "margaritaglass"
- name = "Margarita"
- desc = "On the rocks with salt on the rim. Arriba~!"
- if("blackrussian")
- icon_state = "blackrussianglass"
- name = "Black Russian"
- desc = "For the lactose-intolerant. Still as classy as a White Russian."
- if("vodkatonic")
- icon_state = "vodkatonicglass"
- name = "Vodka and Tonic"
- desc = "For when a gin and tonic isn't Russian enough."
- if("manhattan")
- icon_state = "manhattanglass"
- name = "Manhattan"
- desc = "The Detective's undercover drink of choice. He never could stomach gin..."
- if("manhattan_proj")
- icon_state = "proj_manhattanglass"
- name = "Manhattan Project"
- desc = "A scientist drink of choice, for thinking how to blow up the station."
- if("ginfizz")
- icon_state = "ginfizzglass"
- name = "Gin Fizz"
- desc = "Refreshingly lemony, deliciously dry."
- if("irishcoffee")
- icon_state = "irishcoffeeglass"
- name = "Irish Coffee"
- desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
- if("hooch")
- icon_state = "glass_brown2"
- name = "Hooch"
- desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- if("whiskeysoda")
- icon_state = "whiskeysodaglass2"
- name = "Whiskey Soda"
- desc = "Ultimate refreshment."
- if("tonic")
- icon_state = "glass_clear"
- name = "Glass of Tonic Water"
- desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
- if("sodawater")
- icon_state = "glass_clear"
- name = "Glass of Soda Water"
- desc = "Soda water. Why not make a scotch and soda?"
- if("water")
- icon_state = "glass_clear"
- name = "Glass of Water"
- desc = "The father of all refreshments."
- if("spacemountainwind")
- icon_state = "Space_mountain_wind_glass"
- name = "Glass of Space Mountain Wind"
- desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
- if("thirteenloko")
- icon_state = "thirteen_loko_glass"
- name = "Glass of Thirteen Loko"
- desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass"
- if("dr_gibb")
- icon_state = "dr_gibb_glass"
- name = "Glass of Dr. Gibb"
- desc = "Dr. Gibb. Not as dangerous as the name might imply."
- if("space_up")
- icon_state = "space-up_glass"
- name = "Glass of Space-up"
- desc = "Space-up. It helps keep your cool."
- if("lemon_lime")
- icon_state = "glass_yellow"
- name = "Glass of Lemon-Lime"
- desc = "You're pretty certain a real fruit has never actually touched this."
- if("moonshine")
- icon_state = "glass_clear"
- name = "Moonshine"
- desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
- if("soymilk")
- icon_state = "glass_white"
- name = "Glass of soy milk"
- desc = "White and nutritious soy goodness!"
- if("berryjuice")
- icon_state = "berryjuice"
- name = "Glass of berry juice"
- desc = "Berry juice. Or maybe it's jam. Who cares?"
- if("poisonberryjuice")
- icon_state = "poisonberryjuice"
- name = "Glass of berry juice"
- desc = "Berry juice. Or maybe it's poison. Who cares?"
- if("carrotjuice")
- icon_state = "carrotjuice"
- name = "Glass of carrot juice"
- desc = "It is just like a carrot but without crunching."
- if("banana")
- icon_state = "banana"
- name = "Glass of banana juice"
- desc = "The raw essence of a banana. HONK"
- if("bahama_mama")
- icon_state = "bahama_mama"
- name = "Bahama Mama"
- desc = "Tropic cocktail"
- if("singulo")
- icon_state = "singulo"
- name = "Singulo"
- desc = "A blue-space beverage."
- if("alliescocktail")
- icon_state = "alliescocktail"
- name = "Allies cocktail"
- desc = "A drink made from your allies."
- if("antifreeze")
- icon_state = "antifreeze"
- name = "Anti-freeze"
- desc = "The ultimate refreshment."
- if("barefoot")
- icon_state = "b&p"
- name = "Barefoot"
- desc = "Barefoot and pregnant"
- if("demonsblood")
- icon_state = "demonsblood"
- name = "Demons Blood"
- desc = "Just looking at this thing makes the hair at the back of your neck stand up."
- if("booger")
- icon_state = "booger"
- name = "Booger"
- desc = "Ewww..."
- if("snowwhite")
- icon_state = "snowwhite"
- name = "Snow White"
- desc = "A cold refreshment."
- if("aloe")
- icon_state = "aloe"
- name = "Aloe"
- desc = "Very, very, very good."
- if("andalusia")
- icon_state = "andalusia"
- name = "Andalusia"
- desc = "A nice, strange named drink."
- if("sbiten")
- icon_state = "sbitenglass"
- name = "Sbiten"
- desc = "A spicy mix of Vodka and Spice. Very hot."
- if("red_mead")
- icon_state = "red_meadglass"
- name = "Red Mead"
- desc = "A True Vikings Beverage, though its color is strange."
- if("mead")
- icon_state = "meadglass"
- name = "Mead"
- desc = "A Vikings Beverage, though a cheap one."
- if("iced_beer")
- icon_state = "iced_beerglass"
- name = "Iced Beer"
- desc = "A beer so frosty, the air around it freezes."
- if("grog")
- icon_state = "grogglass"
- name = "Grog"
- desc = "A fine and cepa drink for Space."
- if("soy_latte")
- icon_state = "soy_latte"
- name = "Soy Latte"
- desc = "A nice and refrshing beverage while you are reading."
- if("cafe_latte")
- icon_state = "cafe_latte"
- name = "Cafe Latte"
- desc = "A nice, strong and refreshing beverage while you are reading."
- if("acidspit")
- icon_state = "acidspitglass"
- name = "Acid Spit"
- desc = "A drink from Nanotrasen. Made from live aliens."
- if("amasec")
- icon_state = "amasecglass"
- name = "Amasec"
- desc = "Always handy before COMBAT!!!"
- if("neurotoxin")
- icon_state = "neurotoxinglass"
- name = "Neurotoxin"
- desc = "A drink that is guaranteed to knock you silly."
- if("hippiesdelight")
- icon_state = "hippiesdelightglass"
- name = "Hippie's Delight"
- desc = "A drink enjoyed by people during the 1960's."
- if("bananahonk")
- icon_state = "bananahonkglass"
- name = "Banana Honk"
- desc = "A drink from Clown Heaven."
- if("silencer")
- icon_state = "silencerglass"
- name = "Silencer"
- desc = "A drink from mime Heaven."
- if("nothing")
- icon_state = "nothing"
- name = "Nothing"
- desc = "Absolutely nothing."
- if("devilskiss")
- icon_state = "devilskiss"
- name = "Devils Kiss"
- desc = "Creepy time!"
- if("changelingsting")
- icon_state = "changelingsting"
- name = "Changeling Sting"
- desc = "A stingy drink."
- if("irishcarbomb")
- icon_state = "irishcarbomb"
- name = "Irish Car Bomb"
- desc = "An irish car bomb."
- if("syndicatebomb")
- icon_state = "syndicatebomb"
- name = "Syndicate Bomb"
- desc = "A syndicate bomb."
- if("erikasurprise")
- icon_state = "erikasurprise"
- name = "Erika Surprise"
- desc = "The surprise is, it's green!"
- if("driestmartini")
- icon_state = "driestmartiniglass"
- name = "Driest Martini"
- desc = "Only for the experienced. You think you see sand floating in the glass."
- if("ice")
- icon_state = "iceglass"
- name = "Glass of ice"
- desc = "Generally, you're supposed to put something else in there too..."
- if("icecoffee")
- icon_state = "icedcoffeeglass"
- name = "Iced Coffee"
- desc = "A drink to perk you up and refresh you!"
- if("icetea")
- icon_state = "icedteaglass"
- name = "Iced Tea"
- desc = "All natural, antioxidant-rich flavour sensation."
- if("coffee")
- icon_state = "glass_brown"
- name = "Glass of coffee"
- desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
- if("tea")
- icon_state = "teaglass"
- name = "Glass of tea"
- desc = "Drinking it from here would not seem right."
- if("bilk")
- icon_state = "glass_brown"
- name = "Glass of bilk"
- desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
- if("fuel")
- icon_state = "dr_gibb_glass"
- name = "Glass of welder fuel"
- desc = "Unless you are an industrial tool, this is probably not safe for consumption."
- else
- icon_state ="glass_brown"
- name = "Glass of ..what?"
- desc = "You can't really tell what this is."
- else
- icon_state = "glass_empty"
- name = "Drinking glass"
- desc = "Your standard drinking glass"
- return
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
+ if (reagents.reagent_list.len > 0)
+ switch(reagents.get_master_reagent_id())
+ if("beer")
+ icon_state = "beerglass"
+ name = "glass of beer"
+ desc = "A freezing pint of beer"
+ if("beer2")
+ icon_state = "beerglass"
+ name = "glass of beer"
+ desc = "A freezing pint of beer"
+ if("greenbeer")
+ icon_state = "greenbeerglass"
+ name = "glass of green beer"
+ desc = "A freezing pint of green beer. Festive."
+ if("ale")
+ icon_state = "aleglass"
+ name = "glass of ale"
+ desc = "A freezing pint of delicious Ale"
+ if("milk")
+ icon_state = "glass_white"
+ name = "glass of milk"
+ desc = "White and nutritious goodness!"
+ if("cream")
+ icon_state = "glass_white"
+ name = "glass of cream"
+ desc = "Ewwww..."
+ if("hot_coco")
+ icon_state = "chocolateglass"
+ name = "glass of chocolate"
+ desc = "Tasty"
+ if("lemonjuice")
+ icon_state = "lemonglass"
+ name = "glass of lemon juice"
+ desc = "Sour..."
+ if("holywater")
+ icon_state = "glass_clear"
+ name = "glass of Holy Water"
+ desc = "A glass of holy water."
+ if("potato")
+ icon_state = "glass_brown"
+ name = "glass of potato juice"
+ desc = "Bleh..."
+ if("watermelonjuice")
+ icon_state = "glass_red"
+ name = "glass of watermelon juice"
+ desc = "A glass of watermelon juice."
+ if("cola")
+ icon_state = "glass_brown"
+ name = "glass of space Cola"
+ desc = "A glass of refreshing Space Cola"
+ if("nuka_cola")
+ icon_state = "nuka_colaglass"
+ name = "Nuka Cola"
+ desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland"
+ if("orangejuice")
+ icon_state = "glass_orange"
+ name = "glass of orange juice"
+ desc = "Vitamins! Yay!"
+ if("tomatojuice")
+ icon_state = "glass_red"
+ name = "glass of tomato juice"
+ desc = "Are you sure this is tomato juice?"
+ if("blood")
+ icon_state = "glass_red"
+ name = "glass of tomato juice"
+ desc = "Are you sure this is tomato juice?"
+ if("limejuice")
+ icon_state = "glass_green"
+ name = "glass of lime juice"
+ desc = "A glass of sweet-sour lime juice."
+ if("whiskey")
+ icon_state = "whiskeyglass"
+ name = "glass of whiskey"
+ desc = "The silky, smokey whiskey goodness inside the glass makes the drink look very classy."
+ if("gin")
+ icon_state = "ginvodkaglass"
+ name = "glass of gin"
+ desc = "A crystal clear glass of Griffeater gin."
+ if("vodka")
+ icon_state = "ginvodkaglass"
+ name = "glass of vodka"
+ desc = "The glass contain wodka. Xynta."
+ if("goldschlager")
+ icon_state = "ginvodkaglass"
+ name = "glass of Goldschlager"
+ desc = "100 proof that teen girls will drink anything with gold in it."
+ if("wine")
+ icon_state = "wineglass"
+ name = "glass of wine"
+ desc = "A very classy looking drink."
+ if("cognac")
+ icon_state = "cognacglass"
+ name = "glass of cognac"
+ desc = "Damn, you feel like some kind of French aristocrat just by holding this."
+ if ("kahlua")
+ icon_state = "kahluaglass"
+ name = "glass of RR Coffee Liquor"
+ desc = "DAMN, THIS THING LOOKS ROBUST"
+ if("vermouth")
+ icon_state = "vermouthglass"
+ name = "glass of vermouth"
+ desc = "You wonder why you're even drinking this straight."
+ if("tequilla")
+ icon_state = "tequillaglass"
+ name = "glass of tequilla"
+ desc = "Now all that's missing is the weird colored shades!"
+ if("patron")
+ icon_state = "patronglass"
+ name = "glass of patron"
+ desc = "Drinking patron in the bar, with all the subpar ladies."
+ if("rum")
+ icon_state = "rumglass"
+ name = "glass of rum"
+ desc = "Now you want to Pray for a pirate suit, don't you?"
+ if("gintonic")
+ icon_state = "gintonicglass"
+ name = "Gin and Tonic"
+ desc = "A mild but still great cocktail. Drink up, like a true Englishman."
+ if("whiskeycola")
+ icon_state = "whiskeycolaglass"
+ name = "Whiskey Cola"
+ desc = "An innocent-looking mixture of cola and Whiskey. Delicious."
+ if("whiterussian")
+ icon_state = "whiterussianglass"
+ name = "White Russian"
+ desc = "A very nice looking drink. But that's just, like, your opinion, man."
+ if("screwdrivercocktail")
+ icon_state = "screwdriverglass"
+ name = "Screwdriver"
+ desc = "A simple, yet superb mixture of Vodka and orange juice. Just the thing for the tired engineer."
+ if("bloodymary")
+ icon_state = "bloodymaryglass"
+ name = "Bloody Mary"
+ desc = "Tomato juice, mixed with Vodka and a lil' bit of lime. Tastes like liquid murder."
+ if("martini")
+ icon_state = "martiniglass"
+ name = "Classic Martini"
+ desc = "Damn, the bartender even stirred it, not shook it."
+ if("vodkamartini")
+ icon_state = "martiniglass"
+ name = "Vodka martini"
+ desc ="A bastardisation of the classic martini. Still great."
+ if("gargleblaster")
+ icon_state = "gargleblasterglass"
+ name = "Pan-Galactic Gargle Blaster"
+ desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
+ if("bravebull")
+ icon_state = "bravebullglass"
+ name = "Brave Bull"
+ desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
+ if("tequillasunrise")
+ icon_state = "tequillasunriseglass"
+ name = "Tequilla Sunrise"
+ desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
+ if("toxinsspecial")
+ icon_state = "toxinsspecialglass"
+ name = "Toxins Special"
+ desc = "Whoah, this thing is on FIRE"
+ if("beepskysmash")
+ icon_state = "beepskysmashglass"
+ name = "Beepsky Smash"
+ desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+ if("doctorsdelight")
+ icon_state = "doctorsdelightglass"
+ name = "Doctor's Delight"
+ desc = "A healthy mixture of juices, guaranteed to keep you healthy until the next toolboxing takes place."
+ if("manlydorf")
+ icon_state = "manlydorfglass"
+ name = "The Manly Dorf"
+ desc = "A manly concotion made from Ale and Beer. Intended for true men only."
+ if("irishcream")
+ icon_state = "irishcreamglass"
+ name = "Irish Cream"
+ desc = "It's cream, mixed with whiskey. What else would you expect from the Irish?"
+ if("cubalibre")
+ icon_state = "cubalibreglass"
+ name = "Cuba Libre"
+ desc = "A classic mix of rum and cola."
+ if("b52")
+ icon_state = "b52glass"
+ name = "B-52"
+ desc = "Kahlua, Irish Cream, and cognac. You will get bombed."
+ if("atomicbomb")
+ icon_state = "atomicbombglass"
+ name = "Atomic Bomb"
+ desc = "Nanotrasen cannot take legal responsibility for your actions after imbibing."
+ if("longislandicedtea")
+ icon_state = "longislandicedteaglass"
+ name = "Long Island Iced Tea"
+ desc = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
+ if("threemileisland")
+ icon_state = "threemileislandglass"
+ name = "Three Mile Island Ice Tea"
+ desc = "A glass of this is sure to prevent a meltdown."
+ if("margarita")
+ icon_state = "margaritaglass"
+ name = "Margarita"
+ desc = "On the rocks with salt on the rim. Arriba~!"
+ if("blackrussian")
+ icon_state = "blackrussianglass"
+ name = "Black Russian"
+ desc = "For the lactose-intolerant. Still as classy as a White Russian."
+ if("vodkatonic")
+ icon_state = "vodkatonicglass"
+ name = "Vodka and Tonic"
+ desc = "For when a gin and tonic isn't Russian enough."
+ if("manhattan")
+ icon_state = "manhattanglass"
+ name = "Manhattan"
+ desc = "The Detective's undercover drink of choice. He never could stomach gin..."
+ if("manhattan_proj")
+ icon_state = "proj_manhattanglass"
+ name = "Manhattan Project"
+ desc = "A scientist drink of choice, for thinking how to blow up the station."
+ if("ginfizz")
+ icon_state = "ginfizzglass"
+ name = "Gin Fizz"
+ desc = "Refreshingly lemony, deliciously dry."
+ if("irishcoffee")
+ icon_state = "irishcoffeeglass"
+ name = "Irish Coffee"
+ desc = "Coffee and alcohol. More fun than a Mimosa to drink in the morning."
+ if("hooch")
+ icon_state = "glass_brown2"
+ name = "Hooch"
+ desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+ if("whiskeysoda")
+ icon_state = "whiskeysodaglass2"
+ name = "Whiskey Soda"
+ desc = "Ultimate refreshment."
+ if("tonic")
+ icon_state = "glass_clear"
+ name = "Glass of Tonic Water"
+ desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away."
+ if("sodawater")
+ icon_state = "glass_clear"
+ name = "Glass of Soda Water"
+ desc = "Soda water. Why not make a scotch and soda?"
+ if("water")
+ icon_state = "glass_clear"
+ name = "Glass of Water"
+ desc = "The father of all refreshments."
+ if("spacemountainwind")
+ icon_state = "Space_mountain_wind_glass"
+ name = "Glass of Space Mountain Wind"
+ desc = "Space Mountain Wind. As you know, there are no mountains in space, only wind."
+ if("thirteenloko")
+ icon_state = "thirteen_loko_glass"
+ name = "Glass of Thirteen Loko"
+ desc = "This is a glass of Thirteen Loko, it appears to be of the highest quality. The drink, not the glass"
+ if("dr_gibb")
+ icon_state = "dr_gibb_glass"
+ name = "Glass of Dr. Gibb"
+ desc = "Dr. Gibb. Not as dangerous as the name might imply."
+ if("space_up")
+ icon_state = "space-up_glass"
+ name = "Glass of Space-up"
+ desc = "Space-up. It helps keep your cool."
+ if("lemon_lime")
+ icon_state = "glass_yellow"
+ name = "Glass of Lemon-Lime"
+ desc = "You're pretty certain a real fruit has never actually touched this."
+ if("moonshine")
+ icon_state = "glass_clear"
+ name = "Moonshine"
+ desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+ if("soymilk")
+ icon_state = "glass_white"
+ name = "Glass of soy milk"
+ desc = "White and nutritious soy goodness!"
+ if("berryjuice")
+ icon_state = "berryjuice"
+ name = "Glass of berry juice"
+ desc = "Berry juice. Or maybe it's jam. Who cares?"
+ if("poisonberryjuice")
+ icon_state = "poisonberryjuice"
+ name = "Glass of berry juice"
+ desc = "Berry juice. Or maybe it's poison. Who cares?"
+ if("carrotjuice")
+ icon_state = "carrotjuice"
+ name = "Glass of carrot juice"
+ desc = "It is just like a carrot but without crunching."
+ if("banana")
+ icon_state = "banana"
+ name = "Glass of banana juice"
+ desc = "The raw essence of a banana. HONK"
+ if("bahama_mama")
+ icon_state = "bahama_mama"
+ name = "Bahama Mama"
+ desc = "Tropic cocktail"
+ if("singulo")
+ icon_state = "singulo"
+ name = "Singulo"
+ desc = "A blue-space beverage."
+ if("alliescocktail")
+ icon_state = "alliescocktail"
+ name = "Allies cocktail"
+ desc = "A drink made from your allies."
+ if("antifreeze")
+ icon_state = "antifreeze"
+ name = "Anti-freeze"
+ desc = "The ultimate refreshment."
+ if("barefoot")
+ icon_state = "b&p"
+ name = "Barefoot"
+ desc = "Barefoot and pregnant"
+ if("demonsblood")
+ icon_state = "demonsblood"
+ name = "Demons Blood"
+ desc = "Just looking at this thing makes the hair at the back of your neck stand up."
+ if("booger")
+ icon_state = "booger"
+ name = "Booger"
+ desc = "Ewww..."
+ if("snowwhite")
+ icon_state = "snowwhite"
+ name = "Snow White"
+ desc = "A cold refreshment."
+ if("aloe")
+ icon_state = "aloe"
+ name = "Aloe"
+ desc = "Very, very, very good."
+ if("andalusia")
+ icon_state = "andalusia"
+ name = "Andalusia"
+ desc = "A nice, strange named drink."
+ if("sbiten")
+ icon_state = "sbitenglass"
+ name = "Sbiten"
+ desc = "A spicy mix of Vodka and Spice. Very hot."
+ if("red_mead")
+ icon_state = "red_meadglass"
+ name = "Red Mead"
+ desc = "A True Vikings Beverage, though its color is strange."
+ if("mead")
+ icon_state = "meadglass"
+ name = "Mead"
+ desc = "A Vikings Beverage, though a cheap one."
+ if("iced_beer")
+ icon_state = "iced_beerglass"
+ name = "Iced Beer"
+ desc = "A beer so frosty, the air around it freezes."
+ if("grog")
+ icon_state = "grogglass"
+ name = "Grog"
+ desc = "A fine and cepa drink for Space."
+ if("soy_latte")
+ icon_state = "soy_latte"
+ name = "Soy Latte"
+ desc = "A nice and refrshing beverage while you are reading."
+ if("cafe_latte")
+ icon_state = "cafe_latte"
+ name = "Cafe Latte"
+ desc = "A nice, strong and refreshing beverage while you are reading."
+ if("acidspit")
+ icon_state = "acidspitglass"
+ name = "Acid Spit"
+ desc = "A drink from Nanotrasen. Made from live aliens."
+ if("amasec")
+ icon_state = "amasecglass"
+ name = "Amasec"
+ desc = "Always handy before COMBAT!!!"
+ if("neurotoxin")
+ icon_state = "neurotoxinglass"
+ name = "Neurotoxin"
+ desc = "A drink that is guaranteed to knock you silly."
+ if("hippiesdelight")
+ icon_state = "hippiesdelightglass"
+ name = "Hippie's Delight"
+ desc = "A drink enjoyed by people during the 1960's."
+ if("bananahonk")
+ icon_state = "bananahonkglass"
+ name = "Banana Honk"
+ desc = "A drink from Clown Heaven."
+ if("silencer")
+ icon_state = "silencerglass"
+ name = "Silencer"
+ desc = "A drink from mime Heaven."
+ if("nothing")
+ icon_state = "nothing"
+ name = "Nothing"
+ desc = "Absolutely nothing."
+ if("devilskiss")
+ icon_state = "devilskiss"
+ name = "Devils Kiss"
+ desc = "Creepy time!"
+ if("changelingsting")
+ icon_state = "changelingsting"
+ name = "Changeling Sting"
+ desc = "A stingy drink."
+ if("irishcarbomb")
+ icon_state = "irishcarbomb"
+ name = "Irish Car Bomb"
+ desc = "An irish car bomb."
+ if("syndicatebomb")
+ icon_state = "syndicatebomb"
+ name = "Syndicate Bomb"
+ desc = "A syndicate bomb."
+ if("erikasurprise")
+ icon_state = "erikasurprise"
+ name = "Erika Surprise"
+ desc = "The surprise is, it's green!"
+ if("driestmartini")
+ icon_state = "driestmartiniglass"
+ name = "Driest Martini"
+ desc = "Only for the experienced. You think you see sand floating in the glass."
+ if("ice")
+ icon_state = "iceglass"
+ name = "Glass of ice"
+ desc = "Generally, you're supposed to put something else in there too..."
+ if("icecoffee")
+ icon_state = "icedcoffeeglass"
+ name = "Iced Coffee"
+ desc = "A drink to perk you up and refresh you!"
+ if("icetea")
+ icon_state = "icedteaglass"
+ name = "Iced Tea"
+ desc = "All natural, antioxidant-rich flavour sensation."
+ if("coffee")
+ icon_state = "glass_brown"
+ name = "Glass of coffee"
+ desc = "Don't drop it, or you'll send scalding liquid and glass shards everywhere."
+ if("tea")
+ icon_state = "teaglass"
+ name = "Glass of tea"
+ desc = "Drinking it from here would not seem right."
+ if("bilk")
+ icon_state = "glass_brown"
+ name = "Glass of bilk"
+ desc = "A brew of milk and beer. For those alcoholics who fear osteoporosis."
+ if("fuel")
+ icon_state = "dr_gibb_glass"
+ name = "Glass of welder fuel"
+ desc = "Unless you are an industrial tool, this is probably not safe for consumption."
+ else
+ icon_state ="glass_brown"
+ name = "Glass of ..what?"
+ desc = "You can't really tell what this is."
+ else
+ icon_state = "glass_empty"
+ name = "Drinking glass"
+ desc = "Your standard drinking glass"
+ return
// for /obj/machinery/vending/sovietsoda
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/soda
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index 9433751e0be..ff7706eec96 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -118,15 +118,15 @@
desc = "Used in cooking various dishes."
icon_state = "enzyme"
- New()
- ..()
- reagents.add_reagent("enzyme", 50)
+/obj/item/weapon/reagent_containers/food/condiment/enzyme/New()
+ ..()
+ reagents.add_reagent("enzyme", 50)
/obj/item/weapon/reagent_containers/food/condiment/sugar
- New()
- ..()
- reagents.add_reagent("sugar", 50)
+/obj/item/weapon/reagent_containers/food/condiment/sugar/New()
+ ..()
+ reagents.add_reagent("sugar", 50)
/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then
name = "Salt Shaker" // a large one.
@@ -136,9 +136,9 @@
amount_per_transfer_from_this = 1
volume = 20
- New()
- ..()
- reagents.add_reagent("sodiumchloride", 20)
+/obj/item/weapon/reagent_containers/food/condiment/saltshaker/New()
+ ..()
+ reagents.add_reagent("sodiumchloride", 20)
/obj/item/weapon/reagent_containers/food/condiment/peppermill
name = "Pepper Mill"
@@ -148,9 +148,9 @@
amount_per_transfer_from_this = 1
volume = 20
- New()
- ..()
- reagents.add_reagent("blackpepper", 20)
+/obj/item/weapon/reagent_containers/food/condiment/peppermill/New()
+ ..()
+ reagents.add_reagent("blackpepper", 20)
//Food packs. To easily apply deadly toxi... delicious sauces to your food!
/obj/item/weapon/reagent_containers/food/condiment/pack
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 6d3d4effe66..2d066e7b8c0 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -229,33 +229,36 @@
desc = "Probably too incredible for mortal men to fully enjoy."
icon_state = "aesirsalad"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 8)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New()
+ ..()
+ eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/herbsalad
name = "herb salad"
desc = "A tasty salad with apples on top."
icon_state = "herbsalad"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/validsalad
name = "valid salad"
desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
icon_state = "validsalad"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("doctorsdelight", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/validsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("doctorsdelight", 5)
+ bitesize = 3
////////////////////////////////////////////DONUTS////////////////////////////////////////////
@@ -266,49 +269,51 @@
/obj/item/weapon/reagent_containers/food/snacks/donut/normal
desc = "Goes great with Robust Coffee."
- 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)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/normal/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)
/obj/item/weapon/reagent_containers/food/snacks/donut/chaos
name = "chaos donut"
desc = "Like life, it never quite tastes the same."
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sprinkles", 1)
- bitesize = 10
- switch(rand(1,10))
- 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("coco", 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("tricordrazine", 3)
- if(prob(30))
- icon_state = "donut2"
- name = "frosted chaos donut"
- reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sprinkles", 1)
+ bitesize = 10
+ switch(rand(1,10))
+ 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("coco", 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("tricordrazine", 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
@@ -316,46 +321,49 @@
desc = "You jelly?"
icon_state = "jdonut1"
bitesize = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("berryjuice", 5)
+ 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"
bitesize = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("slimejelly", 5)
- bitesize = 5
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 5
+ 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"
bitesize = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("cherryjelly", 5)
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("cherryjelly", 5)
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
////////////////////////////////////////////WAFFLES////////////////////////////////////////////
@@ -364,41 +372,45 @@
desc = "Mmm, waffles."
icon_state = "waffles"
trash = /obj/item/trash/waffles
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/waffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
name = "\improper Soylent Green"
desc = "Not made of people. Honest." //Totally people.
icon_state = "soylent_green"
trash = /obj/item/trash/waffles
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "\improper Soylent Virdians"
desc = "Not made of people. Honest." //Actually honest for once.
icon_state = "soylent_yellow"
trash = /obj/item/trash/waffles
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "roffle waffles"
desc = "Waffles from Roffle. Co."
icon_state = "rofflewaffles"
trash = /obj/item/trash/waffles
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("mushroomhallucinogen", 8)
- bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("mushroomhallucinogen", 8)
+ bitesize = 4
////////////////////////////////////////////FISH////////////////////////////////////////////
@@ -407,23 +419,25 @@
desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
icon_state = "cubancarp"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- reagents.add_reagent("capsaicin", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("capsaicin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
name = "carp fillet"
desc = "A fillet of spess carp meat."
icon_state = "fishfillet"
- New()
- ..()
- eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New()
+ ..()
+ eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
name = "imitation carp fillet"
@@ -433,21 +447,23 @@
name = "fish fingers"
desc = "A finger of fish."
icon_state = "fishfingers"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
name = "fish and chips"
desc = "I do say so myself chap."
icon_state = "fishandchips"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
////////////////////////////////////////////EGGS////////////////////////////////////////////
@@ -455,41 +471,43 @@
name = "chocolate egg"
desc = "Such, sweet, fattening food."
icon_state = "chocolateegg"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/egg
name = "egg"
desc = "An egg!"
icon_state = "egg"
- New()
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
+ ..()
+ new/obj/effect/decal/cleanable/egg_smudge(src.loc)
+ reagents.reaction(hit_atom, TOUCH)
+ del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes.
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ 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")))
+ usr << "[src] refuses to take on this colour!"
+ return
+
+ usr << "You colour [src] [clr]."
+ icon_state = "egg-[clr]"
+ item_color = clr
+ else
..()
- reagents.add_reagent("nutriment", 1)
-
- throw_impact(atom/hit_atom)
- ..()
- new/obj/effect/decal/cleanable/egg_smudge(src.loc)
- reagents.reaction(hit_atom, TOUCH)
- del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes.
-
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- 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")))
- usr << "[src] refuses to take on this colour!"
- return
-
- usr << "You colour [src] [clr]."
- icon_state = "egg-[clr]"
- item_color = clr
- else
- ..()
/obj/item/weapon/reagent_containers/food/snacks/egg/blue
icon_state = "egg-blue"
@@ -527,20 +545,22 @@
name = "fried egg"
desc = "A fried egg, with a touch of salt and pepper."
icon_state = "friedegg"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/friedegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/boiledegg
name = "boiled egg"
desc = "A hard boiled egg."
icon_state = "egg"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS
name = "omelette du fromage"
@@ -548,33 +568,34 @@
icon_state = "omelette"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 1
+/obj/item/weapon/reagent_containers/food/snacks/omelette/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 1
- attackby(obj/item/weapon/W, mob/user)
- if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
- if(W.icon_state == "forkloaded")
- user << "You already have omelette on your fork."
- return
- W.icon_state = "forkloaded"
- user.visible_message( \
- "[user] takes a piece of omelette with their fork!", \
- "You take a piece of omelette with your fork!" \
- )
- reagents.remove_reagent("nutriment", 1)
- if(reagents.total_volume <= 0)
- qdel(src)
+/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user)
+ if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
+ if(W.icon_state == "forkloaded")
+ user << "You already have omelette on your fork."
+ return
+ W.icon_state = "forkloaded"
+ user.visible_message( \
+ "[user] takes a piece of omelette with their fork!", \
+ "You take a piece of omelette with your fork!" \
+ )
+ reagents.remove_reagent("nutriment", 1)
+ if(reagents.total_volume <= 0)
+ qdel(src)
/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", 6)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/benedict/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 3
////////////////////////////////////////////MUFFINS////////////////////////////////////////////
@@ -582,10 +603,11 @@
name = "muffin"
desc = "A delicious and spongy little cake."
icon_state = "muffin"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
name = "berry muffin"
@@ -605,40 +627,44 @@
desc = "Nougat love it or hate it."
icon_state = "candy"
trash = /obj/item/trash/candy
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("sugar", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/candy/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Can be stored in a detective's hat."
icon_state = "candy_corn"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chips
name = "chips"
desc = "Commander Riker's What-The-Crisps"
icon_state = "chips"
trash = /obj/item/trash/chips
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/chips/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cookie
name = "cookie"
desc = "COOKIE!!!"
icon_state = "COOKIE!!!"
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/cookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
name = "chocolate bar"
@@ -646,17 +672,18 @@
icon_state = "chocolatebarunwrapped"
wrapped = 0
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
- attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
- else
- ..()
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
+ if(wrapped)
+ Unwrap(user)
+ else
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user)
icon_state = "chocolatebarunwrapped"
@@ -674,153 +701,170 @@
name = "tofu"
desc = "We all love tofu."
icon_state = "tofu"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/tofu/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
name = "huge mushroom slice"
desc = "A slice from a huge mushroom."
icon_state = "hugemushroomslice"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
name = "tomato slice"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
- New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("hyperzine", 5)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 12)
+ reagents.add_reagent("hyperzine", 5)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/xenomeat
name = "meat"
desc = "A slab of meat"
icon_state = "xenomeat"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 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("nutriment", 3)
- reagents.add_reagent("toxin", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 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("nutriment", 2)
- reagents.add_reagent("toxin", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("toxin", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cornedbeef
name = "corned beef and cabbage"
desc = "Now you can feel like a real tourist vacationing in Ireland."
icon_state = "cornedbeef"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/faggot
name = "faggot"
desc = "A great meal all round. Not a cord of wood."
icon_state = "faggot"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/faggot/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sausage
name = "sausage"
desc = "A piece of mixed, long meat."
icon_state = "sausage"
- New()
- ..()
- eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
+ ..()
+ eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
name = "\improper Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
-
var/warm = 0
- proc/cooltime() //Not working, derp?
- if(warm)
- spawn(4200) //ew
- warm = 0
- reagents.del_reagent("tricordrazine")
- name = initial(name)
- return
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+
+
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
+ if(warm)
+ spawn(4200) //ew
+ warm = 0
+ reagents.del_reagent("tricordrazine")
+ name = initial(name)
+ return
/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
name = "wing fang chu"
desc = "A savory dish of alien wing wang in soy."
icon_state = "wingfangchu"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/human/kebab
name = "-kebab"
icon_state = "kebab"
desc = "A human meat, on a stick."
trash = /obj/item/stack/rods
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykebab
name = "meat-kebab"
icon_state = "kebab"
desc = "Delicious meat, on a stick."
trash = /obj/item/stack/rods
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofukebab
name = "tofu-kebab"
icon_state = "kebab"
desc = "Vegan meat, on a stick."
trash = /obj/item/stack/rods
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "popcorn"
@@ -828,18 +872,20 @@
icon_state = "popcorn"
trash = /obj/item/trash/popcorn
var/unpopped = 0
- New()
- ..()
- eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")
- 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()
- if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE
- usr << "\red You bite down on an un-popped kernel, and it hurts your teeth!"
- unpopped = max(0, unpopped-1)
- reagents.add_reagent("sacid",0.1) //only a little tingle.
- ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
+ ..()
+ eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")
+ 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
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
+ if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE
+ usr << "\red You bite down on an un-popped kernel, and it hurts your teeth!"
+ unpopped = max(0, unpopped-1)
+ reagents.add_reagent("sacid",0.1) //only a little tingle.
+ ..()
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
@@ -847,153 +893,168 @@
icon_state = "sosjerky"
desc = "Beef jerky made from the finest space cows."
trash = /obj/item/trash/sosjerky
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
name = "4no raisins"
icon_state = "4no_raisins"
desc = "Best raisins in the universe. Not sure why."
trash = /obj/item/trash/raisins
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
name = "space twinkie"
icon_state = "space_twinkie"
desc = "Guaranteed to survive longer than you will."
- New()
- ..()
- reagents.add_reagent("sugar", 4)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New()
+ ..()
+ reagents.add_reagent("sugar", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "cheesie honkers"
desc = "Bite sized cheesie snacks that will honk all over your mouth."
icon_state = "cheesie_honkers"
trash = /obj/item/trash/cheesie
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/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."
trash = /obj/item/trash/syndi_cakes
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("doctorsdelight", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/syndicake/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("doctorsdelight", 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
name = "loaded baked potato"
desc = "Totally baked."
icon_state = "loadedbakedpotato"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "space fries"
desc = "AKA: French Fries, Freedom Fries, etc."
icon_state = "fries"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/fries/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soydope
name = "soy dope"
desc = "Dope from a soy."
icon_state = "soydope"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soydope/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
name = "cheesy fries"
desc = "Fries. Covered in cheese. Duh."
icon_state = "cheesyfries"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
name = "fortune cookie"
desc = "A true prophecy in each cookie!"
icon_state = "fortune_cookie"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "burned mess"
desc = "Someone should be demoted from chef for this."
icon_state = "badrecipe"
- New()
- ..()
- eatverb = pick("choke down","nibble","gnaw","chomp")
- reagents.add_reagent("toxin", 1)
- reagents.add_reagent("carbon", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
+ ..()
+ eatverb = pick("choke down","nibble","gnaw","chomp")
+ reagents.add_reagent("toxin", 1)
+ reagents.add_reagent("carbon", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
name = "meat steak"
desc = "A piece of hot spicy meat."
icon_state = "meatsteak"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
name = "spacy liberty duff"
desc = "Jello gelatin, from Alfred Hubbard's cookbook."
icon_state = "spacylibertyduff"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("mushroomhallucinogen", 6)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("mushroomhallucinogen", 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
name = "amanita jelly"
desc = "Looks curiously toxic."
icon_state = "amanitajelly"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("amatoxin", 6)
- reagents.add_reagent("mushroomhallucinogen", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("amatoxin", 6)
+ reagents.add_reagent("mushroomhallucinogen", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "poppy pretzel"
desc = "It's all twisted up!"
icon_state = "poppypretzel"
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/* No more of this
/obj/item/weapon/reagent_containers/food/snacks/telebacon
@@ -1002,14 +1063,15 @@
icon_state = "bacon"
var/obj/item/device/radio/beacon/bacon/baconbeacon
bitesize = 2
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
- On_Consume()
- if(!reagents.total_volume)
- baconbeacon.loc = usr
- baconbeacon.digest_delay()
+
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume()
+ if(!reagents.total_volume)
+ baconbeacon.loc = usr
+ baconbeacon.digest_delay()
*/
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
@@ -1019,33 +1081,33 @@
bitesize = 12
wrapped = 0
- New()
- ..()
- reagents.add_reagent("nutriment",10)
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New()
+ ..()
+ reagents.add_reagent("nutriment",10)
- afterattack(obj/O, mob/user,proximity)
- if(!proximity) return
- if(istype(O,/obj/structure/sink) && !wrapped)
- user << "You place [src] under a stream of water..."
- user.drop_item()
- loc = get_turf(O)
- return Expand()
- ..()
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity)
+ if(!proximity) return
+ if(istype(O,/obj/structure/sink) && !wrapped)
+ user << "You place [src] under a stream of water..."
+ user.drop_item()
+ loc = get_turf(O)
+ return Expand()
+ ..()
- attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user)
+ if(wrapped)
+ Unwrap(user)
- proc/Expand()
- visible_message("[src] expands!")
- new /mob/living/carbon/monkey(get_turf(src))
- qdel(src)
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
+ visible_message("[src] expands!")
+ new /mob/living/carbon/monkey(get_turf(src))
+ qdel(src)
- proc/Unwrap(mob/user)
- icon_state = "monkeycube"
- desc = "Just add water!"
- user << "You unwrap the cube."
- wrapped = 0
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user)
+ icon_state = "monkeycube"
+ desc = "Just add water!"
+ user << "You unwrap the cube."
+ wrapped = 0
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped
@@ -1057,112 +1119,122 @@
name = "enchiladas"
desc = "Viva La Mexico!"
icon_state = "enchiladas"
- New()
- ..()
- reagents.add_reagent("nutriment",8)
- reagents.add_reagent("capsaicin", 6)
- bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New()
+ ..()
+ reagents.add_reagent("nutriment",8)
+ reagents.add_reagent("capsaicin", 6)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/stew
name = "stew"
desc = "A nice and warm stew. Healthy and strong."
icon_state = "stew"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
- bitesize = 10
+
+/obj/item/weapon/reagent_containers/food/snacks/stew/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("water", 5)
+ bitesize = 10
/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()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "carrot fries"
desc = "Tasty fries from fresh Carrots."
icon_state = "carrotfries"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("imidazoline", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("imidazoline", 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
name = "candied apple"
desc = "An apple coated in sugary sweetness."
icon_state = "candiedapple"
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 3
/*
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
name = "Boiled slime Core"
desc = "A boiled red thing."
icon_state = "boiledslimecore"
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 3
*/
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
desc = "it is only wafer thin."
icon_state = "mint"
- New()
- ..()
- reagents.add_reagent("minttoxin", 1)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/mint/New()
+ ..()
+ reagents.add_reagent("minttoxin", 1)
+ bitesize = 1
/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"
- 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("tricordrazine", 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!"
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 2
+ else
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
desc = "A tasty dessert that won't make it through a metal detector."
icon_state = "gappletart"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("gold", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/appletart/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("gold", 5)
+ bitesize = 3
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -1193,10 +1265,11 @@
icon_state = "cheesewheel"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
name = "cheese wedge"
@@ -1215,9 +1288,9 @@
desc = "It's a salted cracker."
icon_state = "cracker"
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
+/obj/item/weapon/reagent_containers/food/snacks/cracker/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
////////////////////////////////FOOD ADDITIONS////////////////////////////////////////////
@@ -1226,88 +1299,97 @@
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
icon_state = "wrap"
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/wrap/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
/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)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/beans/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/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", 6)
- reagents.add_reagent("ketchup", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/hotdog/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("ketchup", 3)
+ bitesize = 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
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbun/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 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)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sugar", 5)
+ bitesize = 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
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("toxin", 2)
+ bitesize = 3
/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("nutriment", 2)
- reagents.add_reagent("toxin", 3)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 2
/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
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/sashimi
name = "carp sashimi"
desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
icon_state = "sashimi"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("toxin", 5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/sashimi/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("toxin", 5)
+ bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm
index d35e905f857..82eed258268 100644
--- a/code/modules/food&drinks/food/snacks/meat.dm
+++ b/code/modules/food&drinks/food/snacks/meat.dm
@@ -3,10 +3,11 @@
desc = "A slab of meat"
icon_state = "meat"
dried_type = /obj/item/weapon/reagent_containers/food/snacks/sosjerky
- New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/food&drinks/food/snacks_bread.dm
index 01f8b0c2744..793dd7f1e9f 100644
--- a/code/modules/food&drinks/food/snacks_bread.dm
+++ b/code/modules/food&drinks/food/snacks_bread.dm
@@ -5,10 +5,11 @@
icon_state = "meatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/meatbread/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
name = "meatbread slice"
@@ -23,10 +24,11 @@
icon_state = "xenomeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/xenomeatbread/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
name = "xenomeatbread slice"
@@ -41,11 +43,12 @@
icon_state = "spidermeatbread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- reagents.add_reagent("toxin", 15)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/spidermeatbread/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("toxin", 15)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice
name = "spider meat bread slice"
@@ -53,9 +56,10 @@
icon_state = "xenobreadslice"
trash = /obj/item/trash/plate
bitesize = 2
- New()
- ..()
- reagents.add_reagent("toxin", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/spidermeatbreadslice/New()
+ ..()
+ reagents.add_reagent("toxin", 2)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bananabread
name = "banana-nut bread"
@@ -63,11 +67,12 @@
icon_state = "bananabread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("banana", 20)
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bananabread/New()
+ ..()
+ reagents.add_reagent("banana", 20)
+ reagents.add_reagent("nutriment", 20)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice
name = "banana-nut bread slice"
@@ -82,10 +87,11 @@
icon_state = "tofubread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/tofubread/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice
name = "tofubread slice"
@@ -100,10 +106,11 @@
icon_state = "bread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/bread/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/breadslice
name = "bread slice"
@@ -119,10 +126,11 @@
icon_state = "creamcheesebread"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/creamcheesebread/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
name = "cream cheese bread slice"
@@ -135,9 +143,10 @@
name = "baguette"
desc = "Bon appetit!"
icon_state = "baguette"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/baguette/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("sodiumchloride", 1)
+ bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index cd707375e7b..268f0502894 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -2,10 +2,11 @@
name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/burger/human
var/hname = ""
@@ -22,10 +23,11 @@
name = "fillet -o- carp sandwich"
desc = "Almost like a carp is yelling somewhere... Give me back that fillet -o- carp, give me that carp."
icon_state = "fishburger"
- New()
- ..()
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/fish/New()
+ ..()
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/tofu
name = "tofu burger"
@@ -36,27 +38,30 @@
name = "roburger"
desc = "The lettuce is the only organic component. Beep."
icon_state = "roburger"
- New()
- ..()
- reagents.add_reagent("nanites", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/roburger/New()
+ ..()
+ reagents.add_reagent("nanites", 2)
/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig
name = "roburger"
desc = "This massive patty looks like poison. Beep."
icon_state = "roburger"
volume = 106
- New()
- ..()
- reagents.add_reagent("nanites", 100)
- bitesize = 0.1
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/roburgerbig/New()
+ ..()
+ reagents.add_reagent("nanites", 100)
+ bitesize = 0.1
/obj/item/weapon/reagent_containers/food/snacks/burger/xeno
name = "xenoburger"
desc = "Smells caustic. Tastes like heresy."
icon_state = "xburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/xeno/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
/obj/item/weapon/reagent_containers/food/snacks/burger/clown
name = "clown burger"
@@ -72,9 +77,10 @@
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
icon_state = "brainburger"
- New()
- ..()
- reagents.add_reagent("alkysine", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/brain/New()
+ ..()
+ reagents.add_reagent("alkysine", 6)
/obj/item/weapon/reagent_containers/food/snacks/burger/ghost
name = "ghost burger"
@@ -86,60 +92,66 @@
desc = "Perfect for hiding the fact it's burnt to a crisp."
icon_state = "cburger"
color = "#DA0000FF"
- New()
- ..()
- reagents.add_reagent("redcrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/red/New()
+ ..()
+ reagents.add_reagent("redcrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/orange
name = "orange burger"
desc = "Contains 0% juice."
icon_state = "cburger"
color = "#FF9300FF"
- New()
- ..()
- reagents.add_reagent("orangecrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/orange/New()
+ ..()
+ reagents.add_reagent("orangecrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/yellow
name = "yellow burger"
desc = "Bright to the last bite."
icon_state = "cburger"
color = "#FFF200FF"
- New()
- ..()
- reagents.add_reagent("yellowcrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/yellow/New()
+ ..()
+ reagents.add_reagent("yellowcrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/green
name = "green burger"
desc = "It's not tainted meat, it's painted meat!"
icon_state = "cburger"
color = "#A8E61DFF"
- New()
- ..()
- reagents.add_reagent("greencrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/green/New()
+ ..()
+ reagents.add_reagent("greencrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/blue
name = "blue burger"
desc = "Is this blue rare?"
icon_state = "cburger"
color = "#00B7EFFF"
- New()
- ..()
- reagents.add_reagent("bluecrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/blue/New()
+ ..()
+ reagents.add_reagent("bluecrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/purple
name = "purple burger"
desc = "Regal and low class at the same time."
icon_state = "cburger"
color = "#DA00FFFF"
- New()
- ..()
- reagents.add_reagent("purplecrayonpowder", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/purple/New()
+ ..()
+ reagents.add_reagent("purplecrayonpowder", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/spell
name = "spell burger"
@@ -150,31 +162,31 @@
name = "big bite burger"
desc = "Forget the Big Mac. THIS is the future!"
icon_state = "bigbiteburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/bigbite/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/burger/jelly
name = "jelly burger"
desc = "Culinary delight..?"
icon_state = "jellyburger"
-/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
-/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/burger/superbite
name = "super bite burger"
desc = "This is a mountain of a burger. FOOD!"
icon_state = "superbiteburger"
- New()
- ..()
- reagents.add_reagent("nutriment", 40)
- bitesize = 10
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/superbite/New()
+ ..()
+ reagents.add_reagent("nutriment", 40)
+ bitesize = 10
diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm
index 208e034a4ab..76163b4723b 100644
--- a/code/modules/food&drinks/food/snacks_cake.dm
+++ b/code/modules/food&drinks/food/snacks_cake.dm
@@ -5,11 +5,12 @@
icon_state = "carrotcake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("imidazoline", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/carrotcake/New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("imidazoline", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice
name = "carrot cake slice"
@@ -24,11 +25,12 @@
icon_state = "braincake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/braincakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- reagents.add_reagent("alkysine", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/braincake/New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ reagents.add_reagent("alkysine", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice
name = "brain cake slice"
@@ -43,10 +45,11 @@
icon_state = "cheesecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 25)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/cheesecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 25)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
name = "cheese cake slice"
@@ -61,9 +64,10 @@
icon_state = "plaincake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/plaincake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice
name = "vanilla cake slice"
@@ -78,9 +82,10 @@
icon_state = "orangecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/orangecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice
name = "orange cake slice"
@@ -95,9 +100,10 @@
icon_state = "limecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/limecakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/limecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice
name = "lime cake slice"
@@ -112,9 +118,10 @@
icon_state = "lemoncake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/lemoncake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice
name = "lemon cake slice"
@@ -129,9 +136,10 @@
icon_state = "chocolatecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/chocolatecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice
name = "chocolate cake slice"
@@ -146,11 +154,12 @@
icon_state = "birthdaycake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 20)
- reagents.add_reagent("sprinkles", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/birthdaycake/New()
+ ..()
+ reagents.add_reagent("nutriment", 20)
+ reagents.add_reagent("sprinkles", 10)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
name = "birthday cake slice"
@@ -165,9 +174,10 @@
icon_state = "applecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/applecakeslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/store/applecake/New()
+ ..()
+ reagents.add_reagent("nutriment", 15)
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice
name = "apple cake slice"
diff --git a/code/modules/food&drinks/food/snacks_pies.dm b/code/modules/food&drinks/food/snacks_pies.dm
index 095ed99c971..7cb7c79d9a7 100644
--- a/code/modules/food&drinks/food/snacks_pies.dm
+++ b/code/modules/food&drinks/food/snacks_pies.dm
@@ -4,11 +4,12 @@
desc = "Just like back home, on clown planet! HONK!"
icon_state = "pie"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("banana",5)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/pie/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("banana",5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/pie/throw_impact(atom/hit_atom)
..()
@@ -21,86 +22,94 @@
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
+
+/obj/item/weapon/reagent_containers/food/snacks/berryclafoutis/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("berryjuice", 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatpie
name = "meat-pie"
icon_state = "meatpie"
desc = "An old barber recipe, very delicious!"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/meatpie/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofupie
name = "tofu-pie"
icon_state = "meatpie"
desc = "A delicious tofu pie."
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/tofupie/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/amanita_pie
name = "amanita pie"
desc = "Sweet and tasty poison pie."
icon_state = "amanita_pie"
- New()
- ..()
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("amatoxin", 3)
- reagents.add_reagent("mushroomhallucinogen", 1)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/amanita_pie/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("amatoxin", 3)
+ reagents.add_reagent("mushroomhallucinogen", 1)
+ bitesize = 3
/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"
- 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("tricordrazine", 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!"
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 2
+ else
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/xemeatpie
name = "xeno-pie"
icon_state = "xenomeatpie"
desc = "A delicious meatpie. Probably heretical."
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/xemeatpie/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/applepie
name = "apple pie"
desc = "A pie containing sweet sweet love...or apple."
icon_state = "applepie"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/applepie/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/cherrypie
name = "cherry pie"
desc = "Taste so good, make a grown man cry."
icon_state = "cherrypie"
- New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/cherrypie/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
name = "pumpkin pie"
@@ -108,9 +117,10 @@
icon_state = "pumpkinpie"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
slices_num = 5
- New()
- ..()
- reagents.add_reagent("nutriment", 15)
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie/New()
+ ..()
+ reagents.add_reagent("nutriment", 15)
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm
index d3096addb0b..f8e003172dd 100644
--- a/code/modules/food&drinks/food/snacks_pizza.dm
+++ b/code/modules/food&drinks/food/snacks_pizza.dm
@@ -10,11 +10,12 @@
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
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita/New()
+ ..()
+ reagents.add_reagent("nutriment", 40)
+ reagents.add_reagent("tomatojuice", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice
name = "margherita slice"
@@ -28,11 +29,12 @@
icon_state = "meatpizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("nutriment", 50)
- reagents.add_reagent("tomatojuice", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza/New()
+ ..()
+ reagents.add_reagent("nutriment", 50)
+ reagents.add_reagent("tomatojuice", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice
name = "meatpizza slice"
@@ -46,10 +48,11 @@
icon_state = "mushroompizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("nutriment", 35)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza/New()
+ ..()
+ reagents.add_reagent("nutriment", 35)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
name = "mushroom pizza slice"
@@ -63,12 +66,13 @@
icon_state = "vegetablepizza"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
slices_num = 6
- New()
- ..()
- reagents.add_reagent("nutriment", 30)
- reagents.add_reagent("tomatojuice", 6)
- reagents.add_reagent("imidazoline", 12)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/New()
+ ..()
+ reagents.add_reagent("nutriment", 30)
+ reagents.add_reagent("tomatojuice", 6)
+ reagents.add_reagent("imidazoline", 12)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice
name = "vegetable pizza slice"
diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
index ee45942cb46..7ca43af1f4a 100644
--- a/code/modules/food&drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
@@ -4,97 +4,101 @@
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
icon_state = "sandwich"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carbon", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carbon", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with Tomato soup!"
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 7)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/New()
+ ..()
+ reagents.add_reagent("nutriment", 7)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
icon_state = "jellysandwich"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
/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
+
+/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("ice", 2)
+ bitesize = 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"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/notasandwich/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
icon_state = "jellytoast"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry
- New()
- ..()
- reagents.add_reagent("cherryjelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ bitesize = 3
-/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime
- New()
- ..()
- reagents.add_reagent("slimejelly", 5)
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry/New()
+ ..()
+ reagents.add_reagent("cherryjelly", 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "This seems awfully bitter."
icon_state = "twobread"
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/twobread/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm
index f0e471f02e5..05bf0568838 100644
--- a/code/modules/food&drinks/food/snacks_soup.dm
+++ b/code/modules/food&drinks/food/snacks_soup.dm
@@ -4,144 +4,153 @@
desc = "You've got balls kid, BALLS!"
icon_state = "meatballsoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 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"
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("slimejelly", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/slimesoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("slimejelly", 5)
+ reagents.add_reagent("water", 10)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "tomato soup"
desc = "Smells like copper."
icon_state = "tomatosoup"
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("blood", 10)
- reagents.add_reagent("water", 5)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("blood", 10)
+ reagents.add_reagent("water", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "clown's tears"
desc = "Not very funny."
icon_state = "clownstears"
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("water", 10)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/clownstears/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("banana", 5)
+ reagents.add_reagent("water", 10)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "vegetable soup"
desc = "A true vegan meal."
icon_state = "vegetablesoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "nettle soup"
desc = "To think, the botanist would've beat you to death with one of these."
icon_state = "nettlesoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- reagents.add_reagent("tricordrazine", 5)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
name = "mystery soup"
desc = "The mystery is, why aren't you eating it?"
icon_state = "mysterysoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- switch(rand(1,10))
- 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("tricordrazine", 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("imidazoline", 5)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ switch(rand(1,10))
+ 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("tricordrazine", 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("imidazoline", 5)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
name = "wish soup"
desc = "I wish this was soup."
icon_state = "wishsoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("water", 10)
- bitesize = 5
- if(prob(25))
- desc = "A wish come true!"
- reagents.add_reagent("nutriment", 8)
+
+/obj/item/weapon/reagent_containers/food/snacks/wishsoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("water", 10)
+ bitesize = 5
+ if(prob(25))
+ desc = "A wish come true!"
+ reagents.add_reagent("nutriment", 8)
/obj/item/weapon/reagent_containers/food/snacks/hotchili
name = "hot chili"
desc = "A five alarm Texan Chili!"
icon_state = "hotchili"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/hotchili/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("capsaicin", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/coldchili
@@ -149,70 +158,76 @@
desc = "This slush is barely a liquid!"
icon_state = "coldchili"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("frostoil", 3)
- reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/coldchili/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("frostoil", 3)
+ reagents.add_reagent("tomatojuice", 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
name = "monkey's delight"
desc = "A delicious soup with dumplings and hunks of monkey meat simmered to perfection, in a broth that tastes faintly of bananas."
icon_state = "monkeysdelight"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("banana", 5)
- reagents.add_reagent("blackpepper", 1)
- reagents.add_reagent("sodiumchloride", 1)
- bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("banana", 5)
+ reagents.add_reagent("blackpepper", 1)
+ reagents.add_reagent("sodiumchloride", 1)
+ bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
name = "tomato soup"
desc = "Drinking this feels like being a vampire! A tomato vampire..."
icon_state = "tomatosoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 5)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 5)
+ reagents.add_reagent("tomatojuice", 10)
+ bitesize = 3
/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()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("water", 5)
- bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/milosoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("water", 5)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup
name = "chantrelle soup"
desc = "A delicious and hearty mushroom soup."
icon_state = "mushroomsoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/mushroomsoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
trash = /obj/item/trash/snack_bowl
- New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/beetsoup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ name = pick("borsch","bortsch","borstch","borsh","borshch","borscht")
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/food&drinks/food/snacks_spaghetti.dm
index 7d3b013aeee..5b73364e628 100644
--- a/code/modules/food&drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food&drinks/food/snacks_spaghetti.dm
@@ -3,68 +3,75 @@
name = "spaghetti"
desc = "Now that's a nic'e pasta!"
icon_state = "spaghetti"
- New()
- ..()
- reagents.add_reagent("nutriment", 1)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/spaghetti/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
name = "boiled spaghetti"
desc = "A plain dish of noodles, this sucks."
icon_state = "spaghettiboiled"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
icon_state = "pastatomato"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("tomatojuice", 10)
- bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/pastatomato/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("tomatojuice", 10)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/copypasta
name = "copypasta"
desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
icon_state = "copypasta"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("tomatojuice", 20)
- bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/copypasta/New()
+ ..()
+ reagents.add_reagent("nutriment", 12)
+ reagents.add_reagent("tomatojuice", 20)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
name = "spaghetti and meatballs"
desc = "Now that's a nic'e meatball!"
icon_state = "meatballspaghetti"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "spesslaw"
desc = "A lawyers favourite."
icon_state = "spesslaw"
- New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spesslaw/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/eggplantparm
name = "eggplant parmigiana"
desc = "The only good recipe for eggplant."
icon_state = "eggplantparm"
trash = /obj/item/trash/plate
- New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/eggplantparm/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index c948602119b..b39710779dd 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -17,31 +17,30 @@
/obj/machinery/gibber/autogibber
var/turf/input_plate
- New()
- ..()
- spawn(5)
- for(var/i in cardinal)
- var/obj/machinery/mineral/input/input_obj = locate( /obj/machinery/mineral/input, get_step(src.loc, i) )
- if(input_obj)
- if(isturf(input_obj.loc))
- input_plate = input_obj.loc
- qdel(input_obj)
- break
+/obj/machinery/gibber/autogibber/New()
+ ..()
+ spawn(5)
+ for(var/i in cardinal)
+ var/obj/machinery/mineral/input/input_obj = locate( /obj/machinery/mineral/input, get_step(src.loc, i) )
+ if(input_obj)
+ if(isturf(input_obj.loc))
+ input_plate = input_obj.loc
+ qdel(input_obj)
+ break
- if(!input_plate)
- diary << "a [src] didn't find an input plate."
- return
+ if(!input_plate)
+ diary << "a [src] didn't find an input plate."
+ return
- Bumped(var/atom/A)
- if(!input_plate) return
+/obj/machinery/gibber/autogibber/Bumped(var/atom/A)
+ if(!input_plate) return
- if(ismob(A))
- var/mob/M = A
+ if(ismob(A))
+ var/mob/M = A
- if(M.loc == input_plate
- )
- M.loc = src
- M.gib()
+ if(M.loc == input_plate)
+ M.loc = src
+ M.gib()
/obj/machinery/gibber/New()
diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm
index 2047c071103..80ba39354a3 100644
--- a/code/modules/food&drinks/kitchen machinery/juicer.dm
+++ b/code/modules/food&drinks/kitchen machinery/juicer.dm
@@ -162,20 +162,19 @@
if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
-/obj/structure/closet/crate/juice
- New()
- ..()
- new/obj/machinery/juicer(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
- new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+/obj/structure/closet/crate/juice/New()
+ ..()
+ new/obj/machinery/juicer(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/tomato(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/carrot(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/berries(src)
+ new/obj/item/weapon/reagent_containers/food/snacks/grown/banana(src)
diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm
index 87d11a48a1a..ad9344b21af 100644
--- a/code/modules/food&drinks/kitchen machinery/processor.dm
+++ b/code/modules/food&drinks/kitchen machinery/processor.dm
@@ -26,77 +26,74 @@
qdel(what) // Note to self: Make this safer
/* objs */
- meat
- input = /obj/item/weapon/reagent_containers/food/snacks/meat
- output = /obj/item/weapon/reagent_containers/food/snacks/faggot
+/datum/food_processor_process/meat
+ input = /obj/item/weapon/reagent_containers/food/snacks/meat
+ output = /obj/item/weapon/reagent_containers/food/snacks/faggot
- potato
- input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
- output = /obj/item/weapon/reagent_containers/food/snacks/fries
+/datum/food_processor_process/potato
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
+ output = /obj/item/weapon/reagent_containers/food/snacks/fries
- carrot
- input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
- output = /obj/item/weapon/reagent_containers/food/snacks/carrotfries
+/datum/food_processor_process/carrot
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
+ output = /obj/item/weapon/reagent_containers/food/snacks/carrotfries
- soybeans
- input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
- output = /obj/item/weapon/reagent_containers/food/snacks/soydope
+/datum/food_processor_process/soybeans
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
+ output = /obj/item/weapon/reagent_containers/food/snacks/soydope
- /* mobs */
- mob
- process(loc, what)
- ..()
+/* mobs */
+/datum/food_processor_process/mob/process(loc, what)
+ ..()
- slime
+/datum/food_processor_process/mob/slime/process(loc, what)
+ var/mob/living/carbon/slime/S = what
+ var/C = S.cores
+ if(S.stat != DEAD)
+ S.loc = loc
+ S.visible_message("\blue [C] crawls free of the processor!")
+ return
+ for(var/i = 1, i <= C, i++)
+ new S.coretype(loc)
+ feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
+ ..()
- process(loc, what)
+/datum/food_processor_process/mob/slime/input = /mob/living/carbon/slime
+/datum/food_processor_process/mob/slime/output = null
- var/mob/living/carbon/slime/S = what
- var/C = S.cores
- if(S.stat != DEAD)
- S.loc = loc
- S.visible_message("\blue [C] crawls free of the processor!")
- return
- for(var/i = 1, i <= C, i++)
- new S.coretype(loc)
- feedback_add_details("slime_core_harvested","[replacetext(S.colour," ","_")]")
- ..()
- input = /mob/living/carbon/slime
- output = null
- monkey
- process(loc, what)
- var/mob/living/carbon/monkey/O = what
- if (O.client) //grief-proof
- O.loc = loc
- O.visible_message("\blue Suddenly [O] jumps out from the processor!", \
- "You jump out from the processor", \
- "You hear chimpering")
- return
- var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc)
- var/datum/reagent/blood/B = new()
- B.holder = bucket_of_blood
- B.volume = 70
- //set reagent data
- B.data["donor"] = O
+/datum/food_processor_process/mob/monkey/process(loc, what)
+ var/mob/living/carbon/monkey/O = what
+ if (O.client) //grief-proof
+ O.loc = loc
+ O.visible_message("\blue Suddenly [O] jumps out from the processor!", \
+ "You jump out from the processor", \
+ "You hear chimpering")
+ return
+ var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc)
+ var/datum/reagent/blood/B = new()
+ B.holder = bucket_of_blood
+ B.volume = 70
+ //set reagent data
+ B.data["donor"] = O
- for(var/datum/disease/D in O.viruses)
- if(D.spread_type != SPECIAL)
- B.data["viruses"] += D.Copy()
- if(check_dna_integrity(O))
- B.data["blood_DNA"] = copytext(O.dna.unique_enzymes,1,0)
+ for(var/datum/disease/D in O.viruses)
+ if(D.spread_type != SPECIAL)
+ B.data["viruses"] += D.Copy()
+ if(check_dna_integrity(O))
+ B.data["blood_DNA"] = copytext(O.dna.unique_enzymes,1,0)
- if(O.resistances&&O.resistances.len)
- B.data["resistances"] = O.resistances.Copy()
- bucket_of_blood.reagents.reagent_list += B
- bucket_of_blood.reagents.update_total()
- bucket_of_blood.on_reagent_change()
- //bucket_of_blood.reagents.handle_reactions() //blood doesn't react
- ..()
+ if(O.resistances&&O.resistances.len)
+ B.data["resistances"] = O.resistances.Copy()
+ bucket_of_blood.reagents.reagent_list += B
+ bucket_of_blood.reagents.update_total()
+ bucket_of_blood.on_reagent_change()
+ //bucket_of_blood.reagents.handle_reactions() //blood doesn't react
+ ..()
- input = /mob/living/carbon/monkey
- output = null
+/datum/food_processor_process/mob/monkey/input = /mob/living/carbon/monkey
+/datum/food_processor_process/mob/monkey/output = null
/obj/machinery/processor/proc/select_recipe(var/X)
for (var/Type in typesof(/datum/food_processor_process) - /datum/food_processor_process - /datum/food_processor_process/mob)