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/mining/abandonedcrates.dm

@@ -16,6 +16,7 @@
 
 	for(var/i in 1 to codelen)
 		code += pick(digits)
+		digits -= code[code.len]
 
 	generate_loot()
 
@@ -166,7 +167,7 @@
 			user << "<span class='danger'>The crate's anti-tamper system activates!</span>"
 			var/turf/T = get_turf(src.loc)
 			explosion(T, 0, 0, 1, 2)
-			del(src)
+			qdel(src)
 	
 /obj/structure/closet/crate/secure/loot/emag_act(var/remaining_charges, var/mob/user)	
 	if (locked)

code/modules/mob/living/bot/secbot.dm

@@ -183,6 +183,7 @@
 			if(!Adjacent(target))
 				awaiting_surrender = 5 // I'm done playing nice
 				mode = SECBOT_HUNT
+				return
 			var/threat = check_threat(target)
 			if(threat < 4)
 				target = null

code/modules/mob/living/carbon/resist.dm

@@ -2,7 +2,7 @@
 /mob/living/carbon/process_resist()
 
 	//drop && roll
-	if(on_fire)
+	if(on_fire && !buckled)
 		fire_stacks -= 1.2
 		Weaken(3)
 		spin(32,2)

code/modules/mob/living/living.dm

@@ -573,21 +573,12 @@ default behaviour is:
 	set name = "Resist"
 	set category = "IC"
 
-	if(can_resist())
+	if(!(stat || next_move > world.time))
 		next_move = world.time + 20
 		resist_grab()
-		if(!weakened && !restrained())
+		if(!weakened)
 			process_resist()
 
-/mob/living/proc/can_resist()
-	//need to allow !canmove, or otherwise neck grabs can't be resisted
-	//similar thing with weakened and pinning
-	if(stat)
-		return 0
-	if(next_move > world.time)
-		return 0
-	return 1
-
 /mob/living/proc/process_resist()
 	//Getting out of someone's inventory.
 	if(istype(src.loc, /obj/item/weapon/holder))

code/modules/mob/living/simple_animal/borer/borer_captive.dm

@@ -34,9 +34,6 @@
 /mob/living/captive_brain/emote(var/message)
 	return
 
-/mob/living/captive_brain/can_resist()
-	return !(stat || next_move > world.time)
-
 /mob/living/captive_brain/process_resist()
 	//Resisting control by an alien mind.
 	if(istype(src.loc,/mob/living/simple_animal/borer))

code/modules/mob/mob_helpers.dm

@@ -626,6 +626,12 @@ proc/is_blind(A)
 
 	return 0
 
+/mob/living/carbon/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
+	if(handcuffed)
+		return SAFE_PERP
+
+	return ..()
+
 /mob/living/carbon/human/assess_perp(var/obj/access_obj, var/check_access, var/auth_weapons, var/check_records, var/check_arrest)
 	var/threatcount = ..()
 	if(. == SAFE_PERP)

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

code/modules/power/apc.dm

@@ -1146,7 +1146,7 @@ obj/machinery/power/apc/proc/autoset(var/val, var/on)
 
 	switch(severity)
 		if(1.0)
-			//set_broken() //now Del() do what we need
+			//set_broken() //now qdel() do what we need
 			if (cell)
 				cell.ex_act(1.0) // more lags woohoo
 			qdel(src)