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

Use legacy topic keywords lookup method

Browse Source
This commit is contained in:
oranges
2017-10-12 16:06:02 -05:00
committed by CitadelStationBot
parent 06061f0870
commit 9663adaa3f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/world.dm
+5
View File
@@ -120,8 +120,13 @@ GLOBAL_PROTECT(security_mode)
var/list/input = params2list(T) var/list/input = params2list(T)
var/datum/world_topic/handler var/datum/world_topic/handler
for(var/I in topic_handlers) for(var/I in topic_handlers)
<<<<<<< HEAD
if(input[I]) if(input[I])
handler = I handler = I
=======
if(I in input)
handler = topic_handlers[I]
>>>>>>> e4a63bb... Merge pull request #31631 from tgstation/Cyberboss-patch-2
break break
if((!handler || initial(handler.log)) && config && CONFIG_GET(flag/log_world_topic)) if((!handler || initial(handler.log)) && config && CONFIG_GET(flag/log_world_topic))