Added baggies for drugs, aww yeah

code/modules/reagents/reagent_containers/drugs.dm

@@ -0,0 +1,145 @@
+/obj/item/weapon/reagent_containers/drugs
+	name = " "
+	var/base_name = " "
+	desc = " "
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "baggie"
+	item_state = "beaker"
+	amount_per_transfer_from_this = 2
+	possible_transfer_amounts = 2
+	volume = 10
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+
+	var/label_text = ""
+
+	New()
+		..()
+		src.pixel_x = rand(-10.0, 10) //Randomizes postion
+		src.pixel_y = rand(-10.0, 10)
+		base_name = name
+
+
+	examine()
+		set src in view()
+		..()
+		if (!(usr in view(2)) && usr!=src.loc) return
+		usr << "\blue It contains:"
+		if(reagents && reagents.reagent_list.len)
+			usr << "\blue [src.reagents.total_volume] units of powder."
+		else
+			usr << "\blue Nothing."
+
+	afterattack(obj/target, mob/user, proximity)
+		if(!proximity) return
+
+		if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
+
+			if(!target.reagents.total_volume && target.reagents)
+				user << "\red [target] is empty."
+				return
+
+			if(reagents.total_volume >= reagents.maximum_volume)
+				user << "\red [src] is full."
+				return
+
+			for(var/datum/reagent/A in target.reagents.reagent_list)
+				if(A.reagent_state != 1)
+					user << "\red You can only put powders in [src]."
+					return
+
+			var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
+			user << "\blue You fill [src] with [trans] units of the contents of [target]."
+
+		else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
+			if(!reagents.total_volume)
+				user << "\red [src] is empty."
+				return
+
+			if(target.reagents.total_volume >= target.reagents.maximum_volume)
+				user << "\red [target] is full."
+				return
+
+			// /vg/: Logging transfers of bad things
+			if(target.reagents_to_log.len)
+				var/list/badshit=list()
+				for(var/bad_reagent in target.reagents_to_log)
+					if(reagents.has_reagent(bad_reagent))
+						badshit += reagents_to_log[bad_reagent]
+				if(badshit.len)
+					var/hl="\red <b>([english_list(badshit)])</b> \black"
+					message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+					log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].")
+
+			var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+			user << "\blue You transfer [trans] units of the solution to [target]."
+
+		//Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary.
+		else if(istype(target, /obj/item/clothing/suit/space/space_ninja))
+			return
+
+		else if(istype(target, /obj/machinery/bunsen_burner))
+			return
+
+		else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
+			return
+
+
+	attackby(obj/item/weapon/W as obj, mob/user as mob)
+		if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
+			var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
+			if(length(tmp_label) > 10)
+				user << "\red The label can be at most 10 characters long."
+			else
+				user << "\blue You set the label to \"[tmp_label]\"."
+				src.label_text = tmp_label
+				src.update_name_label()
+
+	proc/update_name_label()
+		if(src.label_text == "")
+			src.name = src.base_name
+		else
+			src.name = "[src.base_name] ([src.label_text])"
+
+/obj/item/weapon/reagent_containers/drugs/baggie
+	name = "baggie"
+	desc = "A baggie. Can hold up to 10 units."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "baggie"
+	item_state = "beaker"
+
+	on_reagent_change()
+		update_icon()
+
+	pickup(mob/user)
+		..()
+		update_icon()
+
+	dropped(mob/user)
+		..()
+		update_icon()
+
+	attack_hand()
+		..()
+		update_icon()
+
+	update_icon()
+		overlays.Cut()
+
+		if(reagents.total_volume)
+			var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]2")
+
+			switch(reagents.total_volume)
+				if(0 to 2)	filling.icon_state = "[icon_state]2"
+				if(3 to 4) 	filling.icon_state = "[icon_state]4"
+				if(5 to 6)	filling.icon_state = "[icon_state]6"
+				if(7 to 8)	filling.icon_state = "[icon_state]8"
+				if(9 to 10)	filling.icon_state = "[icon_state]10"
+
+
+			filling.icon += mix_color_from_reagents(reagents.reagent_list)
+			overlays += filling
+
+/obj/item/weapon/reagent_containers/drugs/baggie/meth
+	New()
+		..()
+		reagents.add_reagent("hyperzine", 10)

code/modules/research/rdconsole.dm

@@ -781,6 +781,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			if(linked_lathe.plasteel_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=1'>(1 Sheet)</A> "
 			if(linked_lathe.plasteel_amount >= 10000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=5'>(5 Sheets)</A> "
 			if(linked_lathe.plasteel_amount >= 2000) dat += "<A href='?src=\ref[src];lathe_ejectsheet=plasteel;lathe_ejectsheet_amt=50'>(Max Sheets)</A>"
+			dat += "<BR>"
 			//Gold
 			dat += "* [linked_lathe.gold_amount] cm<sup>3</sup> of Gold || "
 			dat += "Eject: "