TG Upstream Part 1

3591 individual conflicts

Update build.js

Update install_node.sh

Update byond.js

oh my fucking god

hat

slow

huh

holy shit

we all fall down

2 more I missed

2900 individual conflicts

2700 Individual conflicts

replaces yarn file with tg version, bumping us down to 2200-ish

Down to 2000 individual conflicts

140 down

mmm

aaaaaaaaaaaaaaaaaaa

not yt

575

soon

900 individual conflicts

600 individual conflicts, 121 file conflicts

im not okay

160 across 19 files

29 in 4 files

0 conflicts, compiletime fix time

some minor incap stuff

missed ticks

weird dupe definition stuff

missed ticks 2

incap fixes

undefs and pie fix

Radio update and some extra minor stuff

returns a single override

no more dupe definitions, 175 compiletime errors

Unticked file fix

sound and emote stuff

honk and more radio stuff

lua/handler_group.lua

@@ -1,52 +1,29 @@
-<<<<<<< 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
@@ -68,8 +45,4 @@ function HandlerGroup.register_once(datum, signal, func)
 	return callback
 end
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 return HandlerGroup