shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters

Browse Source
This commit is contained in:
kevinz000
2020-02-10 04:32:01 -07:00
parent 32a5957c18 c8a62e7acf
commit 276f4b5fae
101 changed files with 688 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/newscaster/newscaster_machine.dm
+1 -1
View File
@@ -338,7 +338,7 @@ GLOBAL_LIST_EMPTY(allCasters)
/obj/machinery/newscaster/Topic(href, href_list)
if(..())
return
if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || issilicon(usr))
if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && isturf(loc))) || hasSiliconAccessInArea(usr))
usr.set_machine(src)
scan_user(usr)
if(href_list["set_channel_name"])