diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/!terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/!terror_spiders.dm index 11e67058b9f..00935e88b8f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/!terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/!terror_spiders.dm @@ -1,3 +1,31 @@ + +#define SPINNING_WEB 1 +#define LAYING_EGGS 2 +#define MOVING_TO_TARGET 3 +#define SPINNING_COCOON 4 + +#define TS_DAMAGE_SIMPLE 0 +#define TS_DAMAGE_POISON 1 +#define TS_DAMAGE_BRUTE 2 + +#define TS_DESC_RED "Red - Assault" +#define TS_DESC_GRAY "Gray - Ambush" +#define TS_DESC_GREEN "Green - Nurse" +#define TS_DESC_WHITE "White - Infect" +#define TS_DESC_BLACK "Black - Poison" +#define TS_DESC_PURPLE "Purple - Guard" +#define TS_DESC_BROWN "Brown - Breacher" +#define TS_DESC_PRINCE "Prince - HERO" +#define TS_DESC_PRINCESS "Princess - HORDE" +#define TS_DESC_MOTHER "Mother - SUPPORT" +#define TS_DESC_QUEEN "Queen - LEADER" + +#define TS_TIER_1 1 +#define TS_TIER_2 2 +#define TS_TIER_3 3 +#define TS_TIER_4 4 +#define TS_TIER_5 5 + GLOBAL_LIST_EMPTY(ts_ckey_blacklist) GLOBAL_VAR_INIT(ts_count_dead, 0) GLOBAL_VAR_INIT(ts_count_alive_station, 0) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/__defines.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/__defines.dm deleted file mode 100644 index 3dff4e6a75c..00000000000 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/__defines.dm +++ /dev/null @@ -1,27 +0,0 @@ - -#define SPINNING_WEB 1 -#define LAYING_EGGS 2 -#define MOVING_TO_TARGET 3 -#define SPINNING_COCOON 4 - -#define TS_DAMAGE_SIMPLE 0 -#define TS_DAMAGE_POISON 1 -#define TS_DAMAGE_BRUTE 2 - -#define TS_DESC_RED "Red - Assault" -#define TS_DESC_GRAY "Gray - Ambush" -#define TS_DESC_GREEN "Green - Nurse" -#define TS_DESC_WHITE "White - Infect" -#define TS_DESC_BLACK "Black - Poison" -#define TS_DESC_PURPLE "Purple - Guard" -#define TS_DESC_BROWN "Brown - Breacher" -#define TS_DESC_PRINCE "Prince - HERO" -#define TS_DESC_PRINCESS "Princess - HORDE" -#define TS_DESC_MOTHER "Mother - SUPPORT" -#define TS_DESC_QUEEN "Queen - LEADER" - -#define TS_TIER_1 1 -#define TS_TIER_2 2 -#define TS_TIER_3 3 -#define TS_TIER_4 4 -#define TS_TIER_5 5 diff --git a/paradise.dme b/paradise.dme index cd46d6b7726..7b08e08e9d5 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2329,7 +2329,6 @@ #include "code\modules\mob\living\simple_animal\hostile\retaliate\fish.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\kangaroo.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\undead.dm" -#include "code\modules\mob\living\simple_animal\hostile\terror_spiders\__defines.dm" #include "code\modules\mob\living\simple_animal\hostile\terror_spiders\!terror_spiders.dm" #include "code\modules\mob\living\simple_animal\hostile\terror_spiders\actions.dm" #include "code\modules\mob\living\simple_animal\hostile\terror_spiders\black.dm"