Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 8/7/2015_bay_merge

Conflicts:
	.travis.yml
	polaris.dme
This commit is contained in:
Neerti
2015-08-07 20:25:57 -04:00
27 changed files with 298 additions and 171 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