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

code/modules/client/preferences.dm

@@ -2154,6 +2154,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						toggles ^= MEMBER_PUBLIC
 				if("gender")
 					var/chosengender = input(user, "Select your character's gender.", "Gender Selection", gender) as null|anything in list(MALE,FEMALE,"nonbinary","object")
+					if(!chosengender)
+						return
 					switch(chosengender)
 						if("nonbinary")
 							chosengender = PLURAL

code/modules/client/preferences_savefile.dm

@@ -438,7 +438,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Citadel code
 	S["feature_genitals_use_skintone"]	>> features["genitals_use_skintone"]
-	S["feature_exhibitionist"]			>> features["exhibitionist"]
 	S["feature_mcolor2"]				>> features["mcolor2"]
 	S["feature_mcolor3"]				>> features["mcolor3"]
 	S["feature_mam_body_markings"]		>> features["mam_body_markings"]

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

code/modules/projectiles/guns/energy.dm

@@ -65,10 +65,10 @@
 	update_icon()
 
 /obj/item/gun/energy/Destroy()
-	if(flags_1 & INITIALIZED_1)
-		QDEL_NULL(cell)
-		QDEL_LIST(ammo_type)
-		STOP_PROCESSING(SSobj, src)
+	//no need to delete them, since contents are already deleted in atom/movable/Destroy().
+	cell = null
+	ammo_type = null
+	STOP_PROCESSING(SSobj, src)
 	return ..()
 
 /obj/item/gun/energy/examine(mob/user)