diff --git a/code/__DEFINES/mob.dm b/code/__DEFINES/mob.dm
index 0080658562b..fcb6e53c365 100644
--- a/code/__DEFINES/mob.dm
+++ b/code/__DEFINES/mob.dm
@@ -29,8 +29,6 @@
#define ORGAN_ASSISTED 4096
#define DROPLIMB_EDGE 0
-#define DROPLIMB_BLUNT 1
-#define DROPLIMB_BURN 2
#define AGE_MIN 17 //youngest a character can be
#define AGE_MAX 85 //oldest a character can be
diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm
index 1a014a35fc9..452a8cd6c8d 100644
--- a/code/game/dna/genes/goon_powers.dm
+++ b/code/game/dna/genes/goon_powers.dm
@@ -315,7 +315,7 @@
return
usr.visible_message("\red [usr] [pick("chomps","bites")] off [the_item]'s [limb]!")
playsound(usr.loc, 'sound/items/eatfood.ogg', 50, 0)
- var/obj/limb_obj=limb.droplimb(0,DROPLIMB_BLUNT)
+ var/obj/limb_obj=limb.droplimb(0,DROPLIMB_EDGE)
if(limb_obj)
var/obj/item/organ/external/chest=usr:get_organ("chest")
chest.implants += limb_obj
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 29dfa0aceed..4603778112c 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -25,7 +25,7 @@
// Only make the limb drop if it's not too damaged
if(prob(100 - E.get_damage()))
// Override the current limb status and don't cause an explosion
- E.droplimb(1,pick(DROPLIMB_EDGE,DROPLIMB_BLUNT))
+ E.droplimb(DROPLIMB_EDGE)
if(!(species.flags & IS_SYNTHETIC))
flick("gibbed-h", animation)
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index d045017117d..fdccbd826a7 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -208,17 +208,10 @@
var/mob/living/carbon/owner_old = owner //Need to update health, but need a reference in case the below check cuts off a limb.
//If limb took enough damage, try to cut or tear it off
if(owner && loc == owner)
- if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier))
- var/dropped
- if(burn >= 20 && prob(burn / 2))
- if(body_part == HEAD) return
- dropped = 1
- droplimb(0,DROPLIMB_BURN)
- if(!dropped && prob(brute / 2))
+ if(!cannot_amputate && config.limbs_can_break && (brute_dam) >= (max_damage * config.organ_health_multiplier))
+ if(prob(brute / 2))
if(edge)
droplimb(0,DROPLIMB_EDGE)
- else
- droplimb(0,DROPLIMB_BLUNT)
if(owner_old) owner_old.updatehealth()
return update_icon()
@@ -610,16 +603,6 @@ Note that amputating the affected organ does in fact remove the infection from t
"\The [owner]'s [src.name] flies off in an arc!",\
"Your [src.name] goes flying off!",\
"You hear a terrible sound of ripping tendons and flesh.")
- if(DROPLIMB_BURN)
- owner.visible_message(
- "\The [owner]'s [src.name] flashes away into ashes!",\
- "Your [src.name] flashes away into ashes!",\
- "You hear the crackling sound of burning flesh.")
- if(DROPLIMB_BLUNT)
- owner.visible_message(
- "\The [owner]'s [src.name] explodes in a shower of gore!",\
- "Your [src.name] explodes in a shower of gore!",\
- "You hear the sickening splatter of gore.")
var/mob/living/carbon/human/victim = owner //Keep a reference for post-removed().
removed(null, ignore_children)
@@ -663,24 +646,6 @@ Note that amputating the affected organ does in fact remove the infection from t
throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
dir = 2
return
- if(DROPLIMB_BURN)
- new /obj/effect/decal/cleanable/ash(get_turf(victim))
- qdel(src)
- if(DROPLIMB_BLUNT)
- var/obj/effect/decal/cleanable/blood/gibs/gore = new victim.species.single_gib_type(get_turf(victim))
- if(victim.species.flesh_color)
- gore.fleshcolor = victim.species.flesh_color
- if(victim.species.blood_color)
- gore.basecolor = victim.species.blood_color
- gore.update_icon()
- gore.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
-
- for(var/obj/item/organ/I in contents)
- I.loc = loc
- if(istype(loc,/turf))
- I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30)
- qdel(src)
-
/****************************************************
HELPERS
diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm
index 242200d0c8d..cf728cd50ed 100644
--- a/code/modules/virus2/effect.dm
+++ b/code/modules/virus2/effect.dm
@@ -326,7 +326,7 @@
if(ishuman(mob))
for (var/obj/item/organ/external/E in H.organs)
if(pick(1,0) && !(E.status & ORGAN_ROBOT))
- E.droplimb(0,DROPLIMB_BLUNT)
+ E.droplimb(0,DROPLIMB_EDGE)
if(3)
if(ishuman(mob))
if(H.species.name != "Skellington")