Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/nano/interaction/default.dm
This commit is contained in:
PsiOmegaDelta
2015-08-05 09:16:50 +02:00
6 changed files with 41 additions and 15 deletions
@@ -156,6 +156,9 @@
else
channels[chan_name] |= FREQ_LISTENING
if(href_list["nowindow"]) // here for pAIs, maybe others will want it, idk
return
interact(usr)
/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel) //BS12 EDIT