last of the missing stuff, hopefully

code/game/machinery/vending.dm

@@ -865,10 +865,10 @@
 	product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs."
 	vend_delay = 34
 	icon_state = "cigs"
-	products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 2, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/rollingpaperpack = 5)
+	products = list(/obj/item/weapon/storage/fancy/cigarettes = 5,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 2, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 10, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5)
 	contraband = list(/obj/item/weapon/lighter/zippo = 4)
 	premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1)
-	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/rollingpaperpack = 20)
+	prices = list(/obj/item/weapon/storage/fancy/cigarettes = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 60,/obj/item/weapon/storage/fancy/cigarettes/cigpack_random = 150, /obj/item/weapon/reagent_containers/food/pill/patch/nicotine = 15, /obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 60, /obj/item/weapon/storage/fancy/rollingpapers = 20)
 	refill_canister = /obj/item/weapon/vending_refill/cigarette
 
 /obj/machinery/vending/cigarette/New()

code/game/objects/items/weapons/cigs.dm

@@ -205,9 +205,9 @@ LIGHTERS ARE IN LIGHTERS.DM
 	var/random_reagent = pick("fuel","saltpetre","synaptizine","green_vomit","potass_iodide","msg","lexorin","mannitol","spaceacillin","cryoxadone","holywater","tea","egg","haloperidol","mutagen","omnizine","carpet","aranesp","cryostylane","chocolate","bilk","cheese","rum","blood","charcoal","coffee","ectoplasm","space_drugs","milk","mutadone","antihol","teporone","insulin","salbutamol","toxin")
 	reagents.add_reagent(random_reagent, 10)
 
-/obj/item/clothing/mask/cigarette/joint
-	name = "joint"
-	desc = "A roll of ambrosium vulgaris wrapped in a thin paper. Dude."
+/obj/item/clothing/mask/cigarette/rollie
+	name = "rollie"
+	desc = "A roll of dried plant matter wrapped in thin paper."
 	icon_state = "spliffoff"
 	icon_on = "spliffon"
 	icon_off = "spliffoff"
@@ -217,35 +217,21 @@ LIGHTERS ARE IN LIGHTERS.DM
 	smoketime = 180
 	chem_volume = 50
 
-/obj/item/clothing/mask/cigarette/joint/New()
+/obj/item/clothing/mask/cigarette/rollie/New()
 	..()
-	var/list/jointnames = list("joint","doobie","spliff","blunt")
-	name = pick(jointnames)
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
-/obj/item/clothing/mask/cigarette/joint/deus
-	desc = "A roll of ambrosium deus wrapped in a thin paper. Dude."
 
 /obj/item/weapon/cigbutt/roach
 	name = "roach"
-	desc = "A manky old roach."
+	desc = "A manky old roach, or for non-stoners, a used rollup."
 	icon_state = "roach"
 
 /obj/item/weapon/cigbutt/roach/New()
 	..()
-	src.pixel_x = rand(-5.0, 5)
-	src.pixel_y = rand(-5.0, 5)
-
-/obj/item/clothing/mask/cigarette/handroll
-	name = "hand-rolled cigarette"
-	desc = "A roll of tobacco and nicotine, freshly rolled by hand."
-	icon_state = "hr_cigoff"
-	item_state = "hr_cigoff"
-	icon_on = "hr_cigon"  //Note - these are in masks.dmi not in cigarette.dmi
-	icon_off = "hr_cigoff"
-	type_butt = /obj/item/weapon/cigbutt
-	chem_volume = 50
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
 ////////////
 // CIGARS //
@@ -386,51 +372,30 @@ LIGHTERS ARE IN LIGHTERS.DM
 ///////////
 //ROLLING//
 ///////////
-obj/item/weapon/rollingpaper
+/obj/item/weapon/rollingpaper
 	name = "rolling paper"
 	desc = "A thin piece of paper used to make fine smokeables."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper"
 	w_class = 1
 
-
-obj/item/weapon/rollingpaperpack
-	name = "rolling paper pack"
-	desc = "A pack of Nanotrasen brand rolling papers."
-	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "cig_paper_pack"
-	w_class = 1
-	var/papers = 25
-
-obj/item/weapon/rollingpaperpack/attack_self(mob/user)
-	if(papers > 1)
-		var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
-		user.put_in_inactive_hand(P)
-		to_chat(user, "You take a paper out of the pack.")
-		papers --
-	else
-		var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper()
-		user.put_in_inactive_hand(P)
-		to_chat(user, "You take the last paper out of the pack, and throw the pack away.")
-		qdel(src)
-
-/obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object)
-	var/mob/M = usr
-	if(M.restrained() || M.stat)
+/obj/item/weapon/rollingpaper/afterattack(atom/target, mob/user, proximity)
+	if(!proximity)
 		return
