mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-26 14:47:50 +01:00
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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user