Made changes based on feedback.
This commit is contained in:
Aurorablade
2015-07-29 16:42:51 -04:00
parent 5b0f43ade1
commit d962bf6b7d
4 changed files with 12 additions and 16 deletions
+7 -5
View File
@@ -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 << "<span class='notice'>You should probably wait until you reach the station.</span>"
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 << "<B>Objective #[1]</B>: [KillDaWiz.explanation_text]"
S << "<B>Objective #[2]</B>: [objective.explanation_text]"
S << "<B>Objective #[2]</B>: [KillDaCrew.explanation_text]"
-5
View File
@@ -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))
+2 -1
View File
@@ -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
@@ -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-<span class = 'danger'> CONSUME THEM! </span>"
user.bloodcrawl = 2
user.bloodcrawl = BLOODCRAWL_EAT
qdel(src)