Cleans up goldcore defines

2017-11-26 17:51:54 -05:00
parent 4eb9e28fb4
commit 4a22fed89d
38 changed files with 122 additions and 60 deletions
@@ -478,3 +478,12 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE

 #define SYRINGE_DRAW 0
 #define SYRINGE_INJECT 1
+<<<<<<< HEAD
+=======
+#define RESEARCH_MATERIAL_RECLAMATION_ID "0"
+
+//gold slime core spawning
+#define NO_SPAWN 0
+#define HOSTILE_SPAWN 1
+#define FRIENDLY_SPAWN 2
+>>>>>>> 2abae67... Cleans up goldcore defines (#33090)