Merge remote-tracking branch 'tgstation/master' into movespeed_modifiers_take_two

code/datums/elements/_element.dm

@@ -36,16 +36,16 @@
 //DATUM PROCS
 
 /// Finds the singleton for the element type given and attaches it to src
-/datum/proc/AddElement(eletype, ...)
-	var/datum/element/ele = SSdcs.GetElement(arglist(args))
-	args[1] = src
-	if(ele.Attach(arglist(args)) == ELEMENT_INCOMPATIBLE)
-		CRASH("Incompatible [eletype] assigned to a [type]! args: [json_encode(args)]")
+/datum/proc/_AddElement(list/arguments)
+	var/datum/element/ele = SSdcs.GetElement(arguments)
+	arguments[1] = src
+	if(ele.Attach(arglist(arguments)) == ELEMENT_INCOMPATIBLE)
+		CRASH("Incompatible [arguments[1]] assigned to a [type]! args: [json_encode(args)]")
 
 /**
   * Finds the singleton for the element type given and detaches it from src
   * You only need additional arguments beyond the type if you're using ELEMENT_BESPOKE
   */
-/datum/proc/RemoveElement(eletype, ...)
-	var/datum/element/ele = SSdcs.GetElement(arglist(args))
+/datum/proc/_RemoveElement(list/arguments)
+	var/datum/element/ele = SSdcs.GetElement(arguments)
 	ele.Detach(src)

code/datums/elements/dunkable.dm

@@ -0,0 +1,34 @@
+// If an item has the dunkable element, it's able to be dunked into reagent containers like beakers and glasses.
+// Dunking the item into a container will transfer reagents from the container to the item.
+/datum/element/dunkable
+	element_flags = ELEMENT_BESPOKE
+	id_arg_index = 2
+	var/dunk_amount // the amount of reagents that will be transfered from the container to the item on each click
+
+/datum/element/dunkable/Attach(datum/target, amount_per_dunk)
+	. = ..()
+	if(!isitem(target))
+		return ELEMENT_INCOMPATIBLE
+	dunk_amount = amount_per_dunk
+	RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/get_dunked)
+
+/datum/element/dunkable/Detach(datum/target)
+	. = ..()
+	UnregisterSignal(target, COMSIG_ITEM_AFTERATTACK)
+
+/datum/element/dunkable/proc/get_dunked(datum/source, atom/target, mob/user, proximity_flag)
+	if(!proximity_flag) // if the user is not adjacent to the container
+		return
+	var/obj/item/reagent_containers/container = target // the container we're trying to dunk into
+	if(istype(container) && container.reagent_flags & DUNKABLE) // container should be a valid target for dunking
+		if(!container.is_drainable())
+			to_chat(user, "<span class='warning'>[container] is unable to be dunked in!</span>")
+			return
+		var/obj/item/I = source // the item that has the dunkable element
+		if(container.reagents.trans_to(I, dunk_amount, transfered_by = user))	//if reagents were transfered, show the message
+			to_chat(user, "<span class='notice'>You dunk \the [I] into \the [container].</span>")
+			return
+		if(!container.reagents.total_volume)
+			to_chat(user, "<span class='warning'>[container] is empty!</span>")
+		else
+			to_chat(user, "<span class='warning'>[I] is full!</span>")