Reagent Containers : The 3/4thening & Contained Spritening (and other…

… related food things) (#17231)

* food and drink

* sabrage

* kanpai and blasted on grain alcohol

* beakers

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/cans.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* Update code/modules/reagents/reagent_containers/food/drinks/bottle.dm

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

* changelog

* the contained sprite-ening....

* deletes old file

* teapot

* aaaaahhhh

* AAAGH INHANDS

* volume = 30

* fixes invalid icon state

* is this really that fucking esoteric

* Revert "is this really that fucking esoteric"

This reverts commit 5b238c7.

* this should fix it maybe

* fixes 2

* the simple solution

* skibidi toilet

* god dammit

* jyalra

* redundancy

---------

Co-authored-by: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>

aurorastation.dme

@@ -3048,8 +3048,12 @@
 #include "code\modules\reagents\reagent_containers\food\sandwich.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle.dm"
+#include "code\modules\reagents\reagent_containers\food\drinks\carton.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\drinkingglass.dm"
+#include "code\modules\reagents\reagent_containers\food\drinks\flask.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\jar.dm"
+#include "code\modules\reagents\reagent_containers\food\drinks\jyalra.dm"
+#include "code\modules\reagents\reagent_containers\food\drinks\trophy.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\yoke.dm"
 #include "code\modules\reagents\reagent_containers\food\drinks\bottle\robot.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\fish.dm"

code/game/machinery/biogenerator.dm

@@ -67,7 +67,7 @@
 
 /singleton/biorecipe/food/milk
 	name = "Space Milk (50u)"
-	object = /obj/item/reagent_containers/food/drinks/milk
+	object = /obj/item/reagent_containers/food/drinks/carton/milk
 	cost = 100
 
 /singleton/biorecipe/food/nutrispread

code/game/machinery/vending_types.dm

@@ -103,11 +103,13 @@
 		/obj/item/reagent_containers/food/drinks/bottle/kvass = 3,
 		/obj/item/reagent_containers/food/drinks/bottle/tarasun = 3,
 		/obj/item/reagent_containers/food/drinks/bottle/valokki_wine = 3,
+		/obj/item/reagent_containers/food/drinks/bottle/hooch = 1,
 		/obj/item/reagent_containers/food/drinks/cans/grape_juice = 6,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 2,
 		/obj/item/reagent_containers/food/drinks/cans/sodawater = 15,
 		/obj/item/reagent_containers/food/drinks/cans/tonic = 8,
 		/obj/item/reagent_containers/food/drinks/cans/threetowns = 6,
+		/obj/item/reagent_containers/food/drinks/cans/beer/rice = 8,
 		/obj/item/reagent_containers/food/drinks/carton/applejuice = 4,
 		/obj/item/reagent_containers/food/drinks/carton/cream = 4,
 		/obj/item/reagent_containers/food/drinks/carton/dynjuice = 4,
@@ -134,7 +136,7 @@
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/shot = 10,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup = 10,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 4,
-		/obj/item/reagent_containers/food/drinks/pitcher = 4
+		/obj/item/reagent_containers/glass/pitcher = 4
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/tea = 10
@@ -265,7 +267,7 @@
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/ice = 10,
-		/obj/item/reagent_containers/food/drinks/soymilk = 2
+		/obj/item/reagent_containers/food/drinks/carton/soymilk = 2
 	)
 	prices = list(
 		/obj/item/reagent_containers/food/drinks/coffee = 20,
@@ -277,7 +279,7 @@
 		/obj/item/reagent_containers/food/snacks/donut/normal = 6
 	)
 	premium = list(
-		/obj/item/reagent_containers/food/drinks/teapot/ = 5
+		/obj/item/reagent_containers/glass/teapot/ = 5
 	)
 	vending_sound = 'sound/machines/vending/vending_coffee.ogg'
 	cooling_temperature = T0C + 57 //Optimal coffee temperature
@@ -333,9 +335,9 @@
 		/obj/item/reagent_containers/food/snacks/riceball = 4,
 		/obj/item/reagent_containers/food/snacks/seaweed = 5,
 		/obj/item/reagent_containers/food/drinks/jyalra = 5,
