From 9663adaa3f5f7ec215e2bddabda7e224cd705b2a Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Fri, 13 Oct 2017 10:05:43 +1300
Subject: [PATCH] Use legacy topic keywords lookup method

---
 code/game/world.dm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/code/game/world.dm b/code/game/world.dm
index 5fe674cb7f..fd27c6da1a 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -120,8 +120,13 @@ GLOBAL_PROTECT(security_mode)
 	var/list/input = params2list(T)
 	var/datum/world_topic/handler
 	for(var/I in topic_handlers)
+<<<<<<< HEAD
 		if(input[I])
 			handler = I
+=======
+		if(I in input)
+			handler = topic_handlers[I]
+>>>>>>> e4a63bb... Merge pull request #31631 from tgstation/Cyberboss-patch-2
 			break
 	
 	if((!handler || initial(handler.log)) && config && CONFIG_GET(flag/log_world_topic))