-
-	if(over_object == M)
-		M.put_in_hands(src)
-
-	else if(istype(over_object, /obj/screen))
-		switch(over_object.name)
-			if("r_hand")
-				M.unEquip(src)
-				M.put_in_r_hand(src)
-			if("l_hand")
-				M.unEquip(src)
-				M.put_in_l_hand(src)
-
-/obj/item/weapon/rollingpaperpack/examine(mob/user)
-	..(user)
-	to_chat(user, "There are [src.papers] left")
+	if(istype(target, /obj/item/weapon/reagent_containers/food/snacks/grown))
+		var/obj/item/weapon/reagent_containers/food/snacks/grown/O = target
+		if(O.dry)
+			user.unEquip(target, 1)
+			user.unEquip(src, 1)
+			var/obj/item/clothing/mask/cigarette/rollie/R = new /obj/item/clothing/mask/cigarette/rollie(user.loc)
+			R.chem_volume = target.reagents.total_volume
+			target.reagents.trans_to(R, R.chem_volume)
+			user.put_in_active_hand(R)
+			to_chat(user, "<span class='notice'>You roll the [target.name] into a rolling paper.</span>")
+			R.desc = "Dried [target.name] rolled up in a thin piece of paper."
+			qdel(target)
+			qdel(src)
+		else
+			to_chat(user, "<span class='warning'>You need to dry this first!</span>")
+	else
+		..()

code/game/objects/items/weapons/storage/fancy.dm

@@ -315,6 +315,26 @@
 	item_state = "cigpacket"
 	cigarette_type  = /obj/item/clothing/mask/cigarette/random
 
+/obj/item/weapon/storage/fancy/rollingpapers
+	name = "rolling paper pack"
+	desc = "A pack of NanoTrasen brand rolling papers."
+	w_class = 1
+	icon = 'icons/obj/cigarettes.dmi'
+	icon_state = "cig_paper_pack"
+	storage_slots = 10
+	icon_type = "rolling paper"
+	can_hold = list("/obj/item/weapon/rollingpaper")
+
+/obj/item/weapon/storage/fancy/rollingpapers/New()
+	..()
+	for(var/i in 1 to storage_slots)
+		new /obj/item/weapon/rollingpaper(src)
+
+/obj/item/weapon/storage/fancy/rollingpapers/update_icon()
+	overlays.Cut()
+	if(!contents.len)
+		overlays += "[icon_state]_empty"
+
 /*
  * Vial Box
  */

code/modules/food_and_drinks/food/snacks.dm

@@ -2483,4 +2483,27 @@
 	trash = /obj/item/trash/tastybread
 	filling_color = "#A66829"
 	junkiness = 20
-	list_reagents = list("nutriment" = 2, "sugar" = 4)
+	list_reagents = list("nutriment" = 2, "sugar" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/yakiimo
+	name = "yaki imo"
+	desc = "Made with roasted sweet potatoes!"
+	icon_state = "yakiimo"
+	trash = /obj/item/trash/plate
+	list_reagents = list("nutriment" = 5, "vitamin" = 4)
+	filling_color = "#8B1105"
+
+/obj/item/weapon/reagent_containers/food/snacks/roastparsnip
+	name = "roast parsnip"
+	desc = "Sweet and crunchy."
+	icon_state = "roastparsnip"
+	trash = /obj/item/trash/plate
+	list_reagents = list("nutriment" = 3, "vitamin" = 4)
+	filling_color = "#FF5500"
+
+/obj/item/weapon/reagent_containers/food/snacks/tatortot
+	name = "tator tot"
+	desc = "A large fried potato nugget that may or may not try to valid you."
+	icon_state = "tatortot"
+	list_reagents = list("nutriment" = 4)
+	filling_color = "FFD700"

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -71,21 +71,34 @@
 	input = /obj/item/weapon/reagent_containers/food/snacks/meat
 	output = /obj/item/weapon/reagent_containers/food/snacks/meatball
 
-/datum/food_processor_process/potato
-	input = "potato"
+/datum/food_processor_process/potatowedges
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/wedges
 	output = /obj/item/weapon/reagent_containers/food/snacks/fries
 
+/datum/food_processor_process/sweetpotato
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato/sweet
+	output = /obj/item/weapon/reagent_containers/food/snacks/yakiimo
+
+/datum/food_processor_process/potato
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/potato
+	output = /obj/item/weapon/reagent_containers/food/snacks/tatortot
+
 /datum/food_processor_process/carrot
-	input = "carrot"
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
 	output = /obj/item/weapon/reagent_containers/food/snacks/carrotfries
 
 /datum/food_processor_process/soybeans
-	input = "soybeans"
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
 	output = /obj/item/weapon/reagent_containers/food/snacks/soydope
 
 /datum/food_processor_process/spaghetti
 	input = /obj/item/weapon/reagent_containers/food/snacks/doughslice
 	output = /obj/item/weapon/reagent_containers/food/snacks/spagetti
+
+/datum/food_processor_process/parsnip
+	input = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip
+	output = /obj/item/weapon/reagent_containers/food/snacks/roastparsnip
+
 /////////////////////////
 ///END OBJECT RECIPIES///
 /////////////////////////

code/modules/hydroponics/hydroitemdefines.dm

@@ -118,6 +118,8 @@
 	origin_tech = "materials=3;combat=2"
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
 	hitsound = 'sound/weapons/bladeslice.ogg'
+	sharp = 1
+	edge = 1
 
 /obj/item/weapon/scythe/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is beheading \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

@@ -38,7 +38,7 @@
 			/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
 			/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
 			/obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
-			/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
+			/obj/item/weapon/reagent_containers/food/snacks/egg = list("egg" = -5),
 
 			//Grinder stuff, but only if dry
 			/obj/item/weapon/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),

