From fc8a5b87890b53c1ef8ae0b03a603a4204d78455 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 27 May 2015 19:02:16 -0400 Subject: [PATCH] Fixed invisible nymphs and monkey recyclers --- code/game/machinery/kitchen/monkeyrecycler.dm | 26 ++++++++++--------- .../mob/living/carbon/primitive/dionaold.dm | 1 + 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index 699f52ca5c0..1ab4b504beb 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -18,19 +18,21 @@ if (istype(O, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O var/grabbed = G.affecting - if(istype(grabbed, /mob/living/carbon/human/monkey)) - var/mob/living/carbon/human/monkey/target = grabbed - if(target.stat == 0) - user << "\red The monkey is struggling far too much to put it in the recycler." + if(istype(grabbed, /mob/living/carbon/human)) + var/mob/living/carbon/human/target = grabbed + if(target.species.name in list("Monkey", "Farwa", "Stok", "Neara")) + if(target.stat == 0) + user << "\red The monkey is struggling far too much to put it in the recycler." + else + user.drop_item() + del(target) + user << "\blue You stuff the monkey in the machine." + playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) + use_power(500) + src.grinded++ + user << "\blue The machine now has [grinded] monkeys worth of material stored." else - user.drop_item() - del(target) - user << "\blue You stuff the monkey in the machine." - playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1) - use_power(500) - src.grinded++ - user << "\blue The machine now has [grinded] monkeys worth of material stored." - + user << "\red The machine only accepts monkeys!" else user << "\red The machine only accepts monkeys!" return diff --git a/code/modules/mob/living/carbon/primitive/dionaold.dm b/code/modules/mob/living/carbon/primitive/dionaold.dm index 9024e4e49a4..4bd28529e47 100644 --- a/code/modules/mob/living/carbon/primitive/dionaold.dm +++ b/code/modules/mob/living/carbon/primitive/dionaold.dm @@ -7,6 +7,7 @@ name = "diona nymph" voice_name = "diona nymph" speak_emote = list("chirrups") + icon = 'icons/mob/monkey.dmi' icon_state = "nymph1" var/list/donors = list() var/ready_evolve = 0