516 compatibility PR 2: the revenge of Node.js

.github/workflows/ci.yml

@@ -20,8 +20,8 @@ on:
   workflow_dispatch:
 
 env:
-  BYOND_MAJOR: 515
-  BYOND_MINOR: 1603
+  BYOND_MAJOR: 516
+  BYOND_MINOR: 1659
 
   #This can be declared here because build.py will ignore it if DM_UNIT_TESTS is true.
   ALL_MAPS: tgstation metaclub defficiency packedstation roidstation test_tiny test_vault snaxi tgstation-sec tgstation-snow LampreyStation xoq synergy bagelstation lowfatbagel Dorfstation waystation line horizon wheelstation

.vscode/tasks.json

@@ -40,7 +40,7 @@
 		},
 		{
 			"type": "shell",
-			"command": "bin/tgui-build",
+			"command": "bin/tgui-build RUST_BACKTRACK=full",
 			"windows": {
 				"command": ".\\bin\\tgui-build.cmd"
 			},
@@ -89,6 +89,15 @@
 			],
 			"group": "build",
 			"label": "tgui: sonar"
+		},
+		{
+			"type": "npm",
+			"script": "install",
+			"path": "tgui",
+			"group": "clean",
+			"problemMatcher": [],
+			"label": "npm: install - tgui",
+			"detail": "install dependencies from package"
 		}
 	]
 }

__DEFINES/_macros.dm

@@ -439,3 +439,4 @@ var/global/list/visible_spaces = list(/turf/simulated/open, /turf/simulated/floo
 #define OMNI_LINK(A,B) isliving(A) && A:omnitool_connect(B)
 
 #define is_real_champion(A) ismob(A) && A.is_wearing_item(/obj/item/weapon/storage/belt/champion) && A.is_wearing_item(/obj/item/clothing/mask/luchador)
+

__DEFINES/cooldowns.dm

@@ -0,0 +1,6 @@
+//Returns true if the cooldown has run its course, false otherwise
+#define COOLDOWN_FINISHED(cd_source, cd_index) (cd_source.cd_index <= world.time)
+
+#define COOLDOWN_TIMELEFT(cd_source, cd_index) (max(0, cd_source.cd_index - world.time))
+
+#define COOLDOWN_START(cd_source, cd_index, cd_time) (cd_source.cd_index = world.time + (cd_time))

__DEFINES/planes+layers.dm

@@ -368,7 +368,7 @@ var/obj/abstract/screen/plane_master/overdark_planemaster/overdark_planemaster =
 	appearance_flags = 0
 	plane = BASE_PLANE
 	mouse_opacity = 0
-	screen_loc = "CENTER,CENTER"
+	screen_loc = "SOUTHWEST,SOUTHWEST"
 	render_source = "*overdark"
 
 var/obj/abstract/screen/plane_master/overdark_planemaster_target/overdark_planemaster_target = new()

__DEFINES/qdel.dm

@@ -6,3 +6,6 @@
 #define QDEL_LIST_ASSOC_NULL(L) QDEL_LIST_ASSOC(L); L = null
 #define QDEL_LIST_CUT(L) QDEL_LIST(L); L.Cut()
 #define QDEL_LIST_ASSOC_CUT(L) QDEL_LIST_ASSOC(L); L.Cut()
+
+// QDEL macros borrowed from TG
+#define QDELETED(X) (!X || !X || X.gcDestroyed)

__DEFINES/setup.dm

@@ -1,6 +1,6 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
-#if DM_VERSION < 513
+#if DM_VERSION < 516
 #error Your version of byond is too old, you need version 513 or higher
 #endif
 #define RUNWARNING // disable if they re-enable run() in 507 or newer.
                    // They did, tested in 508.1296 - N3X

__DEFINES/tgui.dm

@@ -19,6 +19,9 @@
 /// Maximum ping timeout allowed to detect zombie windows
 #define TGUI_PING_TIMEOUT 4 SECONDS
 
+/// Used for rate-limiting to prevent DoS by excessively refreshing a TGUI window
+#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN (1 SECONDS)
+
 /// Window does not exist
 #define TGUI_WINDOW_CLOSED 0
 /// Window was just opened, but is still not ready to be sent data
@@ -38,3 +41,14 @@
 #define TGUI_CREATE_MESSAGE(type, payload) ( \
 	"%7b%22type%22%3a%22[type]%22%2c%22payload%22%3a[url_encode(json_encode(payload))]%7d" \
 )
