mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
[TESTMERGE CANDIDATE] [SEMI-MODULAR] AI and hologram QoL stuff + misc bugfixes (#19248)
* Standarized silicon examine stuff. * There we actually go * Fuck, finally. * Let's do something to amend the double-messages * fixing a dumb copypaste * How dumb of me * Amendments * oh well, this should take care of some runtimes * this too * Okay now it should compile * Oh well, might as well do this too * Dear got, subtler is full of spaghetti. Even before I touched it. It legitimately deserves a fucking rewrite. * one way to resolve a conflict * ordered tgstation.dme correctly now * fiiiixed
This commit is contained in:
@@ -260,6 +260,17 @@
|
||||
var/list/hearers = get_hearers_in_view(vision_distance, src) //caches the hearers and then removes ignored mobs.
|
||||
hearers -= ignored_mobs
|
||||
|
||||
//SKYRAT EDIT ADDITION BEGIN - AI QoL
|
||||
for(var/mob/camera/ai_eye/ai_eye in hearers)
|
||||
if(ai_eye.ai?.client && !(ai_eye.ai.stat == DEAD))
|
||||
hearers -= ai_eye
|
||||
hearers |= ai_eye.ai
|
||||
|
||||
for(var/obj/effect/overlay/holo_pad_hologram/holo in hearers)
|
||||
if(holo.Impersonation?.client)
|
||||
hearers |= holo.Impersonation
|
||||
//SKYRAT EDIT ADDITION END - AI QoL
|
||||
|
||||
if(self_message)
|
||||
hearers -= src
|
||||
|
||||
@@ -312,6 +323,18 @@
|
||||
*/
|
||||
/atom/proc/audible_message(message, deaf_message, hearing_distance = DEFAULT_MESSAGE_RANGE, self_message, audible_message_flags = NONE, separation = " ") // SKYRAT EDIT ADDITION - Better emotes
|
||||
var/list/hearers = get_hearers_in_view(hearing_distance, src)
|
||||
|
||||
//SKYRAT EDIT ADDITION BEGIN - AI QoL
|
||||
for(var/mob/camera/ai_eye/ai_eye in hearers)
|
||||
if(ai_eye.ai?.client && !(ai_eye.ai.stat == DEAD))
|
||||
hearers -= ai_eye
|
||||
hearers |= ai_eye.ai
|
||||
|
||||
for(var/obj/effect/overlay/holo_pad_hologram/holo in hearers)
|
||||
if(holo.Impersonation?.client)
|
||||
hearers |= holo.Impersonation
|
||||
//SKYRAT EDIT ADDITION END - AI QoL
|
||||
|
||||
if(self_message)
|
||||
hearers -= src
|
||||
var/raw_msg = message
|
||||
|
||||
Reference in New Issue
Block a user