Merge remote-tracking branch 'upstream/master' into LightShit

Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm

code/game/objects/items/random_items.dm

@@ -198,7 +198,7 @@
 				B.desc	= "Looks like the label fell off."
 //				B.identify_probability = 0
 
-
+/*
 /obj/structure/closet/crate/bin/flowers
 	name = "flower barrel"
 	desc = "A bin full of fresh flowers for the bereaved."
@@ -211,7 +211,6 @@
 			AM.pixel_x = rand(-10,10)
 			AM.pixel_y = rand(-5,5)
 
-
 /obj/structure/closet/crate/bin/plants
 	name = "plant barrel"
 	desc = "Caution: Contents may contain vitamins and minerals.  It is recommended that you deep fry them before eating."
@@ -234,6 +233,7 @@
 			var/obj/O = new ptype(src)
 			O.pixel_x = rand(-10,10)
 			O.pixel_y = rand(-5,5)
+*/
 
 /obj/structure/closet/secure_closet/random_drinks
 	name = "Unlabelled Booze"

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

@@ -245,6 +245,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	src.pixel_x = rand(-5.0, 5)
 	src.pixel_y = rand(-5.0, 5)
 
+/obj/item/clothing/mask/cigarette/handroll
+	name = "hand-rolled cigarette"
+	desc = "A roll of tobacco and nicotine, freshly rolled by hand."
+	icon_state = "hr_cigoff"
+	item_state = "hr_cigoff"
+	icon_on = "hr_cigon"  //Note - these are in masks.dmi not in cigarette.dmi
+	icon_off = "hr_cigoff"
+	type_butt = /obj/item/weapon/cigbutt
+	chem_volume = 50
+
 ////////////
 // CIGARS //
 ////////////
@@ -485,7 +495,7 @@ obj/item/weapon/rollingpaper
 	name = "rolling paper"
 	desc = "A thin piece of paper used to make fine smokeables."
 	icon = 'icons/obj/cigarettes.dmi'
-	icon_state = "cig paper"
+	icon_state = "cig_paper"
 	w_class = 1
 
 

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

@@ -146,7 +146,7 @@
 	if(!user.gloves)
 		user << "\red The [name] burns your bare hand!"
 		user.adjustFireLoss(rand(1,5))
-
+/*
 /*
  * Nettle
  */
@@ -237,3 +237,4 @@
 		new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc)
 		del(src)
 		return
+*/