diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 6b737bfc573..e766129a18c 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/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 diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index 2d85bc0a663..9d8792dab49 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/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") \ No newline at end of file diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm index 5cb404a2b8b..8f329c6decc 100644 --- a/code/game/objects/items/weapons/material/twohanded.dm +++ b/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" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 9957448ceb6..768e71b1f46 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ diff --git a/icons/mob/items/lefthand_material.dmi b/icons/mob/items/lefthand_material.dmi index dc642311e5d..b91fb8a545d 100644 Binary files a/icons/mob/items/lefthand_material.dmi and b/icons/mob/items/lefthand_material.dmi differ diff --git a/icons/mob/items/righthand_material.dmi b/icons/mob/items/righthand_material.dmi index 44904c68c75..e950740bb87 100644 Binary files a/icons/mob/items/righthand_material.dmi and b/icons/mob/items/righthand_material.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index 01d769a0f46..6807e3fbc9e 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