Merge pull request #9418 from Ghommie/Ghommie-cit216

Porting a load of viro, (sentient) disease, symptoms code updates from tg.
This commit is contained in:
kevinz000
2020-11-03 01:51:18 -03:00
committed by Dip
parent c7bc366210
commit 752a3d9bcc
26 changed files with 357 additions and 146 deletions
+1
View File
@@ -35,6 +35,7 @@
#define LOG_GAME (1 << 12)
#define LOG_ADMIN_PRIVATE (1 << 13)
#define LOG_ASAY (1 << 14)
#define LOG_VIRUS (1 << 15)
//Individual logging panel pages
#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK)
+1
View File
@@ -184,6 +184,7 @@
#define OBESITY "obesity"
#define MAGIC_TRAIT "magic"
#define TRAUMA_TRAIT "trauma"
#define DISEASE_TRAIT "disease"
#define SPECIES_TRAIT "species"
#define ORGAN_TRAIT "organ"
#define JOB_TRAIT "job"