diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 4cfede1fdee..82ef8fcfa8e 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -1828,9 +1828,9 @@
 
 /mob/living/carbon/human/canBeHandcuffed()
 	if(get_num_arms() >= 2)
-		return 1
+		return TRUE
 	else
-		return 0
+		return FALSE
 
 /mob/living/carbon/human/InCritical()
 	return (health <= config.health_threshold_crit && stat == UNCONSCIOUS)
diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm
index 10ec8ee0dcc..c8e5cb8422a 100644
--- a/code/modules/surgery/organs/helpers.dm
+++ b/code/modules/surgery/organs/helpers.dm
@@ -79,7 +79,7 @@
 
 //sometimes we want to ignore that we don't have the required amount of arms.
 /mob/proc/get_arm_ignore()
-	return 0
+	return FALSE
 
 
 /mob/proc/get_num_legs()
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 0ce41976c24..060c1c22e83 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -523,28 +523,45 @@ Note that amputating the affected organ does in fact remove the infection from t
 			qdel(src) // If you flashed away to ashes, YOU FLASHED AWAY TO ASHES
 			return null
 
-/obj/item/organ/external/chest/droplimb()
-	if(cannot_amputate || !owner || !hasorgans(src))
+/obj/item/organ/external/chest/proc/droplimb()
+	if(!owner || !hasorgans(src))
 		return
 
 	var/mob/living/carbon/C = owner
 
-	var/organ_spilled = 0
+	var/organ_spilled = FALSE
 	var/turf/T = get_turf(C)
 	C.add_splatter_floor(T)
 	playsound(get_turf(C), 'sound/effects/splat.ogg', 25, 1)
 	for(var/X in C.internal_organs)
 		var/obj/item/organ/O = X
-		var/org_zone = check_zone(O.parent_organ)
-		if(org_zone == "chest" || org_zone == "groin")
-			O.remove(C)
-			O.forceMove(T)
-			organ_spilled = 1
+		O.remove(C)
+		O.forceMove(T)
+		organ_spilled = TRUE
 
 	if(organ_spilled)
 		C.visible_message("<span class='danger'><B>[C]'s internal organs spill out onto the floor!</B></span>")
-	return 1
+	return TRUE
 
+/obj/item/organ/external/groin/proc/droplimb()
+	if(!owner || !hasorgans(src))
+		return
+
+	var/mob/living/carbon/C = owner
+
+	var/organ_spilled = FALSE
+	var/turf/T = get_turf(C)
+	C.add_splatter_floor(T)
+	playsound(get_turf(C), 'sound/effects/splat.ogg', 25, 1)
+	for(var/X in C.internal_organs)
+		var/obj/item/organ/O = X
+		O.remove(C)
+		O.forceMove(T)
+		organ_spilled = TRUE
+
+	if(organ_spilled)
+		C.visible_message("<span class='danger'><B>[C]'s internal organs spill out onto the floor!</B></span>")
+	return TRUE
 
 /obj/item/organ/external/attackby(obj/item/I, mob/user, params)
 	if(I.sharp)
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index 6ff1a7b4d4b..258ff9ebaff 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -13,7 +13,6 @@
 	vital = 1
 	amputation_point = "spine"
 	gendered_icon = 1
-	//cannot_amputate = 1
 	parent_organ = null
 	encased = "ribcage"
 	var/fat = FALSE