Merge remote-tracking branch 'upstream/master'

.vscode/launch.json

@@ -7,6 +7,13 @@
       "name": "Launch DreamSeeker",
       "preLaunchTask": "Build All",
       "dmb": "${workspaceFolder}/${command:CurrentDMB}"
+    },
+		{
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamSeeker (TRACY)",
+      "preLaunchTask": "Build All (TRACY)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
     },
     {
       "type": "byond",
@@ -45,6 +52,13 @@
       "preLaunchTask": "Build All (LOWMEMORYMODE)",
       "dmb": "${workspaceFolder}/${command:CurrentDMB}",
       "dreamDaemon": true
+    },
+		{
+      "type": "byond",
+      "request": "launch",
+      "name": "Launch DreamSeeker (LOWMEMORYMODE + TRACY)",
+      "preLaunchTask": "Build All (LOWMEMORYMODE TRACY)",
+      "dmb": "${workspaceFolder}/${command:CurrentDMB}"
     }
   ]
 }

.vscode/tasks.json

@@ -24,6 +24,31 @@
 			"dependsOn": "dm: reparse",
 			"label": "Build All"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"args": [
+				"-DUSE_BYOND_TRACY"
+			],
+			"label": "Build All (TRACY)"
+		},
 		{
 			"type": "process",
 			"command": "tools/build/build",
@@ -74,6 +99,32 @@
 			],
 			"label": "Build All (LOWMEMORYMODE)"
 		},
