Merge pull request #800 from ZomgPonies/shadow

Mutantrace update
This commit is contained in:
Fox-McCloud
2015-04-21 18:36:24 -04:00
32 changed files with 235 additions and 476 deletions
+4 -3
View File
@@ -359,16 +359,17 @@ datum
if(!M) M = holder.my_atom
if(ishuman(M))
var/mob/living/carbon/human/human = M
if(human.dna.mutantrace == null)
if(human.species.name != "Shadow")
M << "\red Your flesh rapidly mutates!"
M << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
M << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
M << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
human.dna.mutantrace = "shadow"
human.update_mutantrace()
human.set_species("Shadow")
..()
return
aslimetoxin
name = "Advanced Mutation Toxin"
id = "amutationtoxin"
+1 -1
View File
@@ -604,7 +604,7 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu
if(ismonkey(M))
var/mob/living/carbon/monkey/MO = M
if(MO.dna)
if(MO.dna.mutantrace == "plant") //plantmen monkeys (diona) take EVEN MORE damage
if(istype(MO,/mob/living/carbon/monkey/diona)) //plantmen monkeys (diona) take EVEN MORE damage
MO.adjustToxLoss(100)
..()
return