Merge branch 'master' into glassware

code/modules/reagents/reagent_containers/borghydro.dm

@@ -124,9 +124,8 @@ Borg Hypospray
 	return
 
 /obj/item/reagent_containers/borghypo/examine(mob/user)
-	usr = user
-	..()
-	DescribeContents()	//Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this
+	. = ..()
+	. += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this
 
 /obj/item/reagent_containers/borghypo/proc/DescribeContents()
 	var/empty = 1
@@ -134,11 +133,11 @@ Borg Hypospray
 	for(var/datum/reagents/RS in reagent_list)
 		var/datum/reagent/R = locate() in RS.reagent_list
 		if(R)
-			to_chat(usr, "<span class='notice'>It currently has [R.volume] unit\s of [R.name] stored.</span>")
+			. += "<span class='notice'>It currently has [R.volume] unit\s of [R.name] stored.</span>"
 			empty = 0
 
 	if(empty)
-		to_chat(usr, "<span class='warning'>It is currently empty! Allow some time for the internal syntheszier to produce more.</span>")
+		. += "<span class='warning'>It is currently empty! Allow some time for the internal syntheszier to produce more.</span>"
 
 /obj/item/reagent_containers/borghypo/hacked
 	icon_state = "borghypo_s"

code/modules/reagents/reagent_containers/bottle.dm

@@ -77,6 +77,11 @@
 	desc = "A small bottle of charcoal, which removes toxins and other chemicals from the bloodstream."
 	list_reagents = list("charcoal" = 30)
 
+/obj/item/reagent_containers/glass/bottle/cryoxadone
+	name = "cryoxadone bottle"
+	desc = "A small bottle of cryoxadone, heals most types of damage when used in extremely cold enviornments."
+	list_reagents = list("cryoxadone" = 30)
+
 /obj/item/reagent_containers/glass/bottle/mutagen
 	name = "unstable mutagen bottle"
 	desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."

code/modules/reagents/reagent_containers/hypospray.dm

@@ -121,11 +121,11 @@
 		icon_state = "[initial(icon_state)]0"
 
 /obj/item/reagent_containers/hypospray/medipen/examine()
-	..()
+	. = ..()
 	if(reagents && reagents.reagent_list.len)
-		to_chat(usr, "<span class='notice'>It is currently loaded.</span>")
+		. += "<span class='notice'>It is currently loaded.</span>"
 	else
-		to_chat(usr, "<span class='notice'>It is spent.</span>")
+		. += "<span class='notice'>It is spent.</span>"
 
 /obj/item/reagent_containers/hypospray/medipen/stimulants
 	name = "illegal stimpack medipen"
@@ -296,10 +296,10 @@
 /obj/item/hypospray/mkii/examine(mob/user)
 	. = ..()
 	if(vial)
-		to_chat(user, "[vial] has [vial.reagents.total_volume]u remaining.")
+		. += "[vial] has [vial.reagents.total_volume]u remaining."
 	else
-		to_chat(user, "It has no vial loaded in.")
-	to_chat(user, "[src] is set to [mode ? "Inject" : "Spray"] contents on application.")
+		. += "It has no vial loaded in."
+	. += "[src] is set to [mode ? "Inject" : "Spray"] contents on application."
 
 /obj/item/hypospray/mkii/proc/unload_hypo(obj/item/I, mob/user)
 	if((istype(I, /obj/item/reagent_containers/glass/bottle/vial)))

code/modules/reagents/reagent_containers/medspray.dm

@@ -100,3 +100,8 @@
 	name = "sterilizer spray"
 	desc = "Spray bottle loaded with non-toxic sterilizer. Useful in preparation for surgery."
 	list_reagents = list("sterilizine" = 60)
+
+/obj/item/reagent_containers/medspray/synthtissue
+	name = "Synthtissue young culture spray"
+	desc = "Spray bottle loaded with synthtissue. Useful in synthtissue grafting surgeries."
+	list_reagents = list("synthtissue" = 60)

code/modules/reagents/reagent_containers/rags.dm

@@ -5,7 +5,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "rag"
 	item_flags = NOBLUDGEON
-	reagent_flags = OPENCONTAINER
+	reagent_flags = REFILLABLE | DRAINABLE
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list()
 	volume = 5
@@ -23,7 +23,7 @@
 /obj/item/reagent_containers/rag/examine(mob/user)
 	. = ..()
 	if(reagents.total_volume)
-		to_chat(user, "<span class='notice'>Alt-Click to squeeze the liquids out of it.</span>")
+		. += "<span class='notice'>It's soaked. Alt-Click to squeeze it dry, and perhaps gather the liquids into another held open container.</span>"
 
 /obj/item/reagent_containers/rag/afterattack(atom/A as obj|turf|area, mob/user,proximity)
 	. = ..()
@@ -85,15 +85,26 @@
 /obj/item/reagent_containers/rag/AltClick(mob/user)
 	. = ..()
 	if(reagents.total_volume && user.canUseTopic(src, BE_CLOSE))
-		to_chat(user, "<span class='notice'>You start squeezing the liquids out of \the [src]...</span>")
+		to_chat(user, "<span class='notice'>You start squeezing \the [src] dry...</span>")
 		if(do_after(user, action_speed, TRUE, src))
-			to_chat(user, "<span class='notice'>You squeeze \the [src] dry.</span>")
-			var/atom/react_loc = get_turf(src)
-			if(ismob(react_loc))
-				react_loc = react_loc.loc
-			if(react_loc)
-				reagents.reaction(react_loc, TOUCH)
-			reagents.clear_reagents()
+			var/msg = "You squeeze \the [src]"
+			var/obj/item/target
+			if(Adjacent(user)) //Allows the user to drain the reagents into a beaker if adjacent (no telepathy).
+				for(var/obj/item/I in user.held_items)
+					if(I == src)
+						continue
+					if(I.is_open_container() && !I.reagents.holder_full())
+						target = I
+						break
+			if(!target)
+				msg += " dry"
+				reagents.reaction(get_turf(src), TOUCH)
+				reagents.clear_reagents()
+			else
+				msg += "'s liquids into \the [target]"
+				reagents.trans_to(target, reagents.total_volume)
+			to_chat(user, "<span class='notice'>[msg].</span>")
+
 
 /obj/item/reagent_containers/rag/towel
 	name = "towel"

code/modules/reagents/reagent_containers/sleeper_buffer.dm

@@ -0,0 +1,11 @@
+//Created if a sleeper is deconstructed, to contain the reagents within it.
+/obj/item/reagent_containers/sleeper_buffer
+	name = "Sleeper buffer container"
+	desc = "A closed container for insertion in the Medical Sleepers."
+	icon_state = "sleeper_buffer"
+	volume = 500
+	reagent_flags = NO_REACT
+	spillable = TRUE
+	resistance_flags = ACID_PROOF
+	amount_per_transfer_from_this = 0
+	possible_transfer_amounts = list(0)

code/modules/reagents/reagent_containers/spray.dm

@@ -230,7 +230,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "clownflower"
 	volume = 30
-	list_reagents = list(/datum/reagent/lube/superlube = 30)
+	list_reagents = list("superlube" = 30)
 
 /obj/item/reagent_containers/spray/waterflower/cyborg
 	reagent_flags = NONE