Fixed invisible nymphs and monkey recyclers

This commit is contained in:
ZomgPonies
2015-05-27 19:02:16 -04:00
parent 8dc5dd1431
commit fc8a5b8789
2 changed files with 15 additions and 12 deletions
+14 -12
View File
@@ -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
@@ -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