Ports sprites, nutella, champagne sword decapitation, more

baystation12.dme

@@ -2942,7 +2942,6 @@
 #include "code\modules\reagents\reagent_containers\food\snacks.dm"
 #include "code\modules\reagents\reagent_containers\food\sushi.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle.dm"
-#include "code\modules\reagents\reagent_containers\food\drinks\jar.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\bugmeat.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\cheese.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\donkpocket.dm"

code/_global_vars/edible.dm

@@ -4,7 +4,10 @@ GLOBAL_LIST_INIT(proteinbar_flavors, list(
 		/datum/reagent/drink/juice/apple,
 		/datum/reagent/drink/juice/pear
 	),
-	"banana nut" = /datum/reagent/drink/juice/banana,
+	"banana nut" = list(
+		/datum/reagent/drink/juice/banana,
+		/datum/reagent/nutriment/almondmeal
+	),
 	"cappuccino" = list(
 		/datum/reagent/nutriment/coffee,
 		/datum/reagent/drink/milk
@@ -34,5 +37,9 @@ GLOBAL_LIST_INIT(proteinbar_flavors, list(
 	"magical melons" = list(
 		/datum/reagent/drink/juice/melon
 	),
-	"mixed berry" = /datum/reagent/drink/juice/berry
+	"mixed berry" = /datum/reagent/drink/juice/berry,
+	"peanut crunch" = list(
+		/datum/reagent/nutriment/peanutbutter,
+		/datum/reagent/nutriment/groundpeanuts
+	)
 ))

code/game/machinery/vending/boda.dm

@@ -31,15 +31,15 @@
 		/obj/item/reagent_containers/food/drinks/cans/artbru = 0,
 		/obj/item/reagent_containers/food/drinks/glass2/square/boda = 0,
 		/obj/item/reagent_containers/food/drinks/glass2/square/bodaplus = 0,
-		/obj/item/reagent_containers/food/drinks/bottle/space_up = 0
+		/obj/item/reagent_containers/food/drinks/bottle/small/space_up = 0
 	)
 	contraband = list(
 		/obj/item/clothing/under/soviet = 1,
 		/obj/item/clothing/suit/hgpirate = 1
 
 	)
 	rare_products = list(
-		/obj/item/reagent_containers/food/drinks/bottle/space_up = 50,
+		/obj/item/reagent_containers/food/drinks/bottle/small/space_up = 50,
 		/obj/item/card/id/syndicate = 25,
 		/obj/item/storage/box/syndie_kit/spy = 50
 	)

code/game/machinery/vending/boozeomat.dm

@@ -77,11 +77,11 @@
 		/obj/item/reagent_containers/food/drinks/cans/rootbeer = 15,
 		/obj/item/reagent_containers/food/drinks/cans/speer = 10,
 		/obj/item/reagent_containers/food/drinks/cans/ale = 10,
-		/obj/item/reagent_containers/food/drinks/bottle/cola = 5,
+		/obj/item/reagent_containers/food/drinks/bottle/small/cola = 10,
+		/obj/item/reagent_containers/food/drinks/bottle/small/space_up = 10,
+		/obj/item/reagent_containers/food/drinks/bottle/small/space_mountain_wind = 10,
 		/obj/item/reagent_containers/food/drinks/cans/cola_diet = 5,
 		/obj/item/reagent_containers/food/drinks/cans/ionbru = 5,
-		/obj/item/reagent_containers/food/drinks/bottle/space_up = 5,
-		/obj/item/reagent_containers/food/drinks/bottle/space_mountain_wind = 5,
 		/obj/item/reagent_containers/food/drinks/cans/beastenergy = 5,
 		/obj/item/reagent_containers/food/drinks/tea/black = 15,
 		/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 2,

code/game/machinery/vending/props.dm

@@ -8,7 +8,7 @@
 		/obj/structure/flora/pottedplant = 2,
 		/obj/item/device/flashlight/lamp = 2,
 		/obj/item/device/flashlight/lamp/green = 2,
-		/obj/item/reagent_containers/food/drinks/jar = 1,
+		/obj/item/glass_jar = 1,
 		/obj/item/nullrod = 1,
 		/obj/item/toy/cultsword = 4,
 		/obj/item/toy/katana = 2

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

@@ -1,6 +1,6 @@
 /obj/item/storage/fancy/crackers
 	name = "\improper Getmore Crackers"
-	icon = 'icons/obj/food/food.dmi'
+	icon = 'icons/obj/food/food_storage.dmi'
 	icon_state = "crackerbag"
 	open_sound = 'sound/effects/crinkle.ogg'
 	storage_slots = 6

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

@@ -1,6 +1,6 @@
 /obj/item/storage/fancy/egg_box
 	name = "egg box"
-	icon = 'icons/obj/food/food.dmi'
+	icon = 'icons/obj/food/food_storage.dmi'
 	icon_state = "eggbox"
 	open_sound = 'sound/effects/storage/smallbox.ogg'
 	storage_slots = 12

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

@@ -27,7 +27,7 @@
 
 
 /obj/item/storage/box/donut
-	icon = 'icons/obj/food/food.dmi'
+	icon = 'icons/obj/food/food_storage.dmi'
 	icon_state = "donutbox"
 	name = "donut box"
 	contents_allowed = list(/obj/item/reagent_containers/food/snacks/donut)

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

@@ -5,7 +5,7 @@ MRE Stuff
 /obj/item/storage/mre
 	name = "MRE, Menu 1"
 	desc = "A vacuum-sealed bag containing a day's worth of nutrients for an adult in strenuous situations. There is no visible expiration date on the package."
-	icon = 'icons/obj/food/food.dmi'
+	icon = 'icons/obj/food/mre.dmi'
 	icon_state = "mre"
 	storage_slots = 7
 	max_w_class = ITEM_SIZE_SMALL

code/game/objects/random/random.dm

@@ -264,7 +264,7 @@
 /obj/random/drinkbottle
 	name = "random drink"
 	desc = "This is a random drink."
-	icon = 'icons/obj/food/drinks.dmi'
+	icon = 'icons/obj/food/drinks/bottles.dmi'
 	icon_state = "whiskeybottle"
 
 /obj/random/drinkbottle/spawn_choices()
@@ -1295,7 +1295,7 @@ var/global/list/multi_point_spawns
 /obj/random/mre
 	name = "random MRE"
 	desc = "This is a random single MRE."
-	icon = 'icons/obj/food/food.dmi'
+	icon = 'icons/obj/food/mre.dmi'
 	icon_state = "mre"
 
 /obj/random/mre/spawn_choices()
@@ -1354,6 +1354,7 @@ var/global/list/multi_point_spawns
 /obj/random/mre/drink
 	name = "random MRE drink"
 	desc = "This is a random drink for MREs."
+	icon = 'icons/obj/food/condiment.dmi'
 	icon_state = "packet_small"
 
 /obj/random/mre/drink/spawn_choices()
@@ -1368,22 +1369,28 @@ var/global/list/multi_point_spawns
 /obj/random/mre/spread
 	name = "random MRE spread"
 	desc = "This is a random spread packet for MREs."
+	icon = 'icons/obj/food/condiment.dmi'
 	icon_state = "packet_small"
 
 /obj/random/mre/spread/spawn_choices()
 	return list(/obj/item/reagent_containers/food/condiment/small/packet/jelly,
-				/obj/item/reagent_containers/food/condiment/small/packet/honey)
+				/obj/item/reagent_containers/food/condiment/small/packet/honey,
+				/obj/item/reagent_containers/food/condiment/small/packet/peanutbutter,
+				/obj/item/reagent_containers/food/condiment/small/packet/choconutspread)
 
 /obj/random/mre/spread/vegan
 	name = "random vegan MRE spread"
 	desc = "This is a random vegan spread packet for MREs."
 
 /obj/random/mre/spread/vegan/spawn_choices()
