Reworks Bowls to hold both solids and liquids (#8203)

* readability update and refactor

* reagent containers no longer drain when empty or from full target

* added trailing newline toggle option to to_chat

* add hybrid storage and reagent containers

* adds volume to description of drywet

* replaced bowl system

* Update code/modules/food/drywet.dm

I missed this though.

Co-authored-by: hyperioo <[email protected]>

---------

Co-authored-by: hyperioo <[email protected]>

cev_eris.dme

@@ -1699,6 +1699,7 @@
 #include "code\modules\ext_scripts\python.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\TextFilters.dm"
+#include "code\modules\food\drywet.dm"
 #include "code\modules\food\recipes_microwave.dm"
 #include "code\modules\games\boardgame.dm"
 #include "code\modules\games\cardemon.dm"

code/datums/autolathe/containers.dm

@@ -24,7 +24,7 @@
 
 /datum/design/autolathe/container/mixingbowl
 	name = "mixing bowl"
-	build_path = /obj/item/reagent_containers/glass/beaker/bowl
+	build_path = /obj/item/reagent_containers/drywet
 
 /datum/design/autolathe/container/vial
 	name = "glass vial"

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

@@ -212,7 +212,7 @@
 				totalHeight = (currentSlot/maxColumnCount) * (itemBackground.getHeight() + spacingBetweenSlots)
 
 	main.setPosition(data.StorageData["Xspace"],data.StorageData["Yspace"])
-	return main
+	. = main
 
 /obj/item/storage/Destroy()
 	close_all()
@@ -221,7 +221,7 @@
 /obj/item/storage/MouseDrop(obj/over_object)
 	if(ishuman(usr) && usr == over_object && !usr.incapacitated() && Adjacent(usr))
 		return src.open(usr)
-	return ..()
+	. = ..()
 
 /obj/item/storage/proc/return_inv()
 	var/list/L = list()
@@ -234,7 +234,7 @@
 		L += G.gift
 		if (istype(G.gift, /obj/item/storage))
 			L += G.gift:return_inv()
-	return L
+	. = L
 
 /obj/item/storage/proc/show_to(mob/user)
 	if(!user.client)
@@ -301,38 +301,38 @@
 	if(!istype(W)) return //Not an item
 
 	if(usr && usr.isEquipped(W) && !usr.canUnEquip(W))
-		return 0
+		return FALSE
 
 	if(src.loc == W)
-		return 0 //Means the item is already in the storage item
+		return FALSE //Means the item is already in the storage item
 	if(storage_slots != null && contents.len >= storage_slots)
 		if(!stop_messages)
 			to_chat(usr, SPAN_NOTICE("[src] is full, make some space."))
-		return 0 //Storage item is full
+		return FALSE //Storage item is full
 
 	if(W.anchored)
-		return 0
+		return FALSE
 
 	if(can_hold.len)
 		if(!is_type_in_list(W, can_hold))
 			if(!stop_messages && ! istype(W, /obj/item/hand_labeler))
 				to_chat(usr, SPAN_NOTICE("[src] cannot hold \the [W]."))
-			return 0
+			return FALSE
 		var/max_instances = can_hold[W.type]
 		if(max_instances && instances_of_type_in_list(W, contents) >= max_instances)
 			if(!stop_messages && !istype(W, /obj/item/hand_labeler))
 				to_chat(usr, SPAN_NOTICE("[src] has no more space specifically for \the [W]."))
-			return 0
+			return FALSE
 
 	if(cant_hold.len && is_type_in_list(W, cant_hold))
 		if(!stop_messages)
 			to_chat(usr, SPAN_NOTICE("[src] cannot hold [W]."))
-		return 0
+		return FALSE
 
 	if (max_w_class != null && W.w_class > max_w_class)
 		if(!stop_messages)
 			to_chat(usr, SPAN_NOTICE("[W] is too long for this [src]."))
-		return 0
+		return FALSE
 
 	//Slot based storage overrides space-based storage
 	if(storage_slots == null)
@@ -343,14 +343,14 @@
 		if(total_storage_space > max_storage_space)
 			if(!stop_messages)
 				to_chat(usr, SPAN_NOTICE("[src] is too full, make some space."))
-			return 0
+			return FALSE
 
 	if(W.w_class >= src.w_class && (istype(W, /obj/item/storage)))
 		if(!stop_messages)
 			to_chat(usr, SPAN_NOTICE("[src] cannot hold [W] as it's a storage item of the same size."))
-		return 0 //To prevent the stacking of same sized storage items.
+		return FALSE //To prevent the stacking of same sized storage items.
 
-	return 1
+	. = TRUE
 
 //This proc handles items being inserted. It does not perform any checks of whether an item can or can't be inserted. That's done by can_be_inserted()
 //The stop_warning parameter will stop the insertion message from being displayed. It is intended for cases where you are inserting multiple items at once,
@@ -383,7 +383,7 @@
 	refresh_all()
 
 	update_icon()
-	return 1
+	. = TRUE
 
 //Call this proc to handle the removal of an item from the storage item. The item will be moved to the atom sent as new_target
 /obj/item/storage/proc/remove_from_storage(obj/item/W, atom/new_location)
@@ -417,7 +417,7 @@
 		var/amt_inserted = 0
 		var/turf/T = get_turf(user)
 		for(var/obj/item/light/L in src.contents)
-			if(L.status == 0)
+			if(L.status == 0) // LIGHT_OK, don't try using it though as it is undefined earlier in the dme
 				if(LP.uses < LP.max_uses)
 					LP.AddUses(1)
 					amt_inserted++
@@ -444,32 +444,19 @@
 				to_chat(user, SPAN_WARNING("God damnit!"))
 
 	W.add_fingerprint(user)
-	return handle_item_insertion(W)
+	. = handle_item_insertion(W)
 
 /obj/item/storage/dropped(mob/user)
 	return
 
 /obj/item/storage/attack_hand(mob/user)
-	// v Why does that exist? ~Luduk
-	/*if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.l_store == src && !H.get_active_hand())	//Prevents opening if it's in a pocket.
-			H.put_in_hands(src)
-			H.l_store = null
-			return
-		if(H.r_store == src && !H.get_active_hand())
-			H.put_in_hands(src)
-			H.r_store = null
-			return*/
-
 	if(loc == user)
 		open(user)
 	else
 		close_all()
 		..()
 
-	src.add_fingerprint(user)
-	return
+	add_fingerprint(user)
 
 /obj/item/storage/verb/toggle_gathering_mode()
 	set name = "Switch Gathering Method"
@@ -512,7 +499,7 @@
 		if(isturf(A) && !A.density)
 			dump_it(A)
 			return TRUE
-	return ..()
+	. = ..()
 
 /obj/item/storage/verb/quick_empty()
 	set name = "Empty Contents"
@@ -576,7 +563,7 @@
 	if(user.get_active_hand() == src && user.get_inactive_hand() == null)
 		if(user.swap_hand())
 			open(user)
-			return TRUE
+			. = TRUE
 
 /obj/item/storage/proc/make_exact_fit()
 	storage_slots = contents.len
@@ -623,7 +610,7 @@
 	if (!cur_atom)
 		return -1	//inside something with a null loc.
 
-	return depth
+	. = depth
 
 //Like storage depth, but returns the depth to the nearest turf
 //Returns -1 if no top level turf (a loc was null somewhere, or a non-turf atom's loc was an area somehow).
@@ -641,10 +628,10 @@
 	if (!cur_atom)
 		return -1	//inside something with a null loc.
 
-	return depth
+	. = depth
 
 /obj/item/proc/get_storage_cost()
-	return BASE_STORAGE_COST(w_class) //If you want to prevent stuff above a certain w_class from being stored, use max_w_class
+	. = BASE_STORAGE_COST(w_class) //If you want to prevent stuff above a certain w_class from being stored, use max_w_class
 
 
 //Useful for spilling the contents of containers all over the floor
@@ -657,4 +644,4 @@
 		O.tumble(2)
 
 /obj/item/storage/AllowDrop()
-	return TRUE
+	. = TRUE

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -47,8 +47,8 @@
 	new /obj/item/storage/box/mousetraps(src)
 	new /obj/item/storage/box/mousetraps(src)
 	new /obj/item/clothing/under/rank/chef(src)
-	new /obj/item/reagent_containers/glass/beaker/bowl(src)
-	new /obj/item/reagent_containers/glass/beaker/bowl(src)
+	new /obj/item/reagent_containers/drywet(src)
+	new /obj/item/reagent_containers/drywet(src)
 	new /obj/item/clothing/head/chefhat(src)
 
 /*