Voice trigger fix.

This commit is contained in:
Rob Nelson
2013-11-23 13:57:02 -08:00
parent ae24574133
commit 53f5f02c5d
3 changed files with 17 additions and 1 deletions

View File

@@ -49,6 +49,8 @@
interact(mob/user as mob) //Called when attack_self is called
return
proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
return "The trigger assembly looks broken!"
process_cooldown()
cooldown--
@@ -71,6 +73,10 @@
holder.process_activation(src, 1, 0)
if(holder && (wires & WIRE_PULSE_SPECIAL))
holder.process_activation(src, 0, 1)
if(istype(loc,/obj/item/weapon/grenade)) // This is a hack. Todo: Manage this better -Sayu
var/obj/item/weapon/grenade/G = loc
G.prime() // Adios, muchachos
// if(radio && (wires & WIRE_RADIO_PULSE))
//Not sure what goes here quite yet send signal?
return 1

View File

@@ -124,6 +124,12 @@
S.on_found(finder)
hear_talk(mob/living/M as mob, msg)
if(a_left)
a_left.hear_talk(M, msg)
if(a_right)
a_right.hear_talk(M, msg)
Move()
..()
if(a_left && a_right)

View File

@@ -8,7 +8,9 @@
var/listening = 0
var/recorded //the activation message
hear_talk(mob/living/M as mob, msg)
hear_talk(mob/M as mob, msg)
if(!istype(M,/mob/living))
return
if(listening)
recorded = msg
listening = 0
@@ -17,6 +19,8 @@
else
if(findtext(msg, recorded))
pulse(0)
var/turf/T = get_turf(src) //otherwise it won't work in hand
T.visible_message("\icon[src] \red beeps!")
activate()
if(secured)