Fix remaining issues and sound shit

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
+2 -3
View File
@@ -1,7 +1,7 @@
/client/proc/admin_memo()
set name = "Memo"
set category = "Server"
if(!check_rights(R_SERVER))
if(!check_rights(R_SERVER))
return
if(!dbcon.IsConnected())
to_chat(src, "<span class='danger'>Failed to establish database connection.</span>")
@@ -102,7 +102,7 @@
if(!output && !silent)
to_chat(src, "No memos found in database.")
return
src << output
to_chat(src, output)
if("Remove")
var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
if(!query_memodellist.Execute())
@@ -131,4 +131,3 @@
else
log_admin("[key_name(src)] has removed [target_sql_ckey]'s memo.")
message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s memo.")
+1 -1
View File
@@ -918,7 +918,7 @@ var/list/admin_verbs_proccall = list (
if(confirm == "Yes")
for (var/mob/T as mob in mob_list)
to_chat(T, "<br><center><span class='notice'><b><font size=4>Man up.<br> Deal with it.</font></b><br>Move on.</span></center><br>")
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 -1
View File
@@ -17,7 +17,7 @@
if(!C)
return
to_chat(C, 'sound/effects/adminhelp.ogg')
C << 'sound/effects/adminhelp.ogg'
to_chat(C, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
to_chat(C, "<font color='red'><b>Your admin help was rejected.</b></font>")
+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
+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
+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'*/
+23 -23
View File
@@ -421,7 +421,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
step_away(src,my_target,2)
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')))
my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
my_target.visible_message("<span class='danger'>[my_target] flails around wildly.</span>", \
"<span class='danger'>[my_target] has attacked [src]!</span>")
@@ -476,7 +476,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(prob(15))
src.do_attack_animation(my_target)
if(weapon_name)
to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')))
my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))
my_target.show_message("<span class='danger'>[src.name] has attacked [my_target] with [weapon_name]!</span>", 1)
my_target.staminaloss += 30
if(prob(20))
@@ -485,7 +485,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(!locate(/obj/effect/overlay) in my_target.loc)
fake_blood(my_target)
else
to_chat(my_target, sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')))
my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))
my_target.show_message("<span class='userdanger'>[src.name] has punched [my_target]!</span>", 1)
my_target.staminaloss += 30
if(prob(33))
@@ -618,36 +618,36 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
// to_chat(src, "Strange Audio")
switch(rand(1,18))
if(1)
to_chat(src, 'sound/machines/airlock.ogg')
src << 'sound/machines/airlock.ogg'
if(2)
if(prob(50))
to_chat(src, 'sound/effects/Explosion1.ogg')
src << 'sound/effects/Explosion1.ogg'
else
to_chat(src, 'sound/effects/Explosion2.ogg')
src << 'sound/effects/Explosion2.ogg'
if(3)
to_chat(src, 'sound/effects/explosionfar.ogg')
src << 'sound/effects/explosionfar.ogg'
if(4)
to_chat(src, 'sound/effects/Glassbr1.ogg')
src << 'sound/effects/Glassbr1.ogg'
if(5)
to_chat(src, 'sound/effects/Glassbr2.ogg')
src << 'sound/effects/Glassbr2.ogg'
if(6)
to_chat(src, 'sound/effects/Glassbr3.ogg')
src << 'sound/effects/Glassbr3.ogg'
if(7)
to_chat(src, 'sound/machines/twobeep.ogg')
src << 'sound/machines/twobeep.ogg'
if(8)
to_chat(src, 'sound/machines/windowdoor.ogg')
src << 'sound/machines/windowdoor.ogg'
if(9)
//To make it more realistic, I added two gunshots (enough to kill)
to_chat(src, 'sound/weapons/Gunshot.ogg')
src << 'sound/weapons/Gunshot.ogg'
spawn(rand(10,30))
to_chat(src, 'sound/weapons/Gunshot.ogg')
src << 'sound/weapons/Gunshot.ogg'
if(10)
to_chat(src, 'sound/weapons/smash.ogg')
src << 'sound/weapons/smash.ogg'
if(11)
//Same as above, but with tasers.
to_chat(src, 'sound/weapons/Taser.ogg')
src << 'sound/weapons/Taser.ogg'
spawn(rand(10,30))
to_chat(src, 'sound/weapons/Taser.ogg')
src << 'sound/weapons/Taser.ogg'
//Rare audio
if(12)
//These sounds are (mostly) taken from Hidden: Source
@@ -656,21 +656,21 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\
'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\
'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg')
to_chat(src, pick(creepyasssounds))
src << pick(creepyasssounds)
if(13)
to_chat(src, "<span class='warning'>You feel a tiny prick!</span>")
if(14)
to_chat(src, "<h1 class='alert'>Priority Announcement</h1>")
to_chat(src, "<br><br><span class='alert'>The Emergency Shuttle has docked with the station. You have 3 minutes to board the Emergency Shuttle.</span><br><br>")
to_chat(src, sound('sound/AI/shuttledock.ogg'))
src << sound('sound/AI/shuttledock.ogg')
if(15)
to_chat(src, 'sound/items/Welder.ogg')
src << 'sound/items/Welder.ogg'
if(16)
to_chat(src, 'sound/items/Screwdriver.ogg')
src << 'sound/items/Screwdriver.ogg'
if(17)
to_chat(src, 'sound/weapons/saberon.ogg')
src << 'sound/weapons/saberon.ogg'
if(18)
to_chat(src, 'sound/weapons/saberoff.ogg')
src << 'sound/weapons/saberoff.ogg'
if("hudscrew")
//Screwy HUD
// to_chat(src, "Screwy HUD")
@@ -37,7 +37,7 @@
..()
if(prob(speak_chance))
for(var/mob/M in view())
to_chat(M, 'sound/effects/mousesqueek.ogg')
M << 'sound/effects/mousesqueek.ogg'
/mob/living/simple_animal/mouse/Life()
. = ..()
@@ -113,7 +113,7 @@
if(!stat)
var/mob/M = AM
to_chat(M, "\blue \icon[src] Squeek!")
to_chat(M, 'sound/effects/mousesqueek.ogg')
M << 'sound/effects/mousesqueek.ogg'
..()
/mob/living/simple_animal/mouse/death()
@@ -224,8 +224,7 @@
message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
visible_message("<span class='userdanger'>[src] is consumed by the singularity!</span>")
for(var/mob/M in mob_list)
to_chat(M, 'sound/effects/supermatter.ogg')//everyone goan know bout this
M << 'sound/effects/supermatter.ogg' //everyone gunna know bout this
to_chat(M, "<span class='boldannounce'>A horrible screeching fills your ears, and a wave of dread washes over you...</span>")
qdel(src)
return(gain)
+2 -2
View File
@@ -157,7 +157,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
@@ -215,7 +215,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)
+3 -3
View File
@@ -227,9 +227,9 @@ About the Tools:
By default, all atom have a reagents var - but its empty. if you want to use an object for the chem.
system you'll need to add something like this in its new proc:
to_chat(var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum , 100 is the maximum_volume of the new holder datum.)
to_chat(reagents = R, <<< assign the new datum to the objects reagents var)
to_chat(R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.)
var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum, 100 is the maximum_volume of the new holder datum.
reagents = R, <<< assign the new datum to the objects reagents var
R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.
This can also be done by calling a convenience proc:
atom/proc/create_reagents(var/max_volume)
+3 -3
View File
@@ -197,7 +197,7 @@
if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch
sound_played = 1
for(var/area/shuttle/escape/E in world)
to_chat(E, 'sound/effects/hyperspace_begin.ogg')
E << 'sound/effects/hyperspace_begin.ogg'
if(time_left <= 0 && !shuttle_master.emergencyNoEscape)
//move each escape pod to its corresponding transit dock
@@ -206,7 +206,7 @@
M.enterTransit()
//now move the actual emergency shuttle to its transit dock
for(var/area/shuttle/escape/E in world)
to_chat(E, 'sound/effects/hyperspace_progress.ogg')
E << 'sound/effects/hyperspace_progress.ogg'
enterTransit()
mode = SHUTTLE_ESCAPE
timer = world.time
@@ -218,7 +218,7 @@
M.dock(shuttle_master.getDock("[M.id]_away"))
//now move the actual emergency shuttle to centcomm
for(var/area/shuttle/escape/E in world)
to_chat(E, 'sound/effects/hyperspace_end.ogg')
E << 'sound/effects/hyperspace_end.ogg'
dock(shuttle_master.getDock("emergency_away"))
mode = SHUTTLE_ENDGAME
timer = 0
@@ -463,7 +463,7 @@
owner.stuttering = 20
owner.ear_deaf = 30
owner.Weaken(3)
to_chat(owner, 'sound/items/AirHorn.ogg')
owner << 'sound/items/AirHorn.ogg'
if(prob(30))
owner.Stun(10)
owner.Paralyse(4)