code/modules/reagents/chemistry/reagents/alcohol.dm

@@ -983,6 +983,27 @@
 	drink_name = "Jack Rose"
 	drink_desc = "Drinking this makes you feel like you belong in a luxury hotel bar during the 1920s."
 
+/datum/reagent/consumable/ethanol/drunkenblumpkin
+	name = "Drunken Blumpkin"
+	id = "drunkenblumpkin"
+	description = "A weird mix of whiskey and blumpkin juice."
+	color = "#1EA0FF" // rgb: 102, 67, 0
+	alcohol_perc = 0.5
+	drink_icon = "drunkenblumpkin"
+	drink_name = "Drunken Blumpkin"
+	drink_desc = "A drink for the drunks"
+
+/datum/reagent/consumable/ethanol/eggnog
+	name = "Eggnog"
+	id = "eggnog"
+	description = "For enjoying the most wonderful time of the year."
+	color = "#fcfdc6" // rgb: 252, 253, 198
+	nutriment_factor = 2 * REAGENTS_METABOLISM
+	alcohol_perc = 0.1
+	drink_icon = "glass_yellow"
+	drink_name = "Eggnog"
+	drink_desc = "For enjoying the most wonderful time of the year."
+
 /datum/reagent/consumable/ethanol/dragons_breath //inaccessible to players, but here for admin shennanigans
 	name = "Dragon's Breath"
 	id = "dragonsbreath"

code/modules/reagents/chemistry/reagents/drinks.dm

@@ -111,6 +111,12 @@
 	M.adjustToxLoss(1)
 	..()
 
+/datum/reagent/consumable/applejuice
+	name = "Apple Juice"
+	id = "applejuice"
+	description = "The sweet juice of an apple, fit for all ages."
+	color = "#ECFF56" // rgb: 236, 255, 86
+
 /datum/reagent/consumable/drink/watermelonjuice
 	name = "Watermelon Juice"
 	id = "watermelonjuice"
@@ -361,4 +367,82 @@
 	if(ishuman(M) && M.job in list("Mime"))
 		M.adjustBruteLoss(-1)
 		M.adjustFireLoss(-1)
