Merge branch 'SPLURT-Station:master' into Snaxi-regretti

code/game/machinery/announcement_system.dm

@@ -17,9 +17,9 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	circuit = /obj/item/circuitboard/machine/announcement_system
 
 	var/obj/item/radio/headset/radio
-	var/arrival = "%PERSON has signed up as %RANK"
+	var/arrival = "%PERSON has signed up as %DISP_RANK (%RANK)"
 	var/arrivalToggle = TRUE
-	var/newhead = "%PERSON, %RANK, is the department head."
+	var/newhead = "%PERSON, %DISP_RANK (%RANK), is the department head."
 	var/newheadToggle = TRUE
 	var/cryostorage = "%PERSON, %RANK, has been moved into cryogenic storage." // this shouldnt be changed
 	var/cryostorage_tele = "%PERSON, %RANK, has been teleported to CentCom."   // you saying it hat man.
@@ -71,12 +71,13 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 	else
 		return ..()
 
-/obj/machinery/announcement_system/proc/CompileText(str, user, rank) //replaces user-given variables with actual thingies.
+/obj/machinery/announcement_system/proc/CompileText(str, user, rank, displayed_rank) //replaces user-given variables with actual thingies.
 	str = replacetext(str, "%PERSON", "[user]")
 	str = replacetext(str, "%RANK", "[rank]")
+	str = replacetext(str, "%DISP_RANK", "[displayed_rank]")
 	return str
 
-/obj/machinery/announcement_system/proc/announce(message_type, user, rank, list/channels)
+/obj/machinery/announcement_system/proc/announce(message_type, user, rank, displayed_rank, list/channels)
 	if(!is_operational())
 		return
 
@@ -87,13 +88,13 @@ GLOBAL_LIST_EMPTY(announcement_systems)
 		rank = "Unknown"
 
 	if(message_type == "ARRIVAL" && arrivalToggle)
-		message = CompileText(arrival, user, rank)
+		message = CompileText(arrival, user, rank, displayed_rank)
 	else if(message_type == "NEWHEAD" && newheadToggle)
-		message = CompileText(newhead, user, rank)
+		message = CompileText(newhead, user, rank, displayed_rank)
 	else if(message_type == "CRYOSTORAGE")
-		message = CompileText(cryostorage, user, rank)
+		message = CompileText(cryostorage, user, rank, displayed_rank)
 	else if(message_type == "CRYOSTORAGE_TELE")
-		message = CompileText(cryostorage_tele, user, rank)
+		message = CompileText(cryostorage_tele, user, rank, displayed_rank)
 	else if(message_type == "ARRIVALS_BROKEN")
 		message = "The arrivals shuttle has been damaged. Docking for repairs..."
 

code/game/machinery/cryopod.dm

@@ -404,7 +404,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
 	// Make an announcement and log the person entering storage.
 	if(GLOB.announcement_systems.len)
 		var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
-		announcer.announce(is_teleporter ? "CRYOSTORAGE_TELE" : "CRYOSTORAGE", mob_occupant.real_name, announce_rank, list())
+		announcer.announce(is_teleporter ? "CRYOSTORAGE_TELE" : "CRYOSTORAGE", mob_occupant.real_name, announce_rank, announce_rank, list())
 
 	if (pod)
 		pod.visible_message(span_notice("\The [pod] hums and hisses as it [is_teleporter ? "teleports" : "moves"] [mob_occupant.real_name] [is_teleporter ? "to centcom" : "into storage"]."))

code/game/objects/items/cigs_lighters.dm

@@ -560,6 +560,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	. += lighter_overlay
 
 /obj/item/lighter/ignition_effect(atom/A, mob/user)
+	playsound(src, 'modular_sand/sound/items/lighter/light.ogg', 50, 0)
 	if(get_temperature())
 		. = "<span class='rose'>With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"
 
@@ -583,6 +584,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 /obj/item/lighter/attack_self(mob/living/user)
 	if(user.is_holding(src))
 		if(!lit)
+			// SANDSTORM EDIT
+			playsound(src, 'modular_sand/sound/items/lighter/open.ogg', 50, 0)
+			// End of edit
 			set_lit(TRUE)
 			if(fancy)
 				user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "<span class='notice'>Without even breaking stride, you flip open and light [src] in one smooth movement.</span>")
@@ -606,6 +610,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 					SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "burnt_thumb", /datum/mood_event/burnt_thumb)
 
 		else
+			// SANDSTORM EDIT
+			playsound(src, 'modular_sand/sound/items/lighter/close.ogg', 50, 0)
+			// Edit end
 			set_lit(FALSE)
 			if(fancy)
 				user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "<span class='notice'>You quietly shut off [src] without even looking at what you're doing. Wow.</span>")

code/game/world.dm

@@ -13,6 +13,12 @@ GLOBAL_LIST(topic_status_cache)
 	if (dll)
 		LIBCALL(dll, "auxtools_init")()
 		enable_debugging()
+
+#ifdef USE_BYOND_TRACY
+	#warn USE_BYOND_TRACY is enabled
+	init_byond_tracy()
+#endif
+
 	world.Profile(PROFILE_START)
 	log_world("World loaded at [TIME_STAMP("hh:mm:ss", FALSE)]!")
 
@@ -378,19 +384,18 @@ GLOBAL_LIST(topic_status_cache)
 /world/proc/on_tickrate_change()
 	SStimer?.reset_buckets()
 
-#ifdef TRACY_PROFILING
-/proc/prof_init()
-	var/lib
+/world/proc/init_byond_tracy()
+	var/library
 
-	switch(world.system_type)
-		if(MS_WINDOWS) lib = "prof.dll"
-		if(UNIX) lib = "libprof.so"
-		else CRASH("unsupported platform")
+	switch (system_type)
+		if (MS_WINDOWS)
+			library = "prof.dll"
+		if (UNIX)
+			library = "libprof.so"
+		else
+			CRASH("Unsupported platform: [system_type]")
 
-	var/init = LIBCALL(lib, "init")()
-	if("0" != init) CRASH("[lib] init error: [init]")
+	var/init_result = call_ext(library, "init")("block")
+	if (init_result != "0")
+		CRASH("Error initializing byond-tracy: [init_result]")
 
-/world/New()
-	prof_init()
-	. = ..()
-#endif