-		/obj/item/reagent_containers/food/drinks/jyalracheese = 5,
-		/obj/item/reagent_containers/food/drinks/jyalraapple = 5,
-		/obj/item/reagent_containers/food/drinks/jyalracherry = 5
+		/obj/item/reagent_containers/food/drinks/jyalra/cheese = 5,
+		/obj/item/reagent_containers/food/drinks/jyalra/apple = 5,
+		/obj/item/reagent_containers/food/drinks/jyalra/cherry = 5
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/snacks/syndicake = 6,
@@ -372,9 +374,9 @@
 		/obj/item/reagent_containers/food/snacks/riceball = 15,
 		/obj/item/reagent_containers/food/snacks/seaweed = 20,
 		/obj/item/reagent_containers/food/drinks/jyalra = 38,
-		/obj/item/reagent_containers/food/drinks/jyalracheese = 44,
-		/obj/item/reagent_containers/food/drinks/jyalraapple = 44,
-		/obj/item/reagent_containers/food/drinks/jyalracherry = 44
+		/obj/item/reagent_containers/food/drinks/jyalra/cheese = 44,
+		/obj/item/reagent_containers/food/drinks/jyalra/apple = 44,
+		/obj/item/reagent_containers/food/drinks/jyalra/cherry = 44
 	)
 	light_color = COLOR_BABY_BLUE
 	manufacturer = "nanotrasen"
@@ -402,9 +404,10 @@
 		/obj/item/reagent_containers/food/drinks/cans/peach_soda = 10,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 10,
 		/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 10,
-		/obj/item/reagent_containers/food/drinks/small_milk = 10,
-		/obj/item/reagent_containers/food/drinks/small_milk_choco = 10,
-		/obj/item/reagent_containers/food/drinks/small_milk_strawberry = 10
+		/obj/item/reagent_containers/food/drinks/carton/small/milk = 10,
+		/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 10,
+		/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 10,
+		/obj/item/reagent_containers/food/drinks/cans/melon_soda = 10
 	)
 	contraband = list(
 		/obj/item/reagent_containers/food/drinks/cans/thirteenloko = 5,
@@ -431,9 +434,10 @@
 		/obj/item/reagent_containers/food/drinks/cans/koispunch = 50,
 		/obj/item/reagent_containers/food/drinks/cans/beetle_milk = 5,
 		/obj/item/reagent_containers/food/drinks/cans/hrozamal_soda = 35,
-		/obj/item/reagent_containers/food/drinks/small_milk = 18,
-		/obj/item/reagent_containers/food/drinks/small_milk_choco = 18,
-		/obj/item/reagent_containers/food/drinks/small_milk_strawberry = 18
+		/obj/item/reagent_containers/food/drinks/carton/small/milk = 18,
+		/obj/item/reagent_containers/food/drinks/carton/small/milk/choco = 18,
+		/obj/item/reagent_containers/food/drinks/carton/small/milk/strawberry = 18,
+		/obj/item/reagent_containers/food/drinks/cans/melon_soda = 16
 	)
 	idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
 	vending_sound = 'sound/machines/vending/vending_cans.ogg'
@@ -967,7 +971,7 @@
 		/obj/item/material/hatchet/butch = 2,
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/food/drinks/pitcher = 3,
+		/obj/item/reagent_containers/glass/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 		/obj/item/clothing/accessory/apron/chef = 2,
@@ -1010,7 +1014,7 @@
 		/obj/item/material/kitchen/utensil/fork/chopsticks/cheap = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/food/drinks/pitcher = 3,
+		/obj/item/reagent_containers/glass/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 	)
@@ -1021,7 +1025,7 @@
 	products = list(
 		/obj/item/reagent_containers/food/drinks/drinkingglass = 12,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/carafe = 3,
-		/obj/item/reagent_containers/food/drinks/pitcher = 3,
+		/obj/item/reagent_containers/glass/pitcher = 3,
 		/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup = 6,
 		/obj/item/reagent_containers/food/drinks/takeaway_cup_idris = 6,
 	)

code/game/objects/items/glassjar.dm

@@ -15,7 +15,7 @@
 	name = "glass jar"
 	desc = "A glass jar. Does not contain brain submerged in formaldehyde."
 	desc_info = "Can be used to hold money, small animals, and gumballs. You can remove the lid and use it as a reagent container."
-	icon = 'icons/obj/drinks.dmi'
+	icon = 'icons/obj/item/reagent_containers/glass.dmi'
 	icon_state = "jar_lid"
 	w_class = ITEMSIZE_SMALL
 	matter = list(MATERIAL_GLASS = 200)

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

@@ -1,11 +1,8 @@
 /obj/item/dnainjector
 	name = "\improper DNA injector"
 	desc = "This injects the person with DNA."
