From 52ce42a548fe33f922ad33c3bdb2e527c180a627 Mon Sep 17 00:00:00 2001 From: ATH1909 <42606352+ATH1909@users.noreply.github.com> Date: Sat, 1 Feb 2020 11:44:08 -0600 Subject: [PATCH 1/3] Update organic_steps.dm --- code/modules/surgery/organic_steps.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 1319b547d69..84641d860a4 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -101,8 +101,8 @@ //saw bone /datum/surgery_step/saw name = "saw bone" - implements = list(TOOL_SAW = 100,/obj/item/melee/arm_blade = 75, - /obj/item/twohanded/fireaxe = 50, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25) + implements = list(TOOL_SAW = 100,/obj/item/melee/arm_blade = 85, + /obj/item/twohanded/fireaxe = 70, /obj/item/hatchet = 55, /obj/item/kitchen/knife/butcher = 35, /obj/item = 20) time = 54 /datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) From 8952e1ec72d69cfda199833c10ca3e8bee6aef0f Mon Sep 17 00:00:00 2001 From: ATH1909 <42606352+ATH1909@users.noreply.github.com> Date: Sat, 1 Feb 2020 12:34:43 -0600 Subject: [PATCH 2/3] Update organic_steps.dm --- code/modules/surgery/organic_steps.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index 84641d860a4..007a2762dbb 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -110,6 +110,12 @@ "[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", "[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].") +/datum/surgery_step/saw/tool_check(mob/user, obj/item/tool) + if(implement_type == /obj/item && !(tool.get_sharpness() && (tool.force >= 10))) + return FALSE + + return TRUE + /datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) target.apply_damage(50, BRUTE, "[target_zone]") display_results(user, target, "You saw [target]'s [parse_zone(target_zone)] open.", From b02a66ee83e7c1213b99f2bdff14a227f71494a5 Mon Sep 17 00:00:00 2001 From: ATH1909 <42606352+ATH1909@users.noreply.github.com> Date: Sun, 9 Feb 2020 14:17:42 -0600 Subject: [PATCH 3/3] Update organic_steps.dm --- code/modules/surgery/organic_steps.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm index ca469e04385..7768846ff7e 100644 --- a/code/modules/surgery/organic_steps.dm +++ b/code/modules/surgery/organic_steps.dm @@ -102,8 +102,8 @@ //saw bone /datum/surgery_step/saw name = "saw bone" - implements = list(TOOL_SAW = 100,/obj/item/melee/arm_blade = 85, - /obj/item/twohanded/fireaxe = 70, /obj/item/hatchet = 55, /obj/item/kitchen/knife/butcher = 35, /obj/item = 20) + implements = list(TOOL_SAW = 100,/obj/item/melee/arm_blade = 75, + /obj/item/twohanded/fireaxe = 50, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25, /obj/item = 20) //20% success (sort of) with any sharp item with a force>=10 time = 54 /datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)