(Committed for PolymorphBlue) Traitors in the prison cell on the escape shuttle now fail their objective.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2599 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/turf.dm

@@ -102,6 +102,10 @@
 	name = "floor"
 	icon_state = "floor"
 
+/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
+	name = "Brig floor"        // Also added it into the 2x3 brig area of the shuttle.
+	icon_state = "floor4"
+
 /turf/unsimulated
 	intact = 1
 	name = "command"

code/game/gamemodes/objective.dm

@@ -219,6 +219,10 @@ datum/objective/escape
 		var/turf/location = get_turf(owner.current.loc)
 		if(!location)
 			return 0
+
+		if(istype(location, /turf/simulated/shuttle/floor4)) // Fails tratiors if they are in the shuttle brig -- Polymorph
+			return 0
+
 		var/area/check_area = location.loc
 		if(istype(check_area, /area/shuttle/escape/centcom))
 			return 1

code/game/sound.dm

@@ -95,8 +95,8 @@ client/verb/Toggle_Soundscape()
 			if ("Bar") sound = pick('ambibar.ogg')
 			if ("Locker Room") sound = pick('ambiruntime.ogg','ambistat.ogg')
 			if ("Primary Tool Storage") sound = pick('ambiruntime.ogg','ambistat.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