diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index b455e55db9..95f979dc3b 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -25,6 +25,8 @@ var/list/trophies = list() var/charged = TRUE var/charge_time = 15 + var/detonation_damage = 50 + var/backstab_bonus = 30 /obj/item/twohanded/required/kinetic_crusher/Destroy() QDEL_LIST(trophies) @@ -32,8 +34,8 @@ /obj/item/twohanded/required/kinetic_crusher/examine(mob/living/user) ..() - to_chat(user, "Mark a large creature with the destabilizing force, then hit them in melee to do 50 damage.") - to_chat(user, "Does 80 damage if the target is backstabbed, instead of 50.") + to_chat(user, "Mark a large creature with the destabilizing force, then hit them in melee to do [force + detonation_damage] damage.") + to_chat(user, "Does [force + detonation_damage + backstab_bonus] damage if the target is backstabbed, instead of [force + detonation_damage].") for(var/t in trophies) var/obj/item/crusher_trophy/T = t to_chat(user, "It has \a [T] attached, which causes [T.effect_desc()].") @@ -101,13 +103,13 @@ var/def_check = L.getarmor(type = "bomb") if((user.dir & backstab_dir) && (L.dir & backstab_dir)) if(!QDELETED(C)) - C.total_damage += 80 //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item - L.apply_damage(80, BRUTE, blocked = def_check) + C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item + L.apply_damage(detonation_damage + backstab_bonus, BRUTE, blocked = def_check) playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong else if(!QDELETED(C)) - C.total_damage += 50 - L.apply_damage(50, BRUTE, blocked = def_check) + C.total_damage += detonation_damage + L.apply_damage(detonation_damage, BRUTE, blocked = def_check) /obj/item/twohanded/required/kinetic_crusher/proc/Recharge() if(!charged) @@ -323,7 +325,7 @@ var/static/list/damage_heal_order = list(BRUTE, BURN, OXY) /obj/item/crusher_trophy/demon_claws/effect_desc() - return "melee hits to do [bonus_value * 0.2] more damage and heal you for [bonus_value * 0.1]; this effect is increased by 500% during mark detonation" + return "melee hits to do [bonus_value * 0.2] more damage and heal you for [bonus_value * 0.1], with 5X effect on mark detonation" /obj/item/crusher_trophy/demon_claws/add_to(obj/item/twohanded/required/kinetic_crusher/H, mob/living/user) . = ..() @@ -331,6 +333,7 @@ H.force += bonus_value * 0.2 H.force_unwielded += bonus_value * 0.2 H.force_wielded += bonus_value * 0.2 + H.detonation_damage += bonus_value * 0.8 /obj/item/crusher_trophy/demon_claws/remove_from(obj/item/twohanded/required/kinetic_crusher/H, mob/living/user) . = ..() @@ -338,12 +341,12 @@ H.force -= bonus_value * 0.2 H.force_unwielded -= bonus_value * 0.2 H.force_wielded -= bonus_value * 0.2 + H.detonation_damage -= bonus_value * 0.8 /obj/item/crusher_trophy/demon_claws/on_melee_hit(mob/living/target, mob/living/user) user.heal_ordered_damage(bonus_value * 0.1, damage_heal_order) /obj/item/crusher_trophy/demon_claws/on_mark_detonation(mob/living/target, mob/living/user) - target.adjustBruteLoss(bonus_value * 0.8) user.heal_ordered_damage(bonus_value * 0.4, damage_heal_order) //colossus