Merge branch 'master' into synctesting

code/datums/components/swarming.dm

@@ -22,7 +22,7 @@
 
 /datum/component/swarming/proc/leave_swarm(atom/movable/AM)
 	GET_COMPONENT_FROM(other_swarm, /datum/component/swarming, AM)
-	if(!other_swarm || !other_swarm in swarm_members)
+	if(!other_swarm || !(other_swarm in swarm_members))
 		return
 	swarm_members -= other_swarm
 	if(!swarm_members.len)

code/datums/traits/_trait.dm

@@ -56,6 +56,7 @@
 
 /datum/trait/process()
 	if(QDELETED(trait_holder))
+		trait_holder = null
 		qdel(src)
 		return
 	if(trait_holder.stat == DEAD)

code/datums/traits/negative.dm

@@ -61,7 +61,7 @@
 	var/list/family_name = splittext(trait_holder.real_name, " ")
 	heirloom.name = "\improper [family_name[family_name.len]] family [heirloom.name]"
 
-/datum/trait/family_heirloom/process()
+/datum/trait/family_heirloom/on_process()
 	if(heirloom in trait_holder.GetAllContents())
 		trait_holder.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "family_heirloom_missing")
 		trait_holder.SendSignal(COMSIG_ADD_MOOD_EVENT, "family_heirloom", /datum/mood_event/family_heirloom)