Merge branch 'master' into stationgoals

This commit is contained in:
Mark van Alphen
2017-02-07 18:51:08 +01:00
committed by GitHub
66 changed files with 826 additions and 396 deletions
+1
View File
@@ -25,6 +25,7 @@
#define PLANT_TOXIN_HUD "20"// Toxin level
#define PLANT_PEST_HUD "21"// Pest level
#define PLANT_WEED_HUD "22"// Weed level
#define DIAG_TRACK_HUD "23"// Mech tracking beacon
//data HUD (medhud, sechud) defines
//Don't forget to update human/New() if you change these!