Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

This commit is contained in:
Poojawa
2019-08-17 23:41:28 -05:00
35 changed files with 210 additions and 90 deletions
@@ -419,7 +419,7 @@
SSticker.mode.make_antag_chance(humanc)
if(humanc && CONFIG_GET(flag/roundstart_traits))
SSquirks.AssignQuirks(humanc, humanc.client, TRUE)
SSquirks.AssignQuirks(humanc, humanc.client, TRUE, FALSE, job, FALSE)
log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)