Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm

code/modules/organs/organ_external.dm

@@ -268,7 +268,7 @@
 	owner.updatehealth() //droplimb will call updatehealth() again if it does end up being called
 
 	//If limb took enough damage, try to cut or tear it off
-	if(owner && loc == owner)
+	if(owner && loc == owner && !is_stump())
 		if(!cannot_amputate && config.limbs_can_break && (brute_dam + burn_dam) >= (max_damage * config.organ_health_multiplier))
 			//organs can come off in three cases
 			//1. If the damage source is edge_eligible and the brute damage dealt exceeds the edge threshold, then the organ is cut off.

code/modules/organs/organ_stump.dm

@@ -25,4 +25,4 @@
 	qdel(src)
 
 /obj/item/organ/external/stump/is_usable()
-	return 0
+	return 0