From 7fc726c00a4b5409aa92d7c97e7e4c027eea7d49 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Fri, 18 Dec 2015 17:51:10 -0500 Subject: [PATCH] Changes bloodcrawl define location --- code/__DEFINES/misc.dm | 4 ++++ code/game/gamemodes/miniantags/slaughter/slaughter.dm | 2 +- code/modules/mob/living/bloodcrawl.dm | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index b56e973631e..6e49c476ac4 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -318,3 +318,7 @@ var/list/bloody_footprints_cache = list() #define GHOST_ORBIT_HEXAGON "hexagon" #define GHOST_ORBIT_SQUARE "square" #define GHOST_ORBIT_PENTAGON "pentagon" + +//Bloodcrawling +#define BLOODCRAWL 1 +#define BLOODCRAWL_EAT 2 diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index a729aa3b98b..bf12a5b8592 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -30,7 +30,7 @@ melee_damage_upper = 30 see_in_dark = 8 var/boost = 0 - bloodcrawl = 2 //For some reason, the define doesn't work here. + bloodcrawl = BLOODCRAWL_EAT see_invisible = SEE_INVISIBLE_MINIMUM var/list/consumed_mobs = list() var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index dcdee906810..50276ded97a 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -1,6 +1,3 @@ -#define BLOODCRAWL 1 -#define BLOODCRAWL_EAT 2 - /obj/effect/dummy/slaughter //Can't use the wizard one, blocked by jaunt/slow name = "water" icon = 'icons/effects/effects.dmi'