+
+// -- TG Style nameof() --
+#define PROC_REF(X) (nameof(.proc/##X))
+/**
+ * NAMEOF: Compile time checked variable name to string conversion
+ * evaluates to a string equal to "X", but compile errors if X isn't a var on datum.
+ **/
+#define NAMEOF(datum, X) (#X || ##datum.##X)
+
+/// Call by name proc reference, checks if the proc exists on either the given type or as a global proc
+#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X))

code/ATMOSPHERICS/components/binary_devices/MSGS.dm

@@ -14,7 +14,7 @@
 	var/internal_volume = 10000
 	var/max_pressure = 10000
 
-	var/target_pressure = 4500	//Output pressure.
+	var/target_pressure = 2500	//Output pressure.
 
 	var/datum/gas_mixture/air				//Internal tank.
 
@@ -102,17 +102,19 @@
 		))
 	return data
 
-/obj/machinery/atmospherics/binary/msgs/ui_act(action, list/params)
+/obj/machinery/atmospherics/binary/msgs/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
 	. = ..()
 	if(.)
 		return
 	switch(action)
 		if("toggle_power")
 			on = !on
 			update_icon()
+			SStgui.try_update_ui(ui.user, src, ui)
 			return TRUE
 		if("set_pressure")
 			target_pressure = round(clamp(text2num(params["new_pressure"]), 0, 4500))
+			SStgui.try_update_ui(ui.user, src, ui)
 			update_icon()
 			return TRUE
 

code/__HELPERS/cmp.dm

@@ -29,6 +29,9 @@ var/cmp_field = "name"
 /proc/cmp_records_dsc(datum/data/record/a, datum/data/record/b)
 	return sorttext(a.fields[cmp_field], b.fields[cmp_field])
 
+/proc/cmp_records_numerically(datum/data/record/a, datum/data/record/b)
+	return b.fields[cmp_field] - a.fields[cmp_field]
+
 /proc/cmp_ckey_asc(client/a, client/b)
 	return sorttext(b.ckey, a.ckey)
 

code/__HELPERS/datum.dm

@@ -1,6 +1,7 @@
 /datum
 	var/list/datum_components
 	var/list/active_timers
+	var/list/open_uis
 
 /datum/proc/initialize()
 	return TRUE

code/__HELPERS/files.dm

@@ -59,3 +59,23 @@
 	fileaccess_timer = world.time + FTPDELAY
 	return 0
 #undef FTPDELAY
+
+// Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
+#define WRAP(val, min, max) clamp(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max)
+
+
+/// Save file as an external file then md5 it.
+/// Used because md5ing files stored in the rsc sometimes gives incorrect md5 results.
+/// https://www.byond.com/forum/post/2611357
+/proc/md5asfile(file)
+	var/static/notch = 0
+	// its importaint this code can handle md5filepath sleeping instead of hard blocking, if it's converted to use rust_g.
+	var/filename = "tmp/md5asfile.[world.realtime].[world.timeofday].[world.time].[world.tick_usage].[notch]"
+	notch = WRAP(notch+1, 0, 2**15)
+	fcopy(file, filename)
+	. = md5filepath(filename)
+	fdel(filename)
+
+/// Returns the md5 of a file at a given path.
+/proc/md5filepath(path)
+	. = md5(file(path))

code/__HELPERS/icons.dm

@@ -210,3 +210,64 @@
 		return HSVtoRGB(hsv(hsv_list[1], hsv_list[2], hsv_list[3], hsv_list[4]))
 	return HSVtoRGB(hsv(hsv_list[1], hsv_list[2], hsv_list[3]))
 
