Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes

Adds see_emote(), other cool things.
This commit is contained in:
Mloc
2014-12-18 22:10:54 +00:00
7 changed files with 90 additions and 6 deletions

View File

@@ -9,6 +9,8 @@
var/flush = null
origin_tech = "programming=4;materials=4"
var/mob/living/silicon/ai/carded_ai
/obj/item/device/aicard/attack(mob/living/silicon/decoy/M as mob, mob/user as mob)
if (!istype (M, /mob/living/silicon/decoy))
return ..()
@@ -151,6 +153,8 @@
ai.control_disabled = 1
ai.aiRestorePowerRoutine = 0
ai.aiRadio.disabledAi = 1
carded_ai = ai
ai.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been carded with [src.name] by [user.name] ([user.ckey])</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to card [ai.name] ([ai.ckey])</font>")
@@ -166,7 +170,14 @@
/obj/item/device/aicard/proc/clear()
name = "inteliCard"
carded_ai = null
update_icon()
/obj/item/device/aicard/see_emote(mob/living/M, text)
if(carded_ai && carded_ai.client)
var/rendered = "<span class='message'>[text]</span>"
carded_ai.show_message(rendered, 2)
..()
/*
/obj/item/device/aicard/relaymove(var/mob/user, var/direction)
if(src.loc && istype(src.loc.loc, /obj/item/rig_module))

View File

@@ -304,10 +304,15 @@
/obj/item/device/paicard/emp_act(severity)
for(var/mob/M in src)
M.emp_act(severity)
..()
/obj/item/device/paicard/ex_act(severity)
if(pai)
pai.ex_act(severity)
else
del(src)
/obj/item/device/paicard/see_emote(mob/living/M, text)
if(pai && pai.client)
var/rendered = "<span class='message'>[text]</span>"
pai.show_message(rendered, 2)
..()

View File

@@ -135,4 +135,7 @@
var/rendered = "<span class='game say'><span class='name'>[M.name]: </span> <span class='message'>[text]</span></span>"
mo.show_message(rendered, 2)
*/
return
return
/obj/proc/see_emote(mob/M as mob, text, var/emote_type)
return