From 56c610e1118993ace31ecf9a1a88fc45a7b8649b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 11 May 2015 21:20:16 -0400 Subject: [PATCH] Updates weed control crate Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles. --- code/datums/supplypacks.dm | 10 ++++++++-- code/modules/hydroponics/trays/tray_tools.dm | 8 -------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 59926a6e0b..beedf6dca9 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -345,11 +345,17 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /datum/supply_packs/weedcontrol name = "Weed control crate" - contains = list(/obj/item/weapon/scythe, + contains = list(/obj/item/weapon/hatchet, + /obj/item/weapon/hatchet, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/weapon/reagent_containers/spray/plantbgone, + /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/weapon/grenade/chem_grenade/antiweed, /obj/item/weapon/grenade/chem_grenade/antiweed) - cost = 20 + cost = 25 containertype = /obj/structure/closet/crate/secure/hydrosec containername = "Weed control crate" access = access_hydroponics diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index 67d630119a..da6c996ac9 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -270,11 +270,3 @@ slot_flags = SLOT_BACK origin_tech = "materials=2;combat=2" attack_verb = list("chopped", "sliced", "cut", "reaped") - -/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob, proximity) - if(!proximity) return - if(istype(A, /obj/effect/plant)) - for(var/obj/effect/plant/B in orange(A,1)) - if(prob(80)) - B.die_off(1) - del A \ No newline at end of file