-	icon = 'icons/obj/items.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
+	icon = 'icons/obj/item/reagent_containers/syringe.dmi'
+	contained_sprite = TRUE
 	icon_state = "dnainjector"
 	item_state = "dnainjector"
 	var/block=0

code/game/objects/items/weapons/implants/implanter.dm

@@ -1,10 +1,7 @@
 /obj/item/implanter
 	name = "implanter"
-	icon = 'icons/obj/items.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
+	icon = 'icons/obj/item/reagent_containers/syringe.dmi'
+	contained_sprite = TRUE
 	icon_state = "implanter0"
 	item_state = "syringe_0"
 	throw_speed = 1
@@ -94,25 +91,13 @@
 
 /obj/item/implanter/compressed
 	name = "implanter (C)"
-	icon_state = "cimplanter1"
 
 /obj/item/implanter/compressed/New()
 	imp = new /obj/item/implant/compressed( src )
 	..()
 	update()
 	return
 
-/obj/item/implanter/compressed/update()
-	if (imp)
-		var/obj/item/implant/compressed/c = imp
-		if(!c.scanned)
-			icon_state = "cimplanter1"
-		else
-			icon_state = "cimplanter2"
-	else
-		icon_state = "cimplanter0"
-	return
-
 /obj/item/implanter/compressed/attack(mob/M as mob, mob/user as mob)
 	var/obj/item/implant/compressed/c = imp
 	if (!c)	return

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

@@ -325,10 +325,7 @@
 /obj/item/storage/bag/chemistry
 	name = "chemistry bag"
 	icon = 'icons/obj/chemical.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
+	contained_sprite = TRUE
 	icon_state = "chembag"
 	desc = "A bag for storing pills and bottles of medicine."
 	max_storage_space = 200

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

@@ -747,10 +747,6 @@
 	name = "portable freezer"
 	desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
 	icon = 'icons/obj/storage.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
 	icon_state = "portafreezer"
 	item_state = "medicalpack"
 	max_w_class = ITEMSIZE_NORMAL

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

@@ -3,10 +3,7 @@
 	desc = "It's an airtight container for storing medication."
 	icon_state = "pill_canister"
 	icon = 'icons/obj/chemical.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
+	contained_sprite = TRUE
 	item_state = "pill_canister"
 	center_of_mass = list("x" = 16,"y" = 12)
 	w_class = ITEMSIZE_SMALL

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

@@ -12,13 +12,10 @@
 	name = "surgery tool parent item"
 	desc = DESC_PARENT
 	icon = 'icons/obj/surgery.dmi'
