additions, and it now nulls out.

code/controllers/subsystem/processing/quirks.dm

@@ -62,6 +62,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 		for(var/i in blacklisted)
 			quirks -= i
 			cut += i
+
+	/*	//Code to automatically reduce positive quirks until balance is even.
 	var/points_used = total_points(quirks)
 	if(points_used > 0)
 		//they owe us points, let's collect.
@@ -73,6 +75,15 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 				points_used -= points
 			if(points_used <= 0)
 				break
+	*/
+
+	//Nah, let's null all non-neutrals out.
+	if(cut.len)
+		for(var/i in quirks)
+			if(quirk_points_by_name(i) != 0)
+				cut += i
+				quirks -= i
+
 	return cut
 
 /datum/controller/subsystem/processing/quirks/proc/GenerateQuirks(client/user)

code/controllers/subsystem/ticker.dm

@@ -374,7 +374,7 @@ SUBSYSTEM_DEF(ticker)
 			if(player.mind.assigned_role != player.mind.special_role)
 				SSjob.EquipRank(N, player.mind.assigned_role, 0)
 			if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
-				SSquirks.AssignQuirks(N.new_character, N.client, TRUE)
+				SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE)
 		CHECK_TICK
 	if(captainless)
 		for(var/mob/dead/new_player/N in GLOB.player_list)