cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 00:23:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining issues and sound shit

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 16:26:11 -07:00
parent c72cc9606e
commit bb5e3bca63
27 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/adminhelp.dm
+2 -2
View File
@@ -112,13 +112,13 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
msg = "<span class='mentorhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob, "holder")]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</span> <span class='mentorhelp'>[msg]</span>"
for(var/client/X in mentorholders + modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
to_chat(X, 'sound/effects/adminhelp.ogg')
X << 'sound/effects/adminhelp.ogg'
to_chat(X, msg)
if("Adminhelp")
msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob, "holder")]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</span> <span class='adminhelp'>[msg]</span>"
for(var/client/X in modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
to_chat(X, 'sound/effects/adminhelp.ogg')
X << 'sound/effects/adminhelp.ogg'
to_chat(X, msg)
//show it to the person adminhelping too
code/modules/admin/verbs/adminpm.dm
+1 -1
View File
@@ -160,7 +160,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.sound & SOUND_ADMINHELP)
to_chat(C, 'sound/effects/adminhelp.ogg')
C << 'sound/effects/adminhelp.ogg'
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
//we don't use message_admins here because the sender/receiver might get it too
code/modules/admin/verbs/playsound.dm
+6 -6
View File
@@ -17,7 +17,7 @@ var/list/sounds_cache = list()
message_admins("[key_name_admin(src)] played sound [S]", 1)
for(var/mob/M in player_list)
if(M.client.prefs.sound & SOUND_MIDI)
to_chat(M, uploaded_sound)
M << uploaded_sound
feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -86,11 +86,11 @@ var/list/sounds_cache = list()
for(var/mob/M in world)
if(M.client)
if(M.client.midis)
to_chat(M, 'cubanpetetime.ogg')
M << 'cubanpetetime.ogg'
for(var/mob/living/carbon/human/CP in world)
if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")
to_chat(CP, "Your body can't contain the rhumba beat")
C << "Your body can't contain the rhumba beat"
CP.gib()
@@ -102,7 +102,7 @@ var/list/sounds_cache = list()
for(var/mob/M in world)
if(M.client)
if(M.client.midis)
to_chat(M, 'bananaphone.ogg')
M << 'bananaphone.ogg'
client/proc/space_asshole()
@@ -113,7 +113,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()
@@ -124,4 +124,4 @@ client/proc/honk_theme()
for(var/mob/M in world)
if(M.client)
if(M.client.midis)
to_chat(M, 'honk_theme.ogg')*/
M << 'honk_theme.ogg'*/