-	..()
+	..()
+
+/datum/reagent/consumable/drink/chocolatepudding
+	name = "Chocolate Pudding"
+	id = "chocolatepudding"
+	description = "A great dessert for chocolate lovers."
+	color = "#800000"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	drink_icon = "chocolatepudding"
+	drink_name = "Chocolate Pudding"
+	drink_desc = "Tasty"
+
+/datum/reagent/consumable/drink/vanillapudding
+	name = "Vanilla Pudding"
+	id = "vanillapudding"
+	description = "A great dessert for vanilla lovers."
+	color = "#FAFAD2"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	drink_icon = "vanillapudding"
+	drink_name = "Vanilla Pudding"
+	drink_desc = "Tasty."
+
+/datum/reagent/consumable/drink/cherryshake
+	name = "Cherry Shake"
+	id = "cherryshake"
+	description = "A cherry flavored milkshake."
+	color = "#FFB6C1"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	drink_icon = "cherryshake"
+	drink_name = "Cherry Shake"
+	drink_desc = "A cherry flavored milkshake."
+
+/datum/reagent/consumable/drink/bluecherryshake
+	name = "Blue Cherry Shake"
+	id = "bluecherryshake"
+	description = "An exotic milkshake."
+	color = "#00F1FF"
+	nutriment_factor = 4 * REAGENTS_METABOLISM
+	drink_icon = "bluecherryshake"
+	drink_name = "Blue Cherry Shake"
+	drink_desc = "An exotic blue milkshake."
+
+/datum/reagent/consumable/drink/pumpkin_latte
+	name = "Pumpkin Latte"
+	id = "pumpkin_latte"
+	description = "A mix of pumpkin juice and coffee."
+	color = "#F4A460"
+	nutriment_factor = 3 * REAGENTS_METABOLISM
+	drink_icon = "pumpkin_latte"
+	drink_name = "Pumpkin Latte"
+	drink_desc = "A mix of coffee and pumpkin juice."
+
+/datum/reagent/consumable/drink/gibbfloats
+	name = "Gibb Floats"
+	id = "gibbfloats"
+	description = "Ice cream on top of a Dr. Gibb glass."
+	color = "#B22222"
+	nutriment_factor = 3 * REAGENTS_METABOLISM
+	drink_icon= "gibbfloats"
+	drink_name = "Gibbfloat"
+	drink_desc = "Dr. Gibb with ice cream on top."
+
+/datum/reagent/consumable/drink/pumpkinjuice
+	name = "Pumpkin Juice"
+	id = "pumpkinjuice"
+	description = "Juiced from real pumpkin."
+	color = "#FFA500"
+
+/datum/reagent/consumable/drink/blumpkinjuice
+	name = "Blumpkin Juice"
+	id = "blumpkinjuice"
+	description = "Juiced from real blumpkin."
+	color = "#00BFFF"
+
+/datum/reagent/consumable/drink/grape_soda
+	name = "Grape soda"
+	id = "grapesoda"
+	description = "Beloved of children and teetotalers."
+	color = "#E6CDFF"

code/modules/reagents/chemistry/reagents/food.dm

@@ -401,6 +401,13 @@
 	reagent_state = LIQUID
 	color = "#801E28" // rgb: 128, 30, 40
 
+/datum/reagent/consumable/bluecherryjelly
+	name = "Blue Cherry Jelly"
+	id = "bluecherryjelly"
+	description = "Blue and tastier kind of cherry jelly."
+	reagent_state = LIQUID
+	color = "#00F0FF"
+
 /datum/reagent/consumable/egg
 	name = "Egg"
 	id = "egg"

code/modules/reagents/chemistry/recipes/drinks.dm

@@ -768,4 +768,77 @@
 	required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
 	result_amount = 3
 	mix_message = "The citrus juices begin to blend together."
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/chocolatepudding
+	name = "Chocolate Pudding"
+	id = "chocolatepudding"
+	result = "chocolatepudding"
+	required_reagents = list("cocoa" = 5, "milk" = 5, "egg" = 5)
+	result_amount = 20
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/vanillapudding
+	name = "Vanilla Pudding"
+	id = "vanillapudding"
+	result = "vanillapudding"
+	required_reagents = list("vanilla" = 5, "milk" = 5, "egg" = 5)
+	result_amount = 20
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/cherryshake
+	name = "Cherry Shake"
+	id = "cherryshake"
+	result = "cherryshake"
+	required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1)
+	result_amount = 3
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/bluecherryshake
+	name = "Blue Cherry Shake"
+	id = "bluecherryshake"
+	result = "bluecherryshake"
+	required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1)
+	result_amount = 3
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/drunkenblumpkin
+	name = "Drunken Blumpkin"
+	id = "drunkenblumpkin"
+	result = "drunkenblumpkin"
+	required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
+	result_amount = 4
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/pumpkin_latte
+	name = "Pumpkin space latte"
+	id = "pumpkin_latte"
+	result = "pumpkin_latte"
+	required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
+	result_amount = 15
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/gibbfloats
+	name = "Gibb Floats"
+	id = "gibbfloats"
+	result = "gibbfloats"
+	required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
+	result_amount = 15
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/grape_soda
+	name = "grape soda"
+	id = "grapesoda"
+	result = "grapesoda"
+	required_reagents = list("grapejuice" = 1, "sodawater" = 1)
+	result_amount = 2
+	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+/datum/chemical_reaction/eggnog
+	name = "eggnog"
+	id = "eggnog"
+	result = "eggnog"
+	required_reagents = list("rum" = 5, "cream" = 5, "egg" = 5)
+	result_amount = 15
+	mix_message = "The eggs nog together. Pretend that \"nog\" is a verb."
 	mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'