+		{
+			"type": "process",
+			"command": "tools/build/build",
+			"windows": {
+				"command": ".\\tools\\build\\build.bat"
+			},
+			"options": {
+				"env": {
+					"DM_EXE": "${config:dreammaker.byondPath}"
+				}
+			},
+			"problemMatcher": [
+				"$dreammaker",
+				"$tsc",
+				"$eslint-stylish"
+			],
+			"group": {
+				"kind": "build"
+			},
+			"dependsOn": "dm: reparse",
+			"args": [
+				"-DLOWMEMORYMODE",
+				"-DUSE_BYOND_TRACY"
+			],
+			"label": "Build All (LOWMEMORYMODE TRACY)"
+		},
 		{
 			"type": "dreammaker",
 			"dme": "tgstation.dme",

code/__HELPERS/game.dm

@@ -588,13 +588,11 @@
 	if((character.mind.assigned_role == "Cyborg") || (character.mind.assigned_role == character.mind.special_role) || (character.mind.assigned_role == "Stowaway"))
 		return
 
-	//Skyrat changes
 	var/displayed_rank = rank
-	if(character.client && character.client.prefs && character.client.prefs.alt_titles_preferences[rank])
-		displayed_rank = character.client.prefs.alt_titles_preferences[rank]
+	if(character.client && character.client.prefs && character.client?.prefs?.alt_titles_preferences[rank])
+		displayed_rank = character.client?.prefs?.alt_titles_preferences[rank]
 	var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
 	announcer.announce("ARRIVAL", character.real_name, displayed_rank, list()) //make the list empty to make it announce it in common
-	//End of skyrat changes
 
 /proc/lavaland_equipment_pressure_check(turf/T)
 	. = FALSE

code/_compile_options.dm

@@ -50,6 +50,10 @@
 
 //#define UNIT_TESTS //If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between
 
+// If this is uncommented, will attempt to load and initialize prof.dll/libprof.so.
+// We do not ship byond-tracy. Build it yourself here: https://github.com/mafemergency/byond-tracy/
+//#define USE_BYOND_TRACY
+
 #ifndef PRELOAD_RSC //set to:
 #define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour;
 #endif // 1 to use the default behaviour;

code/controllers/master.dm

@@ -292,7 +292,8 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 		SS.state = SS_IDLE
 		if (SS.flags & SS_TICKER)
 			tickersubsystems += SS
-			timer += world.tick_lag * rand(1, 5)
+			// Timer subsystems aren't allowed to bunch up, so we offset them a bit
+			timer += world.tick_lag * rand(0, 1)
 			SS.next_fire = timer
 			continue
 
@@ -371,14 +372,16 @@ GLOBAL_REAL(Master, /datum/controller/master) = new
 			var/checking_runlevel = current_runlevel
 			if(cached_runlevel != checking_runlevel)
 				//resechedule subsystems
+				var/list/old_subsystems = current_runlevel_subsystems
 				cached_runlevel = checking_runlevel
 				current_runlevel_subsystems = runlevel_sorted_subsystems[cached_runlevel]
-				var/stagger = world.time
-				for(var/I in current_runlevel_subsystems)
-					var/datum/controller/subsystem/SS = I
-					if(SS.next_fire <= world.time)
-						stagger += world.tick_lag * rand(1, 5)
-						SS.next_fire = stagger
+
+				//now we'll go through all the subsystems we want to offset and give them a next_fire
+				for(var/datum/controller/subsystem/SS as anything in current_runlevel_subsystems)
+					//we only want to offset it if it's new and also behind
+					if(SS.next_fire > world.time || (SS in old_subsystems))
+						continue
+					SS.next_fire = world.time + world.tick_lag * rand(0, DS2TICKS(min(SS.wait, 2 SECONDS)))
 
 			subsystems_to_check = current_runlevel_subsystems
 		else

code/controllers/subsystem/job.dm

@@ -477,12 +477,10 @@ SUBSYSTEM_DEF(job)
 			else
 				handle_auto_deadmin_roles(M.client, rank)
 
-	//Skyrat changes
 	var/display_rank = rank
-	if(M.client && M.client.prefs && M.client.prefs.alt_titles_preferences[rank])
-		display_rank = M.client.prefs.alt_titles_preferences[rank]
-	//End of skyrat changes
-	to_chat(M, "<b>You are the [display_rank].</b>") //Skyrat change
+	if(M.client && M.client.prefs && M.client?.prefs?.alt_titles_preferences[rank])
+		display_rank = M.client?.prefs?.alt_titles_preferences[rank]
+	to_chat(M, "<b>You are the [display_rank].</b>")
 	if(job)
 		to_chat(M, "<b>As the [display_rank] you answer directly to [job.supervisors]. Special circumstances may change this.</b>") //Skyrat change
 		job.radio_help_message(M)

code/datums/components/storage/concrete/rped.dm

@@ -1,3 +1,5 @@
+#define MAX_STACK_PICKUP 30
+
 /datum/component/storage/concrete/rped
 	collection_mode = COLLECT_EVERYTHING
 	allow_quick_gather = TRUE
@@ -9,13 +11,61 @@
 	max_items = 100
 	display_numerical_stacking = TRUE
 
+	var/static/list/allowed_material_types = list(
+		/obj/item/stack/sheet/glass,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/cable_coil,
+	)
+
+	var/static/list/allowed_bluespace_types = list(
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/stack/sheet/bluespace_crystal,
+	)
+
 /datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
 	. = ..()
-	if(!I.get_part_rating())
-		if (!stop_messages)
-			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
+	if(!.)
+		return .
+
+	//we check how much of glass,plasteel & cable the user can insert
+	if(isstack(I))
+		//user tried to insert invalid stacktype
+		if(!is_type_in_list(I, allowed_material_types) && !is_type_in_list(I, allowed_bluespace_types))
+			return FALSE
+
+		var/obj/item/stack/the_stack = I
+		var/present_amount = 0
+
+		//we try to count & limit how much the user can insert of each type to prevent them from using it as an normal storage medium
+		for(var/obj/item/stack/stack_content in parent)
+			//is user trying to insert any of these listed bluespace stuff
+			if(is_type_in_list(I, allowed_bluespace_types))
+				//if yes count total bluespace stuff is the RPED and then compare the total amount to the value the user is trying to insert
+				if(is_type_in_list(stack_content, allowed_bluespace_types))
+					present_amount += stack_content.amount
+			//count other normal stack stuff
+			else if(istype(I,stack_content.type))
+				present_amount = stack_content.amount
+				break
+
+		//no more storage for this specific stack type
+		if(MAX_STACK_PICKUP - present_amount == 0)
+			return FALSE
+
+		//we want the user to insert the exact stack amount which is available so we dont have to bother subtracting & leaving left overs for the user
+		var/available = MAX_STACK_PICKUP-present_amount
+		if(available - the_stack.amount < 0)
+			return FALSE
+
+	else if(istype(I, /obj/item/circuitboard/machine) || istype(I, /obj/item/circuitboard/computer))
+		return TRUE
+
+	//check normal insertion of other stock parts
+	else if(!I.get_part_rating())
 		return FALSE
 
+	return .
+
 /datum/component/storage/concrete/rped/quick_empty(mob/M)
 	var/atom/A = parent
 	if(!M.canUseStorage() || !A.Adjacent(M) || M.incapacitated())
@@ -52,13 +102,60 @@
 	max_items = 350
 	display_numerical_stacking = TRUE
 
+	var/static/list/allowed_material_types = list(
+		/obj/item/stack/sheet/glass,
+		/obj/item/stack/sheet/plasteel,
+		/obj/item/stack/cable_coil,
+	)
+
+	var/static/list/allowed_bluespace_types = list(
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/stack/sheet/bluespace_crystal,
+	)
+
 /datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
 	. = ..()
-	if(!I.get_part_rating())
-		if (!stop_messages)
-			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
+	if(!.)
+		return .
+
+	//we check how much of glass,plasteel & cable the user can insert
+	if(isstack(I))
+		//user tried to insert invalid stacktype
+		if(!is_type_in_list(I, allowed_material_types) && !is_type_in_list(I, allowed_bluespace_types))
+			return FALSE
+
+		var/obj/item/stack/the_stack = I
+		var/present_amount = 0
+
+		//we try to count & limit how much the user can insert of each type to prevent them from using it as an normal storage medium
+		for(var/obj/item/stack/stack_content in parent)
+			//is user trying to insert any of these listed bluespace stuff
+			if(is_type_in_list(I, allowed_bluespace_types))
+				//if yes count total bluespace stuff is the RPED and then compare the total amount to the value the user is trying to insert
+				if(is_type_in_list(stack_content, allowed_bluespace_types))
+					present_amount += stack_content.amount
+			//count other normal stack stuff
+			else if(istype(I,stack_content.type))
+				present_amount = stack_content.amount
+				break
+
+		//no more storage for this specific stack type
+		if(MAX_STACK_PICKUP - present_amount == 0)
+			return FALSE
+
+		//we want the user to insert the exact stack amount which is available so we dont have to bother subtracting & leaving left overs for the user
+		var/available = MAX_STACK_PICKUP-present_amount
+		if(available - the_stack.amount < 0)
+			return FALSE
+
+	else if(istype(I, /obj/item/circuitboard/machine) || istype(I, /obj/item/circuitboard/computer))
+		return TRUE
+
+	//check normal insertion of other stock parts
+	else if(!I.get_part_rating())
 		return FALSE
 
+	return .
 
 /datum/component/storage/concrete/bluespace/rped/quick_empty(mob/M)
 	var/atom/A = parent
@@ -85,3 +182,5 @@
 		stoplag(1)
 	progress.end_progress()
 	A.do_squish(0.8, 1.2)
+
+#undef MAX_STACK_PICKUP

code/datums/datacore.dm

@@ -142,16 +142,18 @@
 	var/static/list/show_directions = list(SOUTH, WEST)
 	if(H.mind && (H.mind.assigned_role != H.mind.special_role)  && (H.mind.assigned_role != "Stowaway"))
 		var/assignment
+		var/displayed_rank
 		if(H.mind.assigned_role)
 			assignment = H.mind.assigned_role
 		else if(H.job)
 			assignment = H.job
 		else
 			assignment = "Unassigned"
-		//Skyrat changes
-		if(C && C.prefs && C.prefs.alt_titles_preferences[assignment])
-			assignment = C.prefs.alt_titles_preferences[assignment]
-		//End of skyrat changes
+			if(C && C.prefs && C.prefs.alt_titles_preferences[assignment])
+				assignment = C.prefs.alt_titles_preferences[assignment]
+
+		if(assignment)
+			displayed_rank = C.prefs.alt_titles_preferences[assignment]
 
 		var/static/record_id_num = 1001
 		var/id = num2hex(record_id_num++,6)
@@ -174,7 +176,7 @@
 		var/datum/data/record/G = new()
 		G.fields["id"]			= id
 		G.fields["name"]		= H.real_name
-		G.fields["rank"]		= assignment
+		G.fields["rank"]		= displayed_rank
 		G.fields["age"]			= H.age
 		G.fields["species"]	= H.dna.species.name
 		G.fields["fingerprint"]	= md5(H.dna.uni_identity)
@@ -221,7 +223,7 @@
 		var/datum/data/record/L = new()
 		L.fields["id"]			= md5("[H.real_name][H.mind.assigned_role]")	//surely this should just be id, like the others?
 		L.fields["name"]		= H.real_name
-		L.fields["rank"] 		= H.mind.assigned_role
+		L.fields["rank"] 		= displayed_rank
 		L.fields["age"]			= H.age
 		if(H.gender == MALE)
 			G.fields["gender"]  = "Male"

code/datums/emotes.dm

@@ -63,12 +63,13 @@
 	//msg = "<b>[user]</b> " + msg //SKYRAT CHANGE
 	var/dchatmsg = "<span class='emote'><b>[user]</b> [msg]</span>" //SKYRAT CHANGE
 
-	for(var/mob/M in GLOB.dead_mob_list)
-		if(!M.client || isnewplayer(M))
-			continue
-		var/T = get_turf(user)
-		if(M.stat == DEAD && M.client && (M.client.prefs && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT)) && !(M in viewers(T, null)) && (user.client)) //SKYRAT CHANGE - only user controlled mobs show their emotes to all-seeing ghosts, to reduce chat spam
-			M.show_message(dchatmsg) //SKYRAT CHANGE
+	if(user.client)
+		for(var/mob/M in GLOB.dead_mob_list)
+			if(!M.client || isnewplayer(M))
+				continue
+			var/T = get_turf(user)
+			if(M.stat == DEAD && M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(M in viewers(T, null)))
+				M.show_message(dchatmsg)
 
 	if(emote_type == EMOTE_AUDIBLE)
 		user.audible_message(dchatmsg, runechat_popup = chat_popup, rune_msg = msg)