+/// given an icon object, dmi file path, or atom/image/mutable_appearance, attempts to find and return an associated dmi file path.
+/// a weird quirk about dm is that /icon objects represent both compile-time or dynamic icons in the rsc,
+/// but stringifying rsc references returns a dmi file path
+/// ONLY if that icon represents a completely unchanged dmi file from when the game was compiled.
+/// so if the given object is associated with an icon that was in the rsc when the game was compiled, this returns a path. otherwise it returns ""
+/proc/get_icon_dmi_path(icon/icon)
+	/// the dmi file path we attempt to return if the given object argument is associated with a stringifiable icon
+	/// if successful, this looks like "icons/path/to/dmi_file.dmi"
+	var/icon_path = ""
+
+	if(isatom(icon) || istype(icon, /image) || istype(icon, /mutable_appearance))
+		var/atom/atom_icon = icon
+		icon = atom_icon.icon
+		//atom icons compiled in from 'icons/path/to/dmi_file.dmi' are weird and not really icon objects that you generate with icon().
+		//if they're unchanged dmi's then they're stringifiable to "icons/path/to/dmi_file.dmi"
+
+	if(isicon(icon) && isfile(icon))
+		//icons compiled in from 'icons/path/to/dmi_file.dmi' at compile time are weird and aren't really /icon objects,
+		///but they pass both isicon() and isfile() checks. they're the easiest case since stringifying them gives us the path we want
+		var/icon_ref = ref(icon)
+		var/locate_icon_string = "[locate(icon_ref)]"
+
+		icon_path = locate_icon_string
+
+	else if(isicon(icon) && "[icon]" == "/icon")
+		// icon objects generated from icon() at runtime are icons, but they AREN'T files themselves, they represent icon files.
+		// if the files they represent are compile time dmi files in the rsc, then
+		// the rsc reference returned by fcopy_rsc() will be stringifiable to "icons/path/to/dmi_file.dmi"
+		var/rsc_ref = fcopy_rsc(icon)
+
+		var/icon_ref = ref(rsc_ref)
+
+		var/icon_path_string = "[locate(icon_ref)]"
+
+		icon_path = icon_path_string
+
+	else if(istext(icon))
+		var/rsc_ref = fcopy_rsc(icon)
+		//if its the text path of an existing dmi file, the rsc reference returned by fcopy_rsc() will be stringifiable to a dmi path
+
+		var/rsc_ref_ref = ref(rsc_ref)
+		var/rsc_ref_string = "[locate(rsc_ref_ref)]"
+
+		icon_path = rsc_ref_string
+
+	if(is_valid_dmi_file(icon_path))
+		return icon_path
+
+	return FALSE
+
+///given a text string, returns whether it is a valid dmi icons folder path
+/proc/is_valid_dmi_file(icon_path)
+	if(!istext(icon_path) || !length(icon_path))
+		return FALSE
+
+	var/is_in_icon_folder = findtextEx(icon_path, "icons/")
+	var/is_dmi_file = findtextEx(icon_path, ".dmi")
+
+	if(is_in_icon_folder && is_dmi_file)
+		return TRUE
+	return FALSE

code/__HELPERS/math/ray/ray.dm

@@ -18,9 +18,9 @@
 
 /ray
 	var/z //the z-level we are casting our ray in
-	var/vector/origin //the origin of the ray
-	var/vector/origin_floored //the floored origin vector
-	var/vector/direction //direction of the ray
+	var/_vector/origin //the origin of the ray
+	var/_vector/origin_floored //the floored origin vector
+	var/_vector/direction //direction of the ray
 	var/original_damage //original damage of the ray when applicable
 	var/turf/final_turf
 	var/turf/previous_turf
@@ -29,7 +29,7 @@
 	return "\[Ray\](\n- origin = " + origin.toString() + "\n- origin_floored = "+ origin_floored.toString() + "\n- direction = " + direction.toString() + "\n- z-level = " + num2text(z) + "\n)"
 
 //use atom2vector for the origin, atoms2vector for the direction
-/ray/New(var/vector/p_origin, var/vector/p_direction, var/z)
+/ray/New(var/_vector/p_origin, var/_vector/p_direction, var/z)
 	origin = p_origin
 	origin_floored = origin.floored() //to save us from calculating it all over again
 	direction = p_direction.chebyshev_normalized()
@@ -53,7 +53,7 @@
 	return hitsPoint(other_ray.origin)
 
 //returns true if point is on our ray (can be called with a max distance)
-/ray/proc/hitsPoint(var/vector/point, var/max_distance = 0)
+/ray/proc/hitsPoint(var/_vector/point, var/max_distance = 0)
 	if(origin.equals(point)) //the easy way out
 		return TRUE
 
@@ -73,23 +73,23 @@
 // wrong?
 /ray/proc/getReboundOnAtom(var/rayCastHit/hit)
 	//calc where we hit the atom
-	var/vector/hit_point = hit.point_raw
+	var/_vector/hit_point = hit.point_raw
 	var/atom/movable/resolved_hit_atom = hit.hit_atom?.get()
-	var/vector/hit_atom_loc = atom2vector(resolved_hit_atom) + new /vector(0.5, 0.5)
+	var/_vector/hit_atom_loc = atom2vector(resolved_hit_atom) + new /_vector(0.5, 0.5)
 
-	var/vector/hit_vector = hit_point - hit_atom_loc
+	var/_vector/hit_vector = hit_point - hit_atom_loc
 
 	//we assume every atom is a octogonal, hence we use all_vectors
 	//here we calculate the "face" of the octagonal atom we want to rebound on
 	var/entry_byond_dir = vector2ClosestDir(hit_vector)
