diff --git a/code/defines/turf.dm b/code/defines/turf.dm index 8c53007de95..87c7f682868 100644 --- a/code/defines/turf.dm +++ b/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" diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 419061b9fb5..9537de5be12 100644 --- a/code/game/gamemodes/objective.dm +++ b/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 diff --git a/code/game/sound.dm b/code/game/sound.dm index 7ef9fbf6593..67d3e56ed10 100644 --- a/code/game/sound.dm +++ b/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 diff --git a/html/changelog.html b/html/changelog.html index 45c2582e979..164dab42961 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -67,8 +67,13 @@ should be listed in the changelog upon commit tho. Thanks. --> - - + +
  • PolymorphBlue updated: + +
  • + 30 November 2011