Merge pull request #9439 from Baystation12/dev-freeze

Dev-freeze into dev.
This commit is contained in:
Zuhayr
2015-05-23 21:40:26 +09:30
5 changed files with 144 additions and 135 deletions
+2 -1
View File
@@ -170,8 +170,9 @@
/mob/living/carbon/human/handle_message_mode(message_mode, message, verb, speaking, used_radios, alt_name)
switch(message_mode)
if("intercom")
for(var/obj/item/device/radio/intercom/I in view(1, null))
for(var/obj/item/device/radio/intercom/I in view(1))
I.talk_into(src, message, verb, speaking)
I.add_fingerprint(src)
used_radios += I
if("headset")
if(l_ear && istype(l_ear,/obj/item/device/radio))