Merge branch 'master' of https://github.com/tgstation/tgstation into pulls-tg-to-fix-shit

lua/handler_group.lua

@@ -1,29 +1,52 @@
+<<<<<<< HEAD
 local SS13 = require('SS13')
+=======
+local SS13 = require("SS13")
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 local HandlerGroup = {}
 HandlerGroup.__index = HandlerGroup
 
 function HandlerGroup.new()
 	return setmetatable({
+<<<<<<< HEAD
 		registered = {}
+=======
+		registered = {},
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	}, HandlerGroup)
 end
 
 -- Registers a signal on a datum for this handler group instance.
 function HandlerGroup:register_signal(datum, signal, func)
+<<<<<<< HEAD
 	local callback = SS13.register_signal(datum, signal, func)
 	if not callback then
 		return
 	end
 	table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback  })
+=======
+	local registered_successfully = SS13.register_signal(datum, signal, func)
+	if not registered_successfully then
+		return
+	end
+	table.insert(self.registered, { datum = datum, signal = signal, func = func })
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 end
 
 -- Clears all the signals that have been registered on this HandlerGroup
 function HandlerGroup:clear()
 	for _, data in self.registered do
+<<<<<<< HEAD
 		if not data.callback or not data.datum then
 			continue
 		end
 		SS13.unregister_signal(data.datum, data.signal, data.callback)
+=======
+		if not data.func or not SS13.is_valid(data.datum) then
+			continue
+		end
+		SS13.unregister_signal(data.datum, data.signal, data.func)
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	end
 	table.clear(self.registered)
 end
@@ -45,5 +68,8 @@ function HandlerGroup.register_once(datum, signal, func)
 	return callback
 end
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 return HandlerGroup