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
@@ -217,7 +217,7 @@
ticker.mode:to_nuke_or_not_to_nuke = 0
ticker.mode:explosion_in_progress = 1
for(var/mob/M in player_list)
to_chat(M, 'sound/machines/Alarm.ogg')
M << 'sound/machines/Alarm.ogg'
var/obj/item/device/radio/R = new (src)
var/AN = "Self-Destruct System"
@@ -9,7 +9,7 @@
return kill()
var/mob/C = pick(candidates)
key_of_morph = C.key
if(!key_of_morph)
return kill()
@@ -23,7 +23,7 @@
player_mind.special_role = "Morph"
ticker.mode.traitors |= player_mind
to_chat(S, S.playstyle_string)
to_chat(S, 'sound/magic/Mutate.ogg')
S << 'sound/magic/Mutate.ogg'
message_admins("[key_of_morph] has been made into morph by an event.")
log_game("[key_of_morph] was spawned as a morph by an event.")
return 1
@@ -119,7 +119,7 @@
spawn(5)
if(src.mind)
src.mind.wipe_memory()
to_chat(src, 'sound/effects/ghost.ogg')
src << 'sound/effects/ghost.ogg'
to_chat(src, "<br>")
to_chat(src, "<span class='deadsay'><font size=3><b>You are a revenant.</b></font></span>")
to_chat(src, "<b>Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.</b>")
@@ -57,7 +57,7 @@
if(mind)
to_chat(src, src.playstyle_string)
to_chat(src, "<B><span class ='notice'>You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest.</span></B>")
to_chat(src, 'sound/misc/demon_dies.ogg')
src << 'sound/misc/demon_dies.ogg'
mind.current.verbs += /mob/living/simple_animal/slaughter/proc/slaughterWhisper
if(!(vialspawned))
var/datum/objective/slaughter/objective = new
+1 -2
View File
@@ -320,8 +320,7 @@ Made by Xhuis
H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN)
if(H.stat != DEAD)
to_chat(H, "<span class='userdanger'>The light burns you!</span>")//Message spam to say "GET THE FUCK OUT"
to_chat(H, 'sound/weapons/sear.ogg')
H << 'sound/weapons/sear.ogg'
else if(light_amount < LIGHT_HEAL_THRESHOLD)
H.heal_overall_damage(5, 5)
H.adjustToxLoss(-5)
@@ -565,7 +565,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob)
else if(issilicon(target))
var/mob/living/silicon/S = target
to_chat(S, "<span class='warning'><b>ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#</b></span>")
to_chat(S, 'sound/misc/interference.ogg')
S << 'sound/misc/interference.ogg'
playsound(S, 'sound/machines/warning-buzzer.ogg', 50, 1)
var/datum/effect/system/spark_spread/sp = new /datum/effect/system/spark_spread
sp.set_up(5, 1, S)
@@ -156,7 +156,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N
M.Weaken(10)
to_chat(M, "<span class='userdanger'>An immense pressure slams you onto the ground!</span>")
to_chat(world, "<font size=5><span class='shadowling'><b>\"VYSHA NERADA YEKHEZET U'RUU!!\"</font></span>")
to_chat(world, 'sound/hallucinations/veryfar_noise.ogg')
world << 'sound/hallucinations/veryfar_noise.ogg'
for(var/obj/machinery/power/apc/A in apcs)
A.overload_lighting()
var/mob/A = new /mob/living/simple_animal/ascendant_shadowling(H.loc)
+1 -1
View File
@@ -782,7 +782,7 @@ var/global/list/multiverse = list()
GiveHint(target)
else if(istype(I,/obj/item/weapon/bikehorn))
to_chat(target, "<span class='userdanger'>HONK</span>")
to_chat(target, 'sound/items/AirHorn.ogg')
target << 'sound/items/AirHorn.ogg'
target.ear_damage += rand(0,3)
GiveHint(target)
cooldown = world.time +cooldown_time
+1 -1
View File
@@ -326,7 +326,7 @@
var/mob/selected = find_dead_player("[C.ckey]")
if(!selected)
return
to_chat(selected, 'sound/machines/chime.ogg')//probably not the best sound but I think it's reasonable
selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable
var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No")
if(answer != "No" && pod.growclone(C))
+1 -2
View File
@@ -15,8 +15,7 @@
light_range = heavy_range
for(var/mob/M in range(heavy_range, epicenter))
to_chat(M, 'sound/effects/EMPulse.ogg')
M << 'sound/effects/EMPulse.ogg'
for(var/atom/T in range(light_range, epicenter))
var/distance = get_dist(epicenter, T)
if(distance < 0)
+1 -1
View File
@@ -73,7 +73,7 @@
for(var/mob/M in world) 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(heavy_impact_range > 1)
var/datum/effect/system/explosion/E = new/datum/effect/system/explosion()
+2 -2
View File
@@ -93,12 +93,12 @@ var/const/FALLOFF_SOUNDS = 0.5
S.falloff = (falloff ? falloff : FALLOFF_SOUNDS)
if(!is_global)
S.environment = 2
to_chat(src, S)
src << S
/client/proc/playtitlemusic()
if(!ticker || !ticker.login_music || config.disable_lobby_music) return
if(prefs.sound & SOUND_LOBBY)
to_chat(src, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS
src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS
/proc/get_rand_frequency()