Revert "Revert "Saycode/language/species port from Bay""

This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
This commit is contained in:
Markolie
2015-02-20 17:46:35 +01:00
parent f27b2dcd9b
commit d8d1670b68
109 changed files with 2955 additions and 2349 deletions
@@ -3,6 +3,7 @@
/area/awaymission/academy
name = "\improper Academy Asteroids"
icon_state = "away"
report_alerts = 0
/area/awaymission/academy/headmaster
name = "\improper Academy Fore Block"
@@ -4,7 +4,7 @@
name = "\improper BMP Asteroids"
icon_state = "away"
luminosity = 0
report_alerts = 0
/area/awaymission/BMPship/Aft
name = "\improper Aft Block"
@@ -4,7 +4,8 @@
name = "XCC-P5831"
icon_state = "away"
requires_power = 0
report_alerts = 0
/area/awaymission/centcomAway/general
name = "XCC-P5831"
music = "music/ambigen3.ogg"
@@ -1,5 +1,10 @@
//Challenge Areas
/area/awaymission/challenge
name = "Challenge"
icon_state = "away"
report_alerts = 0
/area/awaymission/challenge/start
name = "Where Am I?"
icon_state = "away"
@@ -6,6 +6,7 @@
luminosity = 1
lighting_use_dynamic = 0
requires_power = 0
report_alerts = 0
/area/awaymission/clownplanet/miningtown
name = "\improper Clown Planet - Bananium-o-Rama"
@@ -4,6 +4,7 @@
name = "\improper Space Battle"
icon_state = "away"
requires_power = 0
report_alerts = 0
/area/awaymission/spacebattle/cruiser
name = "\improper Nanotrasen Cruiser"
@@ -19,6 +19,9 @@
* Areas
*/
//Gateroom gets its own APC specifically for the gate
/area/awaymission
report_alerts = 0
/area/awaymission/gateroom
//Library, medbay, storage room