From 8eb24bfec01bcf644c71f9ba76b924f591426be9 Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Sun, 27 Mar 2016 23:45:00 +0200 Subject: [PATCH] PANIC --- code/WorkInProgress/kilakk/fax.dm | 2 +- code/game/gamemodes/malfunction/malfunction.dm | 2 +- code/game/objects/empulse.dm | 2 +- code/game/objects/explosion.dm | 2 +- code/game/objects/items/weapons/defib.dm | 2 +- code/game/objects/structures/morgue.dm | 2 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/admin/verbs/adminpm.dm | 6 +++--- code/modules/admin/verbs/playsound.dm | 2 +- code/modules/admin/verbs/pray.dm | 6 +++--- code/modules/events/hostile_infestation.dm | 2 +- code/modules/medical/computer/cloning.dm | 2 +- code/modules/mob/living/simple_animal/friendly/mouse.dm | 4 ++-- code/modules/projectiles/targeting.dm | 4 ++-- goon/code/datums/browserOutput.dm | 2 ++ 16 files changed, 23 insertions(+), 21 deletions(-) diff --git a/code/WorkInProgress/kilakk/fax.dm b/code/WorkInProgress/kilakk/fax.dm index 160a541c62d..a3e4fd1e507 100644 --- a/code/WorkInProgress/kilakk/fax.dm +++ b/code/WorkInProgress/kilakk/fax.dm @@ -211,7 +211,7 @@ var/list/alldepartments = list("Central Command") C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad else to_chat(C, msg) - to_chat(C, 'sound/effects/fax.ogg') + C << 'sound/effects/fax.ogg' proc/SendFax(var/sent, var/sentname, var/mob/Sender, var/dpt, var/centcomm) diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index abc5c1a1bb7..ad74dac2a8d 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -212,7 +212,7 @@ You should now be able to use your Explode verb to interface with the nuclear fi AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/ai_win ticker.mode:explosion_in_progress = 1 for(var/mob/M in player_list) - if(M.client) to_chat(M, 'sound/machines/Alarm.ogg') + if(M.client) M << 'sound/machines/Alarm.ogg' to_chat(world, "Self-destruction signal received. Self-destructing in 10...") for (var/i=9 to 1 step -1) sleep(10) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index f42fe6d1a47..961c3eebe7e 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -34,7 +34,7 @@ proc/empulse(turf/epicenter, heavy_range, light_range, log=0) if(M_turf && M_turf.z == epicenter.z) var/dist = cheap_pythag(M_turf.x - x0, M_turf.y - y0) if(dist <= round(heavy_range + world.view - 2, 1)) - to_chat(M, 'sound/effects/EMPulse.ogg') + M << 'sound/effects/EMPulse.ogg' for(var/turf/T in spiral_block(epicenter,max_range)) var/dist = cheap_pythag(T.x - x0, T.y - y0) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 853c1f9f4df..e4bd5ba880b 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -96,7 +96,7 @@ var/explosion_shake_message_cooldown = 0 for(var/mob/M in mob_list) if(M.z == epicenter.z) if(!(M in close)) //Check if the mob can hear if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) - to_chat(M, 'sound/effects/explosionfar.ogg') + M << 'sound/effects/explosionfar.ogg' if(adminlog) message_admins("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]) (JMP)") log_game("Explosion with size ([devastation_range], [heavy_impact_range], [light_impact_range]) in area [epicenter.loc.name] ") diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 0fba29448d2..0a95b580cb9 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -151,7 +151,7 @@ if(target.mind && !target.client) //Let's call up the ghost! Also, bodies with clients only, thank you. for(var/mob/dead/observer/ghost in player_list) if(ghost.mind == target.mind && ghost.client && ghost.can_reenter_corpse) - to_chat(ghost, 'sound/effects/adminhelp.ogg') + ghost << 'sound/effects/adminhelp.ogg' to_chat(ghost, "Someone is trying to revive your body. Return to it if you want to be resurrected! \ (Verbs -> Ghost -> Re-enter corpse, or click here!)") to_chat(user, "[src] buzzes: Defibrillation failed. Vital signs are too weak, please try again in five seconds.") diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c4dbd92aac4..d05dd343f70 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -349,7 +349,7 @@ M.show_message("You hear a roar as the crematorium activates.", 1) else M.show_message("You hear chewing as the crematorium consumes its meal.", 1) - to_chat(M, 'sound/items/eatfood.ogg') + M << 'sound/items/eatfood.ogg' locked = 1 cremating = 1 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 9303bf99e03..7f8ec2f0469 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -910,7 +910,7 @@ var/list/admin_verbs_mod = list( for (var/mob/T as mob in mob_list) to_chat(T, "
Man up.
Deal with it.
Move on.

