diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm index 06f6172fc34..e3c79f2f62c 100644 --- a/code/game/machinery/podmen.dm +++ b/code/game/machinery/podmen.dm @@ -71,7 +71,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. * /obj/item/seeds/replicapod/harvest(mob/user = usr) parent = loc - var/found_player = 0 +// var/found_player = 0 user.visible_message("\blue [user] carefully begins to open the pod...","\blue You carefully begin to open the pod...") @@ -79,90 +79,54 @@ Growing it to term with nothing injected will grab a ghost from the observers. * if(source && source.stat == 2 && source.client && source.ckey && config.revival_pod_plants) transfer_personality(source.client) else // If no sample was injected or revival is not allowed, we grab an interested observer. - message_admins("Requesting player for nymph") - request_player() - - spawn(100) //If we don't have a ghost or the ghost is now unplayed, we just give the harvester some seeds. - if(!found_player) - parent.visible_message("The pod has formed badly, and all you can do is salvage some of the seeds.") - var/seed_count = 1 - - if(prob(yield * parent.yieldmod * 20)) - seed_count++ - - for(var/i=0,iYou awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark." + if(source && ckey && podman.ckey == ckey) + podman << "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake." + podman << "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders." + podman << "Too much darkness will send you into shock and starve you, but light will help you heal." + if(!realName) + var/newname = input(podman,"Enter a name, or leave blank for the default name.", "Name change","") as text + if (newname != "") + podman.real_name = newname - if(realName) - podman.real_name = realName else - podman.real_name = "diona nymph ([rand(100,999)])" - - podman.dna.real_name = podman.real_name - - // Update mode specific HUD icons. - switch(ticker.mode.name) - if ("revolution") - if (podman.mind in ticker.mode:revolutionaries) - ticker.mode:add_revolutionary(podman.mind) - ticker.mode:update_all_rev_icons() //So the icon actually appears - if (podman.mind in ticker.mode:head_revolutionaries) - ticker.mode:update_all_rev_icons() - if ("nuclear emergency") - if (podman.mind in ticker.mode:syndicates) - ticker.mode:update_all_synd_icons() - if ("cult") - if (podman.mind in ticker.mode:cult) - ticker.mode:add_cultist(podman.mind) - ticker.mode:update_all_cult_icons() //So the icon actually appears - // -- End mode specific stuff - - podman << "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark." - if(source && ckey && podman.ckey == ckey) - podman << "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake." - podman << "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders." - podman << "Too much darkness will send you into shock and starve you, but light will help you heal." - if(!realName) - var/newname = input(podman,"Enter a name, or leave blank for the default name.", "Name change","") as text - if (newname != "") - podman.real_name = newname + new /mob/living/carbon/monkey/diona(parent.loc) parent.visible_message("\blue The pod disgorges a fully-formed plant creature!") parent.update_tray() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index a12fbf6aeee..cd84488c14c 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -412,7 +412,8 @@ return 1 if(ispath(MP, /mob/living/carbon/alien)) return 1 - + if(ispath(MP, /mob/living/carbon/monkey/diona)) + return 1 //Not in here? Must be untested! return 0