From fa2b6fa6b4ebb5d366de4354ab2620322e819e61 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 4 Jan 2014 13:23:59 +1030 Subject: [PATCH] Couple of oversights with diona. --- code/modules/mob/living/carbon/monkey/diona.dm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/diona.dm b/code/modules/mob/living/carbon/monkey/diona.dm index d7d8c92f03..08a8eb7c1a 100644 --- a/code/modules/mob/living/carbon/monkey/diona.dm +++ b/code/modules/mob/living/carbon/monkey/diona.dm @@ -10,6 +10,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "nymph" slot_flags = SLOT_HEAD + origin_tech = "magnets=3;biotech=5" /obj/item/weapon/diona_holder/New() ..() @@ -28,6 +29,10 @@ M.loc = get_turf(src) del(src) +/obj/item/weapon/diona_holder/attackby(obj/item/weapon/W as obj, mob/user as mob) + for(var/mob/M in src.contents) + M.attackby(W,user) + //Mob defines. /mob/living/carbon/monkey/diona name = "diona nymph" @@ -106,7 +111,7 @@ set desc = "Grow to a more complex form." if(!is_alien_whitelisted(src, "Diona") && config.usealienwhitelist) - src << alert("You are currently not whitelisted to play [client.prefs.species].") + src << alert("You are currently not whitelisted to play an adult Diona.") return 0 if(donors.len < 5) @@ -118,7 +123,7 @@ return src.visible_message("\red [src] begins to shift and quiver, and erupts in a shower of shed bark and twigs!","\red You begin to shift and quiver, then erupt in a shower of shed bark and twigs, attaining your adult form!") - var/mob/living/carbon/human/adult = new(loc) + var/mob/living/carbon/human/adult = new(get_turf(src.loc)) adult.set_species("Diona") for(var/datum/language/L in languages) adult.add_language(L.name)