- 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

code/game/area/areas.dm

@@ -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

code/game/gamemodes/malfunction/malfunction.dm

@@ -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()

code/game/machinery/doors/airlock.dm

@@ -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 ..()

code/game/sound.dm

@@ -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
 

code/modules/mob/simple_animal/cat.dm

@@ -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 = ""

html/changelog.html

@@ -99,6 +99,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
 		<li class="bugfix">MMIs/pAIs no longer lip read, and thus can now hear in the dark.</li>
 		<li class="bugfix">Borg rechargers are no longer Faraday cages, and thus can now receive radio while they're recharging.</li>
 	</ul>
+	<h3 class="author">LastyScratch updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="soundadd">Glass airlocks now make a different sound than regular airlocks.</li>
+		<li class="soundadd">in 1997 nanotrasen's first AI malfunctioned</li>
+		<li class="bugfix">Toggle ambience probably works now!</i>
+		<li class="rscadd">Runtime is <s>dead</s>.</i>
+	</ul>
 </div>
 
 

maps/tgstation.2.0.8.dmm

@@ -3064,7 +3064,7 @@
 "bgV" = (/obj/structure/table,/obj/item/weapon/reagent_containers/food/condiment/peppermill,/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bgW" = (/obj/structure/closet/extinguisher{pixel_x = 27; pixel_y = 0},/obj/machinery/camera{c_tag = "Bar East"; dir = 8; network = "SS13"},/turf/simulated/floor{icon_state = "bar"},/area/crew_quarters/bar)
 "bgX" = (/obj/structure/table,/obj/machinery/status_display{density = 0; layer = 4; pixel_x = -32; pixel_y = 0},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
-"bgY" = (/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
+"bgY" = (/obj/item/weapon/reagent_containers/food/drinks/britcup{desc = "Kingston's personal cup."},/obj/structure/table,/mob/living/simple_animal/cat/Runtime,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bgZ" = (/obj/item/weapon/pen,/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bha" = (/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/obj/structure/table,/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
 "bhb" = (/obj/item/device/radio/intercom{broadcasting = 1; freerange = 0; frequency = 1485; listening = 0; name = "Station Intercom (Medbay)"; pixel_x = 30},/turf/simulated/floor{icon_state = "white"},/area/medical/medbay)
@@ -4282,7 +4282,7 @@
 "bEr" = (/turf/simulated/floor/plating,/area/toxins/mixing)
 "bEs" = (/obj/machinery/door/poddoor{id = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/simulated/floor/plating,/area/toxins/mixing)
 "bEt" = (/obj/machinery/door/poddoor{id = "toxinsdriver"; name = "Toxins Launcher Bay Door"},/turf/space,/area/toxins/test_area)
-"bEu" = (/obj/item/device/radio/beacon,/turf/simulated/floor/airless{icon_state = "bot"},/area/toxins/test_area)
+"bEu" = (/obj/item/device/radio/beacon,/mob/living/simple_animal/crab/Coffee,/turf/simulated/floor/airless{icon_state = "bot"},/area/toxins/test_area)
 "bEv" = (/obj/machinery/camera{c_tag = "Test Area East"; dir = 8; network = "Toxins"},/obj/machinery/camera{c_tag = "Explosives Testing Area"; dir = 8; network = "RD"; pixel_x = 0; pixel_y = -22},/obj/machinery/light/spot{dir = 4; layer = 2.8},/turf/simulated/floor/airless,/area/toxins/test_area)
 "bEw" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s5"; icon_state = "swall_s5"; dir = 2},/area/shuttle/mining/station)
 "bEx" = (/obj/structure/shuttle/engine/propulsion/burst,/turf/space,/area/shuttle/mining/station)

tgstation.dme

@@ -163,11 +163,9 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
+#define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/announcer"
-#define FILE_DIR "sound/bots"
 #define FILE_DIR "sound/effects"
 #define FILE_DIR "sound/items"
 #define FILE_DIR "sound/machines"