diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 87d7165b8d3..204741c6cb0 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -104,11 +104,12 @@ emp_act var/obj/item/organ/external/affecting = get_organ(check_zone(def_zone)) if(affecting && !affecting.cannot_amputate && affecting.get_damage() >= (affecting.max_damage - P.dismemberment)) var/damtype = DROPLIMB_SHARP - switch(P.damage_type) - if(BRUTE) - damtype = DROPLIMB_BLUNT - if(BURN) - damtype = DROPLIMB_BURN + if(!P.sharp) + switch(P.damage_type) + if(BRUTE) + damtype = DROPLIMB_BLUNT + if(BURN) + damtype = DROPLIMB_BURN affecting.droplimb(FALSE, damtype) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index b29b6109d1c..c8090686aa3 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -315,6 +315,7 @@ damage = 15 damage_type = BURN flag = "magic" + sharp = TRUE dismemberment = 50 nodamage = 0 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 56f71bf1764..b78339e8ef7 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -246,6 +246,7 @@ damage = 5 range = 3 dismemberment = 20 + sharp = TRUE impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser /obj/item/projectile/plasma/on_hit(atom/target)