-	return list(/obj/item/reagent_containers/food/condiment/small/packet/jelly)
+	return list(/obj/item/reagent_containers/food/condiment/small/packet/jelly,
+				/obj/item/reagent_containers/food/condiment/small/packet/peanutbutter,
+				/obj/item/reagent_containers/food/condiment/small/packet/choconutspread)
 
 /obj/random/mre/sauce
 	name = "random MRE sauce"
 	desc = "This is a random sauce packet for MREs."
+	icon = 'icons/obj/food/condiment.dmi'
 	icon_state = "packet_small"
 
 /obj/random/mre/sauce/spawn_choices()
@@ -1447,7 +1454,7 @@ var/global/list/multi_point_spawns
 
 /obj/random/single/cola
 	name = "randomly spawned cola"
-	icon = 'icons/obj/food/drinks.dmi'
+	icon = 'icons/obj/food/drinks/cans.dmi'
 	icon_state = "cola"
 	spawn_object = /obj/item/reagent_containers/food/drinks/cans/cola
 

code/modules/food/recipes_microwave.dm

@@ -885,6 +885,26 @@
 	result_path = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
 
 
+/datum/microwave_recipe/pbtoast
+	required_reagents = list(
+		/datum/reagent/nutriment/peanutbutter = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/slice/bread
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/pbtoast
+
+
+/datum/microwave_recipe/ntella_bread
+	required_reagents = list(
+		/datum/reagent/nutriment/choconutspread = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/slice/bread
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/ntella_bread
+
+
 /datum/microwave_recipe/milosoup
 	required_reagents = list(
 		/datum/reagent/water = 10
@@ -1120,6 +1140,30 @@
 	result_path = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
 
 
+/datum/microwave_recipe/pbjsandwich_cherry
+	required_reagents = list(
+		/datum/reagent/nutriment/cherryjelly = 5,
+		/datum/reagent/nutriment/peanutbutter = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/slice/bread,
+		/obj/item/reagent_containers/food/snacks/slice/bread
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/pbjsandwich/cherry
+
+
+/datum/microwave_recipe/pbjsandwich_slime
+	required_reagents = list(
+		/datum/reagent/slimejelly = 5,
+		/datum/reagent/nutriment/peanutbutter = 5
+	)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/slice/bread,
+		/obj/item/reagent_containers/food/snacks/slice/bread
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/pbjsandwich/slime
+
+
 /datum/microwave_recipe/bloodsoup
 	required_reagents = list(
 		/datum/reagent/blood = 30
@@ -1431,6 +1475,17 @@
 	result_path = /obj/item/reagent_containers/food/snacks/sliceable/cheesecake
 
 
+/datum/microwave_recipe/cake/ntella_cheesecake
+	required_reagents = list(/datum/reagent/drink/milk = 5, /datum/reagent/nutriment/choconutspread = 15, /datum/reagent/sugar = 10)
+	required_items = list(
+		/obj/item/reagent_containers/food/snacks/cheesewedge,
+		/obj/item/reagent_containers/food/snacks/cookie,
+		/obj/item/reagent_containers/food/snacks/cookie,
+		/obj/item/reagent_containers/food/snacks/cookie
+	)
+	result_path = /obj/item/reagent_containers/food/snacks/sliceable/ntella_cheesecake
+
+
 /datum/microwave_recipe/cake/orange
 	required_produce = list(
 		"orange" = 1

code/modules/hydroponics/seed_datums.dm

@@ -648,7 +648,7 @@
 	name = "peanut"
 	seed_name = "peanut"
 	display_name = "peanut plant"
-	chems = list(/datum/reagent/nutriment = list(1,10))
+	chems = list(/datum/reagent/nutriment/groundpeanuts = list(3,5))
 	kitchen_tag = "peanut"
 
 /datum/seed/peanuts/New()
@@ -1823,7 +1823,7 @@
 	name = "almond"
 	seed_name = "almond"
 	display_name = "almond plant"
-	chems = list(/datum/reagent/nutriment = list(1,10))
+	chems = list(/datum/reagent/nutriment/almondmeal = list(4,7))
 	kitchen_tag = "almond"
 
 /datum/seed/almond/New()

code/modules/reagents/Chemistry-Reagents.dm

@@ -38,6 +38,10 @@
 	var/glass_desc = "It's a glass of... what, exactly?"
 	var/list/glass_special = null // null equivalent to list()
 
+	var/condiment_icon_state
+	var/condiment_name
+	var/condiment_desc
+
 	// GAS DATA, generic values copied from base XGM datum type.
 	var/gas_specific_heat = 20
 	var/gas_molar_mass =    0.032

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm

@@ -431,6 +431,10 @@
 	glass_icon = DRINK_ICON_NOISY
 	value = DISPENSER_REAGENT_VALUE
 
+	condiment_name = "sugar sack"
+	condiment_desc = "Cavities in a bag."
+	condiment_icon_state = "sugar"
+
 /datum/reagent/sugar/affect_blood(mob/living/carbon/human/M, removed)
 	handle_sugar(M, src)
 	M.adjust_nutrition(removed * 3)