Merge remote-tracking branch 'upstream/master' into hit-reactions

This commit is contained in:
Fox-McCloud
2016-07-07 22:50:53 -04:00
899 changed files with 8338 additions and 8181 deletions
+5
View File
@@ -124,3 +124,8 @@
#define NUTRITION_LEVEL_HUNGRY 250
#define NUTRITION_LEVEL_STARVING 150
//Used for calculations for negative effects of having genetics powers
#define DEFAULT_GENE_STABILITY 100
#define GENE_INSTABILITY_MINOR 5
#define GENE_INSTABILITY_MODERATE 10
#define GENE_INSTABILITY_MAJOR 15
+1 -1
View File
@@ -2,4 +2,4 @@
#define TICK_LIMIT_TO_RUN 85
#define TICK_CHECK ( world.tick_usage > TICK_LIMIT_RUNNING ? stoplag() : 0 )
#define CHECK_TICK if (world.tick_usage > TICK_LIMIT_RUNNING) stoplag()
#define CHECK_TICK if(world.tick_usage > TICK_LIMIT_RUNNING) stoplag()