Fixed implanter problems, added some more silly emotes.

This commit is contained in:
SkyMarshal
2012-01-01 19:57:57 -07:00
parent d2bae46c39
commit d64e8284f6
3 changed files with 32 additions and 18 deletions
@@ -25,27 +25,28 @@
return
if (user && src.imp)
for (var/mob/O in viewers(M, null))
if (target != user)
O.show_message(text("\red <B>[] is trying to implant [] with [src.name]!</B>", user, target), 1)
if (M != user)
O.show_message(text("\red <B>[] is trying to implant [] with [src.name]!</B>", user, M), 1)
else
O.show_message("\red <B>[user] is trying to inject themselves with [src.name]!</B>", 1)
if(!do_mob(user, target,60)) return
var/picked = 0
var/mob/living/carbon/T = target
var/list/datum/organ/external/E = T.GetOrgans()
while(picked == 0 && E.len > 0)
var/datum/organ/external/O = pick(E)
E -= O
if(!E.implant)
O.implant = src.imp
picked = 1
if(picked == 0)
for (var/mob/O in viewers(M, null))
O.show_message(text("[user.name] can't find anywhere to implant [target.name]"), 1)
return
if(!do_mob(user, M,60)) return
if(istype(M, /mob/living/carbon/human))
var/picked = 0
var/mob/living/carbon/human/T = M
var/list/datum/organ/external/E = T.organs
while(picked == 0 && E.len > 0)
var/datum/organ/external/O = pick(E)
E -= O
if(!E.implant)
O.implant = src.imp
picked = 1
if(picked == 0)
for (var/mob/O in viewers(M, null))
O.show_message(text("[user.name] can't find anywhere to implant [M.name]"), 1)
return
for (var/mob/O in viewers(M, null))
if (target != user)
O.show_message(text("\red [] implants [] with [src.name]!", user, target), 1)
if (M != user)
O.show_message(text("\red [] implants [] with [src.name]!", user, M), 1)
else
O.show_message("\red [user] implants themself with [src.name]!", 1)
M.attack_log += text("\[[time_stamp()]\] <font color='orange'> Implanted with [src.name] ([src.imp.name]) by [user.name] ([user.ckey])</font>")