diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 188787f83b..219a7c5af6 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -19,10 +19,11 @@ throw_speed = 4 throw_range = 20 -/obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg) +/obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg, var/verb="says") if(recording) - var/ending = copytext(msg, length(msg)) + //var/ending = copytext(msg, length(msg)) timestamp+= timerecorded + /* if(M.stuttering) storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] stammers, \"[msg]\"" return @@ -35,7 +36,8 @@ else if(ending == "!") storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] exclaims, \"[msg]\"" return - storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] says, \"[msg]\"" + */ + storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] [verb], \"[msg]\"" return /obj/item/device/taperecorder/attackby(obj/item/weapon/W as obj, mob/user as mob) @@ -260,4 +262,4 @@ return else usr << "\red Stop what?" - return \ No newline at end of file + return diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 2166c67402..f8c46134c1 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -501,4 +501,4 @@ the implant may become unstable and either pre-maturely inject the subject or si /obj/item/weapon/implant/cortical name = "cortical stack" desc = "A fist-sized mass of biocircuits and chips." - icon_state = "implant_evil" \ No newline at end of file + icon_state = "implant_evil" diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 80f67c3347..3db07cbf80 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -88,6 +88,7 @@ var/list/department_radio_keys = list( var/list/listening = list() if(T) + var/list/objects = list() var/list/hear = hear(message_range, T) var/list/hearturfs = list() @@ -96,15 +97,13 @@ var/list/department_radio_keys = list( var/mob/M = I listening += M hearturfs += M.locs[1] - for(var/obj/item/device/radio/R in contents) - spawn(0) - R.hear_talk(src, message, verb, speaking) + for(var/obj/O in M.contents) + objects |= O else if(istype(I, /obj/)) var/obj/O = I hearturfs += O.locs[1] - if(istype(O, /obj/item/device/radio)) - spawn(0) - O.hear_talk(src, message, verb, speaking) + objects |= O + for(var/mob/M in player_list) if(M.stat == DEAD && client && (M.client.prefs.toggles & CHAT_GHOSTEARS)) listening |= M @@ -112,6 +111,9 @@ var/list/department_radio_keys = list( if(M.locs[1] in hearturfs) listening |= M + for(var/obj/O in objects) + O.hear_talk(src, message, verb, speaking) + var/speech_bubble_test = say_test(message) var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]") spawn(30) del(speech_bubble)