Merge branch 'master' into eye-sprites

This commit is contained in:
Timothy Teakettle
2020-10-04 01:23:03 +01:00
committed by GitHub
20 changed files with 161 additions and 93 deletions
+4 -1
View File
@@ -110,4 +110,7 @@
#define DEFAULT_EYES_TYPE "normal"
#define DEFAULT_LEFT_EYE_STATE "normal_left_eye"
#define DEFAULT_RIGHT_EYE_STATE "normal_right_eye"
#define DEFAULT_NO_EYE_STATE "no_eye"
#define DEFAULT_NO_EYE_STATE "no_eye"
//special species definitions
#define MINIMUM_MUTANT_COLOR "#202020" //this is how dark players mutant parts and skin can be