diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index 404b00eee76..4b161502238 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -81,7 +81,7 @@
/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob)
//var/list/demon_candidates = get_candidates(BE_ALIEN)
- if(user.z != ZLEVEL_STATION)//this is to make sure the wizard does NOT summon a demon from the Den..
+ if(user.z != ZLEVEL_CENTCOMM)//this is to make sure the wizard does NOT summon a demon from the Den..
user << "You should probably wait until you reach the station."
return
if(!checking)
@@ -142,9 +142,11 @@
KillDaWiz.target = user.mind
KillDaWiz.explanation_text = "Kill [user.real_name], the one who was foolish enough to summon you."
S.mind.objectives += KillDaWiz
- var/datum/objective/slaughter/objective = new
- objective.owner = S.mind
+ var/datum/objective/KillDaCrew = new /datum/objective
+ KillDaCrew.owner = S.mind
+ KillDaCrew.explanation_text = "Kill everyone else while you're at it."
+ S.mind.objectives += KillDaCrew
//Paradise port:i changed ther verbage..might want to do so on the above kill objective. Maybe save the wizard for last...
- S.mind.objectives += objective
+ S.mind.objectives += KillDaCrew
S << "Objective #[1]: [KillDaWiz.explanation_text]"
- S << "Objective #[2]: [objective.explanation_text]"
\ No newline at end of file
+ S << "Objective #[2]: [KillDaCrew.explanation_text]"
\ No newline at end of file
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index f2abb066afe..dba0d0e3486 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -267,8 +267,6 @@
user << "\blue The walls suddenly disappear."
return 1
-/datum/spellbook_entry/item/bloodbottle/CanBuy(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book)
- return ..() && !limit
/datum/spellbook_entry/item/soulstones
name = "Six Soul Stone Shards and the spell Artificer"
@@ -397,9 +395,6 @@
uses++
- for(var/datum/spellbook_entry/item/contract/CT in entries)
- if(!isnull(CT.limit))
- CT.limit++
qdel(O)
if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon))
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index 65b869e8c44..eaaa2ab23e7 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -1,5 +1,6 @@
//Travel through pools of blood. Slaughter Demon powers for everyone!
-
+#define BLOODCRAWL 1
+#define BLOODCRAWL_EAT 2
/mob/living/proc/phaseout(var/obj/effect/decal/cleanable/B)
var/mob/living/kidnapped = null
diff --git a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
index d95d0255ef4..85a4d2a10e0 100644
--- a/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
+++ b/code/modules/mob/living/simple_animal/slaughter/slaughter.dm
@@ -1,6 +1,4 @@
//////////////////The Monster
-#define BLOODCRAWL 1
-#define BLOODCRAWL_EAT 2
/mob/living/simple_animal/slaughter
name = "Slaughter Demon"
@@ -39,7 +37,7 @@
melee_damage_upper = 30
see_in_dark = 8
see_invisible = SEE_INVISIBLE_MINIMUM
- bloodcrawl = 2
+ bloodcrawl = BLOODCRAWL_EAT
var/devoured = 0
@@ -196,11 +194,11 @@
visible_message("[user] feasts upon the [src].")
if(user.bloodcrawl == 0)
user << "You absorb some of the demon's power!"
- user.bloodcrawl = 1
+ user.bloodcrawl = BLOODCRAWL
else if(user.bloodcrawl == 1)
user << "You absorb some of the demon's power!"
user << "You feel diffr- CONSUME THEM! "
- user.bloodcrawl = 2
+ user.bloodcrawl = BLOODCRAWL_EAT
qdel(src)