- Added voice clip for malfunctioning AI

- Glass airlocks now sound less like actual airlocks and more like doors, reducing station noise pollution by 39%.
- RUNTIME! SQUEEE
- Fixed toggle-ambiance hopefully for good this time.
- Reorganized the sound folders.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3182 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
LastBattaWolf@hotmail.com
2012-02-24 10:45:31 +00:00
parent 19fe6c0903
commit 4c564ad00e
45 changed files with 24 additions and 17 deletions
+2 -4
View File
@@ -306,7 +306,6 @@
if (A && A:client && !A:client:ambience_playing && !A:client:no_ambi) // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch
A:client:ambience_playing = 1
A:client:no_ambi = 0
A << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
switch(src.name)
@@ -315,9 +314,8 @@
if ("Space") sound = pick('ambispace.ogg','title2.ogg',)
if ("Engine Control", "Engineering", "Engineering SMES") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg')
if ("AI Satellite Teleporter Room") sound = pick('ambimalf.ogg')
if ("Bar") sound = pick('null.ogg')
if ("AI Upload Foyer") sound = pick('ambimalf.ogg', 'null.ogg')
if ("AI Upload Chamber") sound = pick('ambimalf.ogg','null.ogg')
if ("AI Upload Foyer") sound = pick('ambimalf.ogg')
if ("AI Upload Chamber") sound = pick('ambimalf.ogg')
if ("Mine")
sound = pick('ambimine.ogg')
musVolume = 25
@@ -154,6 +154,7 @@
ticker.mode:malf_mode_declared = 1
for(var/datum/mind/AI_mind in ticker.mode:malf_ai)
AI_mind.current.verbs -= /datum/game_mode/malfunction/proc/takeover
world << sound('aimalf.ogg')
/datum/game_mode/malfunction/proc/ai_win()
+4 -1
View File
@@ -1046,7 +1046,10 @@ About the new airlock wires panel:
if(src.welded || src.locked || (!src.arePowerSystemsOn()) || (stat & NOPOWER) || src.isWireCut(AIRLOCK_WIRE_OPEN_DOOR))
return 0
use_power(50)
playsound(src.loc, 'airlock.ogg', 30, 1)
if(istype(src, /obj/machinery/door/airlock/glass))
playsound(src.loc, 'windowdoor.ogg', 30, 1)
else
playsound(src.loc, 'airlock.ogg', 30, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
return ..()
+3 -3
View File
@@ -65,14 +65,14 @@
src << S
client/verb/Toggle_Soundscape()
client/verb/Toggle_Soundscape() //All new ambience should be added here so it works with this verb until someone better at things comes up with a fix that isn't awful
set category = "Special Verbs"
set name = "Toggle Ambience"
usr:client:no_ambi = !usr:client:no_ambi
if(usr:client:no_ambi)
usr << sound('shipambience.ogg', repeat = 0, wait = 0, volume = 0, channel = 2)
usr << sound('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg', repeat = 0, wait = 0, volume = 0, channel = 2)
else
usr << sound('shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
usr << sound('shipambience.ogg','ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg','ambicha1.ogg','ambicha2.ogg','ambicha3.ogg','ambicha4.ogg','ambimalf.ogg','ambispace.ogg','ambimine.ogg','title2.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)
usr << "Toggled ambience sound."
return
+4 -4
View File
@@ -3,9 +3,9 @@
name = "cat"
desc = "Kitty!!"
icon = 'mob.dmi'
icon_state = "tempcat"
icon_living = "tempcat"
icon_dead = "catdeath"
icon_state = "cat"
icon_living = "cat"
icon_dead = "cat_dead"
speak = list("Meow!","Esp!","Purr!","HSSSSS")
speak_emote = list("purrs", "meows")
emote_hear = list("meows","mews")
@@ -17,7 +17,7 @@
response_disarm = "gently pushes aside the"
response_harm = "kicks the"
//RUNTIME! SQUEEEEEEEE~
//RUNTIME IS ALIVE! SQUEEEEEEEE~
/mob/living/simple_animal/cat/Runtime
name = "Runtime"
desc = ""