From 00b4a234c4023848d59f0db587d89f31ade4b831 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Sat, 23 Jun 2012 22:17:59 +0100 Subject: [PATCH] Merge fixes. --- code/game/machinery/telecomms/telemonitor.dm | 2 +- code/modules/mob/living/say.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index 130963c7e5f..8c336ba3cb7 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -83,7 +83,7 @@ switch(href_list["operation"]) if("release") - machines = list() + machinelist = list() screen = 0 if("mainmenu") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index a3b829465f7..edadab9e147 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -151,7 +151,7 @@ var/list/department_radio_keys = list( //world << "channel_prefix=[channel_prefix]; message_mode=[message_mode]" if (message_mode) message = trim(copytext(message, 3)) - if (!(ishuman(src) || isanimal(src) && (message_mode=="department" || (message_mode in radiochannels) || message_mode == "right ear" || message_mode == "left ear"))) + if (!(ishuman(src) || istype(src, /mob/living/simple_animal/parrot)) && (message_mode=="department" || (message_mode in radiochannels) || message_mode == "right ear" || message_mode == "left ear")) message_mode = null //only humans can use headsets // Check removed so parrots can use headsets!