Base Commit

code/game/objects/items/contraband.dm

@@ -1,6 +1,8 @@
-//Let's get some REAL contraband stuff in here. Because come on, getting brigged for LIPSTICK is no fun.
-
-//Illicit drugs~
+// Let's get some REAL contraband stuff in here. Because come on, getting brigged for LIPSTICK is no fun.
+//
+// Includes drug powder.
+//
+// Illicit drugs~
 /obj/item/weapon/storage/pill_bottle/happy
 	name = "bottle of Happy pills"
 	desc = "Highly illegal drug. When you want to see the rainbow."
@@ -19,7 +21,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/random/toxin
 	random_reagent_list = list(
-		list("mindbreaker" = 10, "space_drugs" = 20)	= 3,
+		list("mindbreaker" = 10, "bliss" = 20)	= 3,
 		list("carpotoxin" = 15)							= 2,
 		list("impedrezene" = 15)						= 2,
 		list("zombiepowder" = 10)						= 1)
@@ -39,3 +41,56 @@
 
 	desc = "Contains [english_list(names)]."
 	update_icon()
+
+//
+// Drug Powder
+//
+/obj/item/weapon/reagent_containers/powder
+	name = "powder"
+	desc = "A powdered form of... something."
+	icon = 'icons/obj/chemical.dmi'
+	icon_state = "powder"
+	item_state = "powder"
+	amount_per_transfer_from_this = 2
+	possible_transfer_amounts = 2
+	w_class = ITEMSIZE_TINY
+	volume = 50
+
+/obj/item/weapon/reagent_containers/powder/examine(mob/user)
+	if(reagents)
+		var/datum/reagent/R = reagents.get_master_reagent()
+		desc = "A powdered form of what appears to be [R.name]. There's about [reagents.total_volume] units here."
+	return ..()
+
+/obj/item/weapon/reagent_containers/powder/Initialize()
+	..()
+	get_appearance()
+
+/obj/item/weapon/reagent_containers/powder/proc/get_appearance()
+	/// Names and colors based on dominant reagent.
+	if (reagents.reagent_list.len > 0)
+		color = reagents.get_color()
+		var/datum/reagent/R = reagents.get_master_reagent()
+		var/new_name = lowertext(R)
+		name = "powdered [new_name]"
+
+/// Snorting.
+
+/obj/item/weapon/reagent_containers/powder/attackby(var/obj/item/weapon/W, var/mob/living/user)
+
+	if(!ishuman(user)) /// You gotta be fleshy to snort the naughty drugs.
+		return ..()
+
+	if(!istype(W, /obj/item/weapon/glass_extra/straw) && !istype(W, /obj/item/weapon/reagent_containers/rollingpaper))
+		return ..()
+
+	user.visible_message("<span class='warning'>[user] snorts [src] with [W]!</span>")
+	playsound(loc, 'sound/effects/snort.ogg', 50, 1)
+
+	if(reagents)
+		reagents.trans_to_mob(user, amount_per_transfer_from_this, CHEM_BLOOD)
+
+	if(!reagents.total_volume) /// Did we use all of it?
+		qdel(src)
+
+////// End powder. /////////

code/game/objects/items/devices/flashlight.dm

@@ -144,7 +144,7 @@
 					to_chat(user, "<span class='notice'>There's visible lag between left and right pupils' reactions.</span>")
 
 				var/list/pinpoint = list("oxycodone"=1,"tramadol"=5)
-				var/list/dilating = list("space_drugs"=5,"mindbreaker"=1)
+				var/list/dilating = list("bliss"=5,"ambrosia_extract"=5,"mindbreaker"=1)
 				if(M.reagents.has_any_reagent(pinpoint) || H.ingested.has_any_reagent(pinpoint))
 					to_chat(user, "<span class='notice'>\The [M]'s pupils are already pinpoint and cannot narrow any more.</span>")
 				else if(M.reagents.has_any_reagent(dilating) || H.ingested.has_any_reagent(dilating))

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

@@ -116,7 +116,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		if(ishuman(loc))
 			var/mob/living/carbon/human/C = loc
 			if (src == C.wear_mask && C.check_has_mouth()) // if it's in the human/monkey mouth, transfer reagents to the mob
-				reagents.trans_to_mob(C, REM, CHEM_INGEST, 0.2) // Most of it is not inhaled... balance reasons.
+				reagents.trans_to_mob(C, amount, CHEM_INGEST, 1.5) // I don't predict significant balance issues by letting blunts actually WORK.
 		else // else just remove some of the reagents
 			reagents.remove_any(REM)
 

code/game/objects/random/unidentified/medicine.dm

@@ -32,7 +32,7 @@ much more likely to show up. This is done for several purposes;
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/healing_nanites/unidentified,
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified,
-		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/space_drugs/unidentified,
+		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified,
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/expired/unidentified,
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified,
 		/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified,
@@ -108,7 +108,7 @@ much more likely to show up. This is done for several purposes;
 		prob(5);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting/unidentified,
 		prob(40);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/combat/unidentified,
 		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/stimm/unidentified,
-		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/space_drugs/unidentified,
+		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bliss/unidentified,
 		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/serotrotium/unidentified,
 		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/cryptobiolin/unidentified,
 		prob(20);/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/mindbreaker/unidentified,