Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into donotreviveme

code/modules/mob/living/brain/brain_item.dm

@@ -88,7 +88,7 @@
 			brainmob.stored_dna = new /datum/dna/stored(brainmob)
 		C.dna.copy_dna(brainmob.stored_dna)
 		if(HAS_TRAIT(L, TRAIT_NOCLONE))
-			brainmob.status_traits[TRAIT_NOCLONE] = L.status_traits[TRAIT_NOCLONE]
+			LAZYSET(brainmob.status_traits, TRAIT_NOCLONE, L.status_traits[TRAIT_NOCLONE])
 		var/obj/item/organ/zombie_infection/ZI = L.getorganslot(ORGAN_SLOT_ZOMBIE)
 		if(ZI)
 			brainmob.set_species(ZI.old_species)	//For if the brain is cloned

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

@@ -283,6 +283,8 @@
 
 /mob/living/carbon/resist_buckle()
 	. = FALSE
+	if(!buckled)
+		return
 	if(restrained())
 		// too soon.
 		if(last_special > world.time)

code/modules/mob/living/living.dm

@@ -715,7 +715,7 @@
 		return TRUE
 
 /mob/living/proc/resist_buckle()
-	buckled.user_unbuckle_mob(src,src)
+	buckled?.user_unbuckle_mob(src,src)
 
 /mob/living/proc/resist_fire()
 	return