From a2f91359516a361ee83a59c0d92181d588ec9dcb Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 8 Dec 2018 04:16:04 -0800 Subject: [PATCH 1/3] Update hydroitemdefines.dm --- code/modules/hydroponics/hydroitemdefines.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 591fdfd535..eea53cf94d 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -115,6 +115,7 @@ slot_flags = ITEM_SLOT_BACK attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' + total_mass = 1.25 var/swiping = FALSE /obj/item/scythe/Initialize() From a347cd14e2a64dd426b3bcb2bfa89aef6b943378 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 8 Dec 2018 04:19:41 -0800 Subject: [PATCH 2/3] eh --- code/modules/hydroponics/hydroitemdefines.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index eea53cf94d..1824fdbfa7 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -115,7 +115,7 @@ slot_flags = ITEM_SLOT_BACK attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' - total_mass = 1.25 + total_mass = 1.75 var/swiping = FALSE /obj/item/scythe/Initialize() From d049ecaecd418bbc76e7794423a273192e0ca0ce Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 8 Dec 2018 04:53:02 -0800 Subject: [PATCH 3/3] Update hydroitemdefines.dm --- code/modules/hydroponics/hydroitemdefines.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 1824fdbfa7..e3ca576944 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -115,7 +115,6 @@ slot_flags = ITEM_SLOT_BACK attack_verb = list("chopped", "sliced", "cut", "reaped") hitsound = 'sound/weapons/bladeslice.ogg' - total_mass = 1.75 var/swiping = FALSE /obj/item/scythe/Initialize() @@ -138,6 +137,7 @@ else var/turf/user_turf = get_turf(user) var/dir_to_target = get_dir(user_turf, get_turf(A)) + var/stam_gain = 0 swiping = TRUE var/static/list/scythe_slash_angles = list(0, 45, 90, -45, -90) for(var/i in scythe_slash_angles) @@ -145,7 +145,10 @@ for(var/obj/structure/spacevine/V in T) if(user.Adjacent(V)) melee_attack_chain(user, V) + stam_gain += 5 //should be hitcost swiping = FALSE + stam_gain += 2 //Initial hitcost + user.adjustStaminaLoss(-stam_gain) // ************************************* // Nutrient defines for hydroponics