") - to_chat(T, 'sound/voice/ManUp1.ogg') + T << 'sound/voice/ManUp1.ogg' log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.", 1) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 25e393800bf..4bd86e1320f 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -96,7 +96,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," if(X.is_afk()) admin_number_afk++ if(X.prefs.toggles & SOUND_ADMINHELP) - to_chat(X, 'sound/effects/adminhelp.ogg') + X << 'sound/effects/adminhelp.ogg' if(X.prefs.special_popup) X << output(msg, "window1.msay_output") else diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 26c3e101e5c..6fd3245bcfc 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -131,7 +131,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this if(C.prefs.toggles & SOUND_ADMINHELP) - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' /* if(C.holder) @@ -149,7 +149,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) if(C.prefs.toggles & SOUND_ADMINHELP) - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' else if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT @@ -164,7 +164,7 @@ to_chat(src, "Admin PM to-[key_name(C, src, 1)]: [msg]") //always play non-admin recipients the adminhelp sound - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn if(config.popup_admin_pm) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 77d53adc3ea..32ebd7f0f4e 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -74,7 +74,7 @@ client/proc/space_asshole() for(var/mob/M in world) if(M.client) if(M.client.midis) - to_chat(M, 'sound/music/space_asshole.ogg') + M << 'sound/music/space_asshole.ogg' client/proc/honk_theme() diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 987c271ce7b..f072beb38a2 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -28,7 +28,7 @@ C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad else to_chat(C, msg) - to_chat(C, 'sound/effects/prayer.ogg') + C << 'sound/effects/prayer.ogg' if(!stat) usr.whisper(orig_message) @@ -40,10 +40,10 @@ var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "CENTCOMM:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" to_chat(admins, msg) - to_chat(admins, 'sound/effects/msn.ogg') + admins << 'sound/effects/msn.ogg' /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN) msg = "SYNDICATE:[key_name(Sender, 1)] (PP) (VV) (SM) (JMP) (CA) (BSA) (RPLY): [msg]" to_chat(admins, msg) - to_chat(admins, 'sound/effects/inception.ogg') + admins << 'sound/effects/inception.ogg' diff --git a/code/modules/events/hostile_infestation.dm b/code/modules/events/hostile_infestation.dm index b0aa0495fd8..85bc6309ca9 100644 --- a/code/modules/events/hostile_infestation.dm +++ b/code/modules/events/hostile_infestation.dm @@ -30,7 +30,7 @@ if(M.client) var/turf/T = get_turf(M) if(T.z == z_level) - to_chat(M, 'sound/effects/bumpinthenight.ogg') + M << 'sound/effects/bumpinthenight.ogg' var/location = pick(LOC_KITCHEN, LOC_ATMOS, LOC_INCIN, LOC_CHAPEL, LOC_LIBRARY, LOC_HYDRO, LOC_VAULT, LOC_TECH) var/spawn_area_type diff --git a/code/modules/medical/computer/cloning.dm b/code/modules/medical/computer/cloning.dm index 20ad49696f7..b61f566a611 100644 --- a/code/modules/medical/computer/cloning.dm +++ b/code/modules/medical/computer/cloning.dm @@ -379,7 +379,7 @@ if (!subject.client && subject.mind) //this guy ghosted from his corpse, but he can still come back! for(var/mob/dead/observer/ghost in player_list) if(ghost.mind == subject.mind && ghost.client && ghost.can_reenter_corpse) - to_chat(ghost, 'sound/effects/adminhelp.ogg') + ghost << 'sound/effects/adminhelp.ogg' to_chat(ghost, "Someone is trying to clone your corpse. Return to your body if you want to be cloned! \ (Verbs -> Ghost -> Re-enter corpse, or click here!)") scantemp = "Error: Subject's brain is not responding to scanning stimuli, subject may be brain dead. Please try again in five seconds." diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 4d9747913b8..2d20bca84d3 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -35,7 +35,7 @@ ..() if(!stat && prob(speak_chance)) for(var/mob/M in view()) - to_chat(M, 'sound/effects/mousesqueek.ogg') + M << 'sound/effects/mousesqueek.ogg' if(!ckey && stat == CONSCIOUS && prob(0.5)) stat = UNCONSCIOUS @@ -143,7 +143,7 @@ if(!stat) var/mob/M = AM to_chat(M, "[bicon(src)] Squeek!") - to_chat(M, 'sound/effects/mousesqueek.ogg') + M << 'sound/effects/mousesqueek.ogg' ..() /mob/living/simple_animal/mouse/Die() diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index 34fc4c32718..62cf1020b09 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -159,7 +159,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. else return for(var/mob/living/K in viewers(usr)) - to_chat(K, 'sound/weapons/TargetOn.ogg') + K << 'sound/weapons/TargetOn.ogg' if(!targeted_by) targeted_by = list() targeted_by += I @@ -217,7 +217,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) - to_chat(M, 'sound/weapons/TargetOff.ogg') + M << 'sound/weapons/TargetOff.ogg' targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index 5cad2ac2564..dcdbb2b35a5 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -256,4 +256,6 @@ For the main html chat area C.chatOutput.messageQueue.Add(message) return + message = replacetext(message, "\n", "
") + target << output(url_encode(message), "browseroutput:output")