Merge pull request #153 from zeskorion/master

[PORT]here you go, bee viro
This commit is contained in:
Dahlular
2020-01-28 12:41:59 -07:00
committed by GitHub
26 changed files with 951 additions and 205 deletions
+2 -1
View File
@@ -160,6 +160,7 @@
// common trait sources
#define TRAIT_GENERIC "generic"
#define EYE_DAMAGE "eye_damage"
#define DISEASE_TRAIT "disease"
#define GENETIC_MUTATION "genetic"
#define OBESITY "obesity"
#define MAGIC_TRAIT "magic"
@@ -205,4 +206,4 @@
#define FLIGHTSUIT_TRAIT "flightsuit"
#define LOCKED_HELMET_TRAIT "locked-helmet"
#define NINJA_SUIT_TRAIT "ninja-suit"
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"
#define ANTI_DROP_IMPLANT_TRAIT "anti-drop-implant"