Merge pull request #1933 from Ispil/master

Fix to Non-Human Speech, AIs and Cyborgs Falling Asleep When They Log Off
This commit is contained in:
SkyMarshal
2012-11-12 20:32:43 -08:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -372,7 +372,7 @@ var/list/department_radio_keys = list(
var/rendered = null
if (length(heard_a))
var/message_a = say_quote(message)
var/message_a = say_quote(message,is_speaking_soghun,is_speaking_skrell,is_speaking_taj)
if (italics)
message_a = "<i>[message_a]</i>"
+1 -1
View File
@@ -6,7 +6,7 @@
var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
var/list/alarms_to_show = list()
var/list/alarms_to_clear = list()
immune_to_ssd = 1
var/list/alarm_types_show = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)
var/list/alarm_types_clear = list("Motion" = 0, "Fire" = 0, "Atmosphere" = 0, "Power" = 0, "Camera" = 0)