-	var/vector/entry_dir = dir2vector(entry_byond_dir)
+	var/_vector/entry_dir = dir2vector(entry_byond_dir)
 
 	return src.direction.mirrorWithNormal(entry_dir)
 
 
 //gets a point along the ray
 /ray/proc/getPoint(var/distance)
-	var/vector/path = direction * distance
+	var/_vector/path = direction * distance
 	return origin + path
 
 //inherit and override this for costum logic
@@ -101,15 +101,15 @@
 //returns list of raycasthits
 /ray/proc/cast(var/max_distance = RAY_CAST_DEFAULT_MAX_DISTANCE, var/max_hits = RAY_CAST_UNLIMITED_HITS, var/ignore_origin = TRUE)
 	//calculating a step and its distance to use in the loop
-	var/vector/a_step = direction * RAY_CAST_STEP
+	var/_vector/a_step = direction * RAY_CAST_STEP
 	var/step_distance = a_step.chebyshev_norm()
 
 	//setting up our pointer and distance to track where we are
-	var/vector/pointer = new /vector(0,0)
+	var/_vector/pointer = new /_vector(0,0)
 	var/distance = 0
 
 	//positions list to easier check if we already found this position (since we are moving in tiny steps, not full numbers)
-	var/list/vector/positions = list()
+	var/list/_vector/positions = list()
 
 	//our result
 	var/list/rayCastHit/hits = list()
@@ -124,12 +124,12 @@
 		distance += step_distance
 
 		//calculating our current position in world space (its two lines cause byond)
-		var/vector/new_position_unfloored = origin + pointer
-		var/vector/new_position = new_position_unfloored.floored()
+		var/_vector/new_position_unfloored = origin + pointer
+		var/_vector/new_position = new_position_unfloored.floored()
 
 		//check if we already checked this (floored) vector
 		var/exists = FALSE
-		for(var/vector/V in positions)
+		for(var/_vector/V in positions)
 			if(V.equals(new_position))
 				exists = TRUE
 		if(exists)
@@ -191,14 +191,14 @@ var/list/ray_draw_icon_cache = list()
 	var/angle = direction.toAngle()
 	var/max_distance = draw_distance - distance_from_endpoint
 	while(distance_pointer < max_distance)
-		var/vector/point
+		var/_vector/point
 		if(distance_pointer > max_distance - step_size) //last loop
 			point = getPoint(max_distance - step_size)
 		else
 			point = getPoint(distance_pointer)
-		var/vector/point_floored = point.floored()
+		var/_vector/point_floored = point.floored()
 
-		var/vector/pixels = (point - point_floored - new /vector(0.5, 0.5)) * WORLD_ICON_SIZE
+		var/_vector/pixels = (point - point_floored - new /_vector(0.5, 0.5)) * WORLD_ICON_SIZE
 
 		var/turf/T = locate(point_floored.x, point_floored.y, z)
 

code/__HELPERS/math/ray/rayCastHit.dm

@@ -1,8 +1,8 @@
 /rayCastHit
 	var/ray/used_ray
 	var/datum/weakref/hit_atom
-	var/vector/point
-	var/vector/point_raw
+	var/_vector/point
+	var/_vector/point_raw
 	var/distance
 	var/hit_type // see defines in ray.dm
 

code/__HELPERS/math/ray/rayCastHitInfo.dm

@@ -1,11 +1,11 @@
 /rayCastHitInfo
 	var/ray/used_ray
 	var/datum/weakref/hit_atom
-	var/vector/point
-	var/vector/point_raw
+	var/_vector/point
+	var/_vector/point_raw
 	var/distance
 
-/rayCastHitInfo/New(var/ray/used_ray, var/datum/weakref/hit_atom, var/vector/point, var/vector/point_raw, var/distance)
+/rayCastHitInfo/New(var/ray/used_ray, var/datum/weakref/hit_atom, var/_vector/point, var/_vector/point_raw, var/distance)
 	src.used_ray = used_ray
 	src.hit_atom = hit_atom
 	src.point = point

code/__HELPERS/math/ray/ray_test_procs.dm

@@ -1,7 +1,7 @@
 
 /proc/raycast_test(var/x = 1, var/y = 1, var/dist)
-	var/vector/origin = new /vector(usr.x, usr.y)
-	var/vector/direction = new /vector(x, y)
+	var/_vector/origin = new /_vector(usr.x, usr.y)
+	var/_vector/direction = new /_vector(x, y)
 
 	var/ray/our_ray = new /ray(origin, direction, usr.z)
 	var/list/res = our_ray.cast(dist)