Merge pull request #1044 from Erthilo/master

TG Updates up to r3585

code/defines/obj/hydro.dm

@@ -620,16 +620,16 @@
 /obj/item/seeds/harebell
 	name = "pack of harebell seeds"
 	desc = "These seeds grow into pretty little flowers."
-	icon_state = "seed"
+	icon_state = "seed-harebell"
 	mypath = "/obj/item/seeds/harebell"
 	species = "harebell"
 	plantname = "Harebells"
-	productname = ""
+	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/harebell"
 	lifespan = 100
 	endurance = 20
 	maturation = 7
 	production = 1
-	yield = -1
+	yield = 2
 	potency = 1
 	oneharvest = 1
 	growthstages = 4
@@ -1058,6 +1058,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/poppy
 	seed = "/obj/item/seeds/poppyseed"
 	name = "poppy"
+	desc = "Long-used as a symbol of rest, peace, and death."
 	icon_state = "poppy"
 	potency = 30
 	New()
@@ -1066,6 +1067,16 @@
 		reagents.add_reagent("bicaridine", 1+round((potency / 10), 1))
 		bitesize = 1+round(reagents.total_volume / 3, 1)
 
+/obj/item/weapon/reagent_containers/food/snacks/grown/harebell
+	seed = "obj/item/seeds/harebellseed"
+	name = "harebell"
+	desc = "\"I'll sweeten thy sad grave: thou shalt not lack the flower that's like thy face, pale primrose, nor the azured hare-bell, like thy veins; no, nor the leaf of eglantine, whom not to slander, out-sweeten’d not thy breath.\""
+	icon_state = "harebell"
+	potency = 1
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1+round((potency / 20), 1))
+		bitesize = 1+round(reagents.total_volume / 3, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/potato
 	seed = "/obj/item/seeds/potatoseed"

code/defines/obj/weapon.dm

@@ -741,7 +741,7 @@
 
 /obj/item/weapon/extinguisher
 	name = "fire extinguisher"
-	desc = "Contains water for fighting fires."
+	desc = "A traditional red fire extinguisher."
 	icon = 'items.dmi'
 	icon_state = "fire_extinguisher0"
 	var/last_use = 1.0
@@ -760,6 +760,7 @@
 	name = "fire extinguisher"
 	desc = "A light and compact fibreglass-framed model fire extinguisher."
 	icon_state = "miniFE0"
+	hitsound = null	//it is much lighter, after all.
 	flags = FPRINT | USEDELAY | TABLEPASS
 	throwforce = 5
 	w_class = 2.0
@@ -1511,6 +1512,7 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove
 	desc = "You can drill using this item. You dig?"
 	icon = 'surgery.dmi'
 	icon_state = "drill"
+	hitsound = 'circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 1.0
@@ -1521,6 +1523,7 @@ eternal248: Found broken and buggy Z-levels 7-12, ended up leading to my discove
 	desc = "For heavy duty cutting."
 	icon = 'surgery.dmi'
 	icon_state = "saw3"
+	hitsound = 'circsawhit.ogg'
 	flags = FPRINT | TABLEPASS | CONDUCT
 	force = 15.0
 	w_class = 1.0