Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639

[MIRROR] Refactors anti-magic into a component

code/__DEFINES/traits.dm

@@ -21,6 +21,8 @@
 #define TRAIT_SLEEPIMMUNE		"sleep_immunity"
 #define TRAIT_PUSHIMMUNE		"push_immunity"
 #define TRAIT_SHOCKIMMUNE		"shock_immunity"
+#define TRAIT_ANTIMAGIC			"anti_magic"
+#define TRAIT_HOLY				"holy"
 
 
 // common trait sources
@@ -29,9 +31,8 @@
 #define GENETIC_MUTATION "genetic"
 #define OBESITY "obesity"
 #define MAGIC_TRAIT "magic"
-#define STASIS_MUTE "stasis"
-#define GENETICS_SPELL "genetics_spell"
 #define TRAUMA_TRAIT "trauma"
+#define SPECIES_TRAIT "species"
 
 // unique trait sources, still defines
 #define STATUE_MUTE "statue"
@@ -40,3 +41,5 @@
 #define ABYSSAL_GAZE_BLIND "abyssal_gaze"
 #define HIGHLANDER "highlander"
 #define TRAIT_HULK "hulk"
+#define STASIS_MUTE "stasis"
+#define GENETICS_SPELL "genetics_spell"