mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Voice trigger fix.
This commit is contained in:
@@ -49,6 +49,8 @@
|
|||||||
interact(mob/user as mob) //Called when attack_self is called
|
interact(mob/user as mob) //Called when attack_self is called
|
||||||
return
|
return
|
||||||
|
|
||||||
|
proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
|
||||||
|
return "The trigger assembly looks broken!"
|
||||||
|
|
||||||
process_cooldown()
|
process_cooldown()
|
||||||
cooldown--
|
cooldown--
|
||||||
@@ -71,6 +73,10 @@
|
|||||||
holder.process_activation(src, 1, 0)
|
holder.process_activation(src, 1, 0)
|
||||||
if(holder && (wires & WIRE_PULSE_SPECIAL))
|
if(holder && (wires & WIRE_PULSE_SPECIAL))
|
||||||
holder.process_activation(src, 0, 1)
|
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))
|
// if(radio && (wires & WIRE_RADIO_PULSE))
|
||||||
//Not sure what goes here quite yet send signal?
|
//Not sure what goes here quite yet send signal?
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -124,6 +124,12 @@
|
|||||||
S.on_found(finder)
|
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()
|
Move()
|
||||||
..()
|
..()
|
||||||
if(a_left && a_right)
|
if(a_left && a_right)
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
var/listening = 0
|
var/listening = 0
|
||||||
var/recorded //the activation message
|
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)
|
if(listening)
|
||||||
recorded = msg
|
recorded = msg
|
||||||
listening = 0
|
listening = 0
|
||||||
@@ -17,6 +19,8 @@
|
|||||||
else
|
else
|
||||||
if(findtext(msg, recorded))
|
if(findtext(msg, recorded))
|
||||||
pulse(0)
|
pulse(0)
|
||||||
|
var/turf/T = get_turf(src) //otherwise it won't work in hand
|
||||||
|
T.visible_message("\icon[src] \red beeps!")
|
||||||
|
|
||||||
activate()
|
activate()
|
||||||
if(secured)
|
if(secured)
|
||||||
|
|||||||
Reference in New Issue
Block a user