+	contained_sprite = TRUE
 	w_class = ITEMSIZE_SMALL
 	drop_sound = 'sound/items/drop/weldingtool.ogg'
 	pickup_sound = 'sound/items/pickup/weldingtool.ogg'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-	)
 	recyclable = TRUE
 
 /*

code/game/objects/random/loot.dm

@@ -97,9 +97,7 @@
 		/obj/item/razor = 0.5,
 		/obj/item/reagent_containers/extinguisher_refill = 0.1,
 		/obj/item/reagent_containers/extinguisher_refill/filled = 0.5,
-		/obj/item/reagent_containers/food/drinks/flask/lithium = 0.3,
-		/obj/item/reagent_containers/food/drinks/flask/shiny = 0.3,
-		/obj/item/reagent_containers/food/drinks/teapot = 0.4,
+		/obj/item/reagent_containers/glass/teapot = 0.4,
 		/obj/item/reagent_containers/cooking_container/board/bowl = 0.8,
 		/obj/item/reagent_containers/inhaler/hyperzine = 0.1,
 		/obj/item/reagent_containers/spray/cleaner = 0.6,

code/game/objects/structures/crates_lockers/closets/secure/freezer.dm

@@ -50,9 +50,9 @@
 /obj/structure/closet/secure_closet/freezer/fridge/fill()
 	..()
 	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/drinks/milk(src)
+		new /obj/item/reagent_containers/food/drinks/carton/milk(src)
 	for(var/i = 0, i < 2, i++)
-		new /obj/item/reagent_containers/food/drinks/soymilk(src)
+		new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
 	for(var/i = 0, i < 2, i++)
 		new /obj/item/storage/box/fancy/egg_box(src)
 
@@ -86,10 +86,10 @@
 /obj/structure/closet/secure_closet/freezer/cafe/fill()
 	..()
 	for(var/i = 0, i < 6, i++)
-		new /obj/item/reagent_containers/food/drinks/milk(src)
+		new /obj/item/reagent_containers/food/drinks/carton/milk(src)
 	for(var/i = 0, i < 3, i++)
 		new /obj/item/storage/box/fancy/egg_box(src)
 		new /obj/item/reagent_containers/food/condiment/flour(src)
 	for(var/i = 0, i < 2, i++)
-		new /obj/item/reagent_containers/food/drinks/soymilk(src)
+		new /obj/item/reagent_containers/food/drinks/carton/soymilk(src)
 		new /obj/item/reagent_containers/food/condiment/sugar(src)

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -204,7 +204,7 @@
 /obj/structure/closet/secure_closet/psychiatric/fill()
 	..()
 	new /obj/item/clothing/suit/straight_jacket(src)
-	new /obj/item/reagent_containers/food/drinks/teapot(src)
+	new /obj/item/reagent_containers/glass/teapot(src)
 	new /obj/item/toy/plushie/therapy(src)
 	new /obj/item/toy/plushie/slime(src)
 	new /obj/item/toy/plushie/bee(src)

code/modules/asset_cache/asset_cache.dm

@@ -660,7 +660,7 @@ var/list/asset_datums = list()
 /datum/asset/spritesheet/chem_master
 	name = "chemmaster"
 	cross_round_cachable = FALSE
-	var/list/bottle_sprites = list("bottle-1", "bottle-2", "bottle-3", "bottle-4", "bottle-5", "bottle-6")
+	var/list/bottle_sprites = list("bottle-1", "bottle-2", "bottle-3", "bottle-4")
 	var/max_pill_sprite = 20
 
 /datum/asset/spritesheet/chem_master/register()

code/modules/clothing/under/accessories/accessory.dm

@@ -237,11 +237,10 @@
 	desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
 	desc_info = "Click on the UI action button toggle between the examination modes. Automatic will use the stethoscope on the person you're \
 	examining when adjacent to them, automatically using it on the selected body part. Manual will make it so you don't automatically use it via examine."
+	icon = 'icons/clothing/accessories/stethoscope.dmi'
 	icon_state = "stethoscope"
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi',
-		slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi',
-		)
+	item_state = "stethoscope"
+	contained_sprite = TRUE
 	flippable = 1
 	var/auto_examine = FALSE
 

code/modules/cooking/machinery/cooking_machines/container.dm

@@ -3,7 +3,7 @@
 //which can be checked against recipe requirements in order to cook recipes that require several things
 
 /obj/item/reagent_containers/cooking_container
-	icon = 'icons/obj/cooking_machines.dmi'
+	icon = 'icons/obj/item/reagent_containers/cooking_container.dmi'
 	var/shortname
 	var/place_verb = "into"
 	var/max_space = 20//Maximum sum of w-classes of foods in this container at once
@@ -337,7 +337,6 @@
 	name = "mixing bowl"
 	shortname = "bowl"
 	desc = "A bowl. You bowl foods... wait, what?"
-	icon = 'icons/obj/kitchen.dmi'
 	icon_state = "mixingbowl"
 	filling_states = "-10;10;25;50;75;80;100"
 	center_of_mass = list("x" = 17,"y" = 7)
@@ -350,7 +349,6 @@
 /obj/item/reagent_containers/cooking_container/board/bowl/update_icon()
 	cut_overlays()
 	if(reagents?.total_volume)
-		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state][get_filling_state()]")
+		var/mutable_appearance/filling = mutable_appearance(icon, "[icon_state][get_filling_state()]")
 		filling.color = reagents.get_color()
 		add_overlay(filling)
-

code/modules/cooking/recipes/recipes_soup.dm

@@ -40,7 +40,7 @@
 	reagents = list(/singleton/reagent/water = 10)
 	result = /obj/item/reagent_containers/food/snacks/soup/tomato
 
-/singleton/recipe/milosoup
+/singleton/recipe/misosoup
 	appliance = POT
 	reagents = list(/singleton/reagent/water = 10)
 	items = list(
@@ -49,7 +49,7 @@
 		/obj/item/reagent_containers/food/snacks/tofu,
 		/obj/item/reagent_containers/food/snacks/tofu
 	)
-	result = /obj/item/reagent_containers/food/snacks/soup/milo
+	result = /obj/item/reagent_containers/food/snacks/soup/miso
 
 /singleton/recipe/bloodsoup
 	appliance = SAUCEPAN | POT