diff --git a/code/datums/elements/gravedigger.dm b/code/datums/elements/gravedigger.dm index 7f88e7072ce..ec43d340a52 100644 --- a/code/datums/elements/gravedigger.dm +++ b/code/datums/elements/gravedigger.dm @@ -44,5 +44,5 @@ return ITEM_INTERACT_BLOCKING /datum/element/gravedigger/proc/perform_digging(mob/user, atom/dig_area, obj/item/our_tool) - if(our_tool.use_tool(dig_area, user, 10 SECONDS)) + if(our_tool.use_tool(dig_area, user, 10 SECONDS * (HAS_MIND_TRAIT(user, TRAIT_MORBID) ? 0.7 : 1) * our_tool.toolspeed)) new /obj/structure/closet/crate/grave/fresh(dig_area) //We don't get_turf for the location since this is guaranteed to be a turf at this point. diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index e4fb10b544d..ec2c59bd640 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -574,6 +574,8 @@ amputation_speed_mod *= 0.5 if(patient.stat != DEAD && patient.has_status_effect(/datum/status_effect/jitter)) //jittering will make it harder to secure the shears, even if you can't otherwise move amputation_speed_mod *= 1.5 //15*0.5*1.5=11.25, so staminacritting someone who's jittering (from, say, a stun baton) won't give you enough time to snip their head off, but staminacritting someone who isn't jittering will + if(HAS_MIND_TRAIT(user, TRAIT_MORBID)) + amputation_speed_mod *= 0.7 //its morbin time if(do_after(user, toolspeed * 15 SECONDS * amputation_speed_mod, target = patient)) playsound(get_turf(patient), 'sound/items/weapons/bladeslice.ogg', 250, TRUE)