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/modular_computers/computers/item/computer.dm

@@ -75,15 +75,9 @@
 	var/comp_light_color = COLOR_WHITE
 
 	///Power usage when the computer is open (screen is active) and can be interacted with.
-<<<<<<< HEAD
 	var/base_active_power_usage = 0.4 WATTS // SKYRAT EDIT CHANGE - ORIGINAL: 2 WATTS
 	///Power usage when the computer is idle and screen is off.
 	var/base_idle_power_usage = 0.2 WATTS //SKYRAT EDIT CHANGE - ORIGINAL: 1 WATTS
-=======
-	var/base_active_power_usage = 2 WATTS
-	///Power usage when the computer is idle and screen is off.
-	var/base_idle_power_usage = 1 WATTS
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 	// Modular computers can run on various devices. Each DEVICE (Laptop, Console & Tablet)
 	// must have its own DMI file. Icon states must be called exactly the same in all files, but may look differently

code/modules/modular_computers/computers/item/computer_power.dm

@@ -53,19 +53,6 @@
 		if(open_programs in idle_threads)
 			power_usage += (open_programs.power_cell_use / 2)
 
-<<<<<<< HEAD
-	if(light_on)
-		power_usage *= FLASHLIGHT_DRAIN_MULTIPLIER
-	if(active_program)
-		power_usage += active_program.power_cell_use
-	for(var/datum/computer_file/program/open_programs as anything in idle_threads)
-		if(!open_programs.power_cell_use)
-			continue
-		if(open_programs in idle_threads)
-			power_usage += (open_programs.power_cell_use / 2)
-
-=======
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	if(use_energy(power_usage * seconds_per_tick))
 		return TRUE
 	power_failure()

code/modules/modular_computers/computers/item/pda.dm

@@ -38,14 +38,10 @@
 		/datum/computer_file/program/messenger,
 		/datum/computer_file/program/nt_pay,
 		/datum/computer_file/program/notepad,
-<<<<<<< HEAD
 		// SKYRAT EDIT ADDITION START
 		/datum/computer_file/program/maintenance/camera, // Adds camera to all base tablets
 		// SKRAT EDIT ADDITION END
 		/datum/computer_file/program/crew_manifest
-=======
-		/datum/computer_file/program/crew_manifest,
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 	///List of items that can be stored in a PDA
 	var/static/list/contained_item = list(
@@ -333,11 +329,8 @@
 	starting_programs = list(
 		/datum/computer_file/program/filemanager,
 		/datum/computer_file/program/robotact,
-<<<<<<< HEAD
 		/datum/computer_file/program/crew_manifest, // SKYRAT EDIT ADDITION - Manifests for borgs
 		/datum/computer_file/program/messenger, // SKYRAT EDIT ADDITION - Messenger for borgs
-=======
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 	)
 
 /obj/item/modular_computer/pda/silicon/Initialize(mapload)
@@ -432,11 +425,7 @@
 	return TRUE
 
 /obj/item/modular_computer/pda/silicon/ui_state(mob/user)
-<<<<<<< HEAD
-	return GLOB.reverse_contained_state
-=======
 	return GLOB.deep_inventory_state
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 /obj/item/modular_computer/pda/silicon/cyborg/syndicate
 	icon_state = "tablet-silicon-syndicate"

code/modules/modular_computers/computers/item/role_tablet_presets.dm

@@ -365,18 +365,12 @@
 		/datum/computer_file/program/newscaster,
 	)
 
-<<<<<<< HEAD
 /* // SKYRAT EDIT REMOVAL BEGIN - Mutes the Curator's ringer on spawn
-=======
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 /obj/item/modular_computer/pda/curator/Initialize(mapload)
 	. = ..()
 	for(var/datum/computer_file/program/messenger/msg in stored_files)
 		msg.alert_silenced = TRUE
-<<<<<<< HEAD
 */ // SKYRAT EDIT REMOVAL END
-=======
->>>>>>> 4b4ae0958fe6b5d511ee6e24a5087599f61d70a3
 
 /obj/item/modular_computer/pda/psychologist
 	name = "psychologist PDA"