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

code/modules/admin/view_variables/debug_variables.dm

@@ -29,11 +29,7 @@
 
 	return "[.][item]</li>"
 
-<<<<<<< HEAD
-// This is split into a seperate proc mostly to make errors that happen not break things too much
-=======
 // This is split into a separate proc mostly to make errors that happen not break things too much
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 /proc/_debug_variable_value(name, value, level, datum/owner, sanitize, display_flags)
 	if(isappearance(value))
 		value = get_vv_appearance(value)
@@ -68,19 +64,11 @@
 		var/datum/datum_value = value
 		return datum_value.debug_variable_value(name, level, owner, sanitize, display_flags)
 
-<<<<<<< HEAD
-	if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists arent detectable as a list through istype
-		var/list/list_value = value
-		var/list/items = list()
-
-		// This is becuse some lists either dont count as lists or a locate on their ref will return null
-=======
 	if(islist(value) || (name in GLOB.vv_special_lists)) // Some special lists aren't detectable as a list through istype
 		var/list/list_value = value
 		var/list/items = list()
 
 		// This is because some lists either don't count as lists or a locate on their ref will return null
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 		var/link_vars = "Vars=[REF(value)]"
 		if(name in GLOB.vv_special_lists)
 			link_vars = "Vars=[REF(owner)];special_varname=[name]"

code/modules/admin/view_variables/filterrific.dm

@@ -24,11 +24,7 @@
 	data["target_filter_data"] = target.filter_data
 	return data
 
-<<<<<<< HEAD
-/datum/filter_editor/ui_act(action, list/params)
-=======
 /datum/filter_editor/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return

code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm

@@ -42,11 +42,7 @@
 	data["pixelated"] = target.appearance_flags & PIXEL_SCALE
 	return data
 
-<<<<<<< HEAD
-/datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params)
-=======
 /datum/nobody_wants_to_learn_matrix_math/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	. = ..()
 	if(.)
 		return
@@ -56,11 +52,7 @@
 			var/matrix_var_name = params["var_name"]
 			var/matrix_var_value = params["var_value"]
 			if(testing_matrix.vv_edit_var(matrix_var_name, matrix_var_value) == FALSE)
-<<<<<<< HEAD
-				to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on github.", confidential = TRUE)
-=======
 				to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on GitHub.", confidential = TRUE)
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 				return
 			set_transform()
 		if("scale")