mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-07-16 17:42:32 +01:00
Partial fix for pAI emotes (they still can't hear beyond one container
level, will require a say/emote code hack)
This commit is contained in:
@@ -36,11 +36,15 @@
|
||||
M.show_message(message)
|
||||
|
||||
|
||||
// Type 1 (Visual) emotes are sent to anyone in view of the item
|
||||
if (m_type & 1)
|
||||
for (var/mob/O in viewers(src, null))
|
||||
O.show_message(message, m_type)
|
||||
|
||||
// Type 2 (Audible) emotes are sent to anyone in hear range
|
||||
// of the *LOCATION* -- this is important for pAIs to be heard
|
||||
else if (m_type & 2)
|
||||
for (var/mob/O in hearers(src.loc, null))
|
||||
for (var/mob/O in hearers(get_turf(src), null))
|
||||
O.show_message(message, m_type)
|
||||
|
||||
/mob/proc/emote_dead(var/message)
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
icon_state = "shadow"
|
||||
|
||||
robot_talk_understand = 0
|
||||
emote_type = 2 // pAIs emotes are heard, not seen, so they can be seen through a container (eg. person)
|
||||
|
||||
var/network = "SS13"
|
||||
var/obj/machinery/camera/current = null
|
||||
@@ -268,4 +269,4 @@
|
||||
pai.key = src.key
|
||||
card.setPersonality(pai)
|
||||
|
||||
*/
|
||||
*/
|
||||
|
||||
@@ -89,6 +89,7 @@
|
||||
var/list/languages = list() // For speaking/listening.
|
||||
var/list/abilities = list() // For species-derived or admin-given powers.
|
||||
var/list/speak_emote = list("says") // Verbs used when speaking. Defaults to 'say' if speak_emote is null.
|
||||
var/emote_type = 1 // Define emote default type, 1 for seen emotes, 2 for heard emotes
|
||||
|
||||
var/name_archive //For admin things like possession
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
|
||||
|
||||
if(use_me)
|
||||
usr.emote("me",1,message)
|
||||
usr.emote("me",usr.emote_type,message)
|
||||
else
|
||||
usr.emote(message)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user