Adds minor roundstart traits! (ala CDDA, etc.)

2018-03-02 14:38:18 -06:00
parent 3690cf3309
commit 0a449af83e
36 changed files with 825 additions and 52 deletions
@@ -488,6 +488,7 @@ MICE_ROUNDSTART 10
 ## Determines if players are allowed to print integrated circuits, uncomment to allow.
 #IC_PRINTING

+<<<<<<< HEAD
 ## CITADEL Races
 ROUNDSTART_RACES mammal
 ROUNDSTART_RACES avian
@@ -510,6 +511,10 @@ ALLOW_MISCREANTS

 ## Determines if players are allowed to print integrated circuits, uncomment to allow.
 #IC_PRINTING
+=======
+## Uncomment to allow roundstart trait selection in the character setup menu.
+ROUNDSTART_TRAITS
+>>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)

 ## Enable night shifts ##
 ENABLE_NIGHT_SHIFTS