From ef54d2f8b6fdc62f9f0d629046ca4aa4916e9818 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 7 Aug 2013 10:44:16 -0700 Subject: [PATCH] Monkeyize() now uses species primitive var. --- code/modules/mob/transform_procs.dm | 105 +++++----------------------- 1 file changed, 16 insertions(+), 89 deletions(-) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 7976e9c27af..a8ebe1ff4c7 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -23,100 +23,27 @@ var/mob/living/carbon/monkey/O = null - switch(dna.mutantrace) - if("tajara") - O = new /mob/living/carbon/monkey/tajara( loc ) - O.name = "farwa" - O.dna = dna - dna = null - O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00" - //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" - O.loc = loc - O.viruses = viruses - viruses = list() - for(var/datum/disease/D in O.viruses) - D.affected_mob = O + O = new species.primitive(loc) - if (client) - client.mob = O - if(mind) - mind.transfer_to(O) - O << "You are now a farwa. " - O.a_intent = "hurt" - spawn(0)//To prevent the proc from returning null. - del(src) - del(animation) - if("lizard") - O = new /mob/living/carbon/monkey/unathi( loc ) - O.name = "stok" - O.dna = dna - dna = null - O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D" - //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" - O.loc = loc - O.viruses = viruses - viruses = list() - for(var/datum/disease/D in O.viruses) - D.affected_mob = O + O.dna = dna + O.dna.uni_identity = "000000000000000000DC00000660004DA0A0E00" + O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" + O.viruses = viruses + O.a_intent = "hurt" - if (client) - client.mob = O - if(mind) - mind.transfer_to(O) - O << "You are now a stok. " - O.a_intent = "hurt" - spawn(0)//To prevent the proc from returning null. - del(src) - del(animation) - if("skrell") - O = new /mob/living/carbon/monkey/unathi( loc ) - O.name = "neaera" - O.dna = dna - dna = null - O.dna.uni_identity = "000000000000000000DC00000660002A8044C5D" - //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" - O.loc = loc - O.viruses = viruses - viruses = list() - for(var/datum/disease/D in O.viruses) - D.affected_mob = O + for(var/datum/disease/D in O.viruses) + D.affected_mob = O - if (client) - client.mob = O - if(mind) - mind.transfer_to(O) - O << "You are now a neaera. " - O.a_intent = "hurt" - spawn(0)//To prevent the proc from returning null. - del(src) - del(animation) - else - O = new /mob/living/carbon/monkey( loc ) - O.name = "monkey" - O.dna = dna - dna = null - O.dna.uni_identity = "00600200A00E0110148FC01300B009" - //O.dna.struc_enzymes = "0983E840344C39F4B059D5145FC5785DC6406A4BB8" - O.dna.struc_enzymes = "[copytext(O.dna.struc_enzymes,1,1+3*(STRUCDNASIZE-1))]BB8" - O.loc = loc - O.viruses = viruses - viruses = list() - for(var/datum/disease/D in O.viruses) - D.affected_mob = O + if (client) + client.mob = O + if(mind) + mind.transfer_to(O) - if (client) - client.mob = O - if(mind) - mind.transfer_to(O) - O << "You are now a monkey." - O.a_intent = "hurt" - spawn(0)//To prevent the proc from returning null. - del(src) - del(animation) + O << "You are now [O]. " + spawn(0)//To prevent the proc from returning null. + del(src) + del(animation) return O