Merge pull request #3963 from Anewbe/scythe

Makes the scythe a child of fireaxes, adds it to the weed control crate

code/datums/supplypacks/hydroponics.dm

@@ -113,9 +113,10 @@
 			/obj/item/weapon/material/hatchet = 2,
 			/obj/item/weapon/reagent_containers/spray/plantbgone = 4,
 			/obj/item/clothing/mask/gas = 2,
-			/obj/item/weapon/grenade/chem_grenade/antiweed = 2
+			/obj/item/weapon/grenade/chem_grenade/antiweed = 2,
+			/obj/item/weapon/material/twohanded/fireaxe/scythe
 			)
-	cost = 25
+	cost = 45
 	containertype = /obj/structure/closet/crate/hydroponics
 	containername = "Weed control crate"
 	access = access_hydroponics

code/game/objects/items/weapons/material/misc.dm

@@ -85,19 +85,4 @@
 	thrown_force_divisor = 0.25 // as above
 	dulled_divisor = 0.75	//Still metal on a long pole
 	w_class = ITEMSIZE_SMALL
-	attack_verb = list("slashed", "sliced", "cut", "clawed")
-
-/obj/item/weapon/material/scythe
-	icon_state = "scythe0"
-	name = "scythe"
-	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
-	force_divisor = 0.275 // 16 with hardness 60 (steel)
-	thrown_force_divisor = 0.25 // 5 with weight 20 (steel)
-	sharp = 1
-	edge = 1
-	throw_speed = 1
-	throw_range = 3
-	w_class = ITEMSIZE_LARGE
-	slot_flags = SLOT_BACK
-	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
-	attack_verb = list("chopped", "sliced", "cut", "reaped")
+	attack_verb = list("slashed", "sliced", "cut", "clawed")

code/game/objects/items/weapons/material/twohanded.dm

@@ -123,6 +123,15 @@
 			var/obj/effect/plant/P = A
 			P.die_off()
 
+/obj/item/weapon/material/twohanded/fireaxe/scythe
+	icon_state = "scythe0"
+	base_icon = "scythe"
+	name = "scythe"
+	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
+	force_divisor = 0.65
+	origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
+	attack_verb = list("chopped", "sliced", "cut", "reaped")
+
 //spears, bay edition
 /obj/item/weapon/material/twohanded/spear
 	icon_state = "spearglass0"