anchor.diff:  						positive_traits += trait
   						all_traits += trait
   					else
  +<<<<<<< HEAD
   						if(all_traits.len >= MAX_TRAITS)
   							to_chat(user, "<span class='warning'>You can't have more than [MAX_TRAITS] traits!</span>")
   							return
   						negative_traits += trait
   						all_traits += trait
   				SetTraits(user)
  +=======
  +						negative_quirks += quirk
  +						all_quirks += quirk
  +				SetQuirks(user)
  +>>>>>>> e74f33d... Quirk limit now only applies to positive quirks
   			if("reset")
   				all_traits = list()
   				positive_traits = list()
  
positive.code: 			var/trait_name = initial(T.name)
  			var/has_trait
  			var/trait_cost = initial(T.value) * -1
  			var/lock_reason = "This trait is unavailable."
  			var/trait_conflict = FALSE
  			for(var/_V in all_traits)
  
negative.code: 		Traits are applied at roundstart and cannot normally be removed.</div>"
  		dat += "<center><a href='?_src_=prefs;preference=trait;task=close'>Done</a></center>"
  		dat += "<hr>"
  <<<<<<< HEAD
  		dat += "<center><b>Current traits:</b> [all_traits.len ? all_traits.Join(", ") : "None"]</center>"
  		dat += "<center>[all_traits.len] / [MAX_TRAITS] max traits<br>\
  		<b>Trait balance remaining:</b> [GetTraitBalance()]</center><br>"
  