Merge pull request #5840 from Poojawa/reverts-crybaby-inducer

Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
parent ad0be11cbc dcb6eedb50
commit 78db80026d
99 changed files with 2091 additions and 1585 deletions
@@ -379,9 +379,8 @@
 					if(SSshuttle.emergency.timeLeft(1) > initial(SSshuttle.emergencyCallTime)*0.5)
 						SSticker.mode.make_antag_chance(humanc)

-	for(var/V in character.roundstart_traits)
-		var/datum/trait/T = V
-		T.on_spawn() //so latejoins still get their correct traits
+	if(CONFIG_GET(flag/roundstart_traits))
+		SStraits.AssignTraits(humanc, humanc.client, TRUE)

 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)