display_parts() no longer displays itself.

NebulaSS13 · Feb 9, 2025 · e821679 · e821679
1 parent 14d7f0c
commit e821679
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/code/game/machinery/_machines_base/machine_construction/airlock.dm b/code/game/machinery/_machines_base/machine_construction/airlock.dm
@@ -21,7 +21,8 @@
 		var/obj/item/part_replacer/replacer = I
 		if(replacer.remote_interaction)
 			machine.part_replacement(user, replacer)
-		machine.display_parts(user, show_directly = TRUE)
+		for(var/line in machine.get_part_info_strings(user))
+			to_chat(user, line)
 		return TRUE
 	return FALSE
 

diff --git a/code/game/machinery/_machines_base/machine_construction/default.dm b/code/game/machinery/_machines_base/machine_construction/default.dm
@@ -35,7 +35,8 @@
 		var/obj/item/part_replacer/replacer = I
 		if(replacer.remote_interaction)
 			machine.part_replacement(user, replacer)
-		machine.display_parts(user, show_directly = TRUE)
+		for(var/line in machine.get_part_info_strings(user))
+			to_chat(user, line)
 		return TRUE
 	return FALSE
 

diff --git a/code/game/machinery/_machines_base/machine_construction/wall_frame.dm b/code/game/machinery/_machines_base/machine_construction/wall_frame.dm
@@ -32,7 +32,8 @@
 		var/obj/item/part_replacer/replacer = I
 		if(replacer.remote_interaction)
 			machine.part_replacement(user, replacer)
-		machine.display_parts(user, show_directly = TRUE)
+		for(var/line in machine.get_part_info_strings(user))
+			to_chat(user, line)
 		return TRUE
 	return down_interaction(I, user, machine)
 

diff --git a/code/game/machinery/_machines_base/machinery.dm b/code/game/machinery/_machines_base/machinery.dm
@@ -403,7 +403,7 @@ Class Procs:
 /datum/proc/remove_visual(mob/M)
 	return
 
-/obj/machinery/proc/display_parts(mob/user, show_directly)
+/obj/machinery/proc/get_part_info_strings(mob/user)
 	. = list()
 	. += SPAN_NOTICE("The following parts are detected in \the [src]:")
 	for(var/obj/item/C in component_parts)
@@ -416,13 +416,11 @@ Class Procs:
 	for(var/path in uncreated_component_parts)
 		var/obj/item/thing = path
 		. += SPAN_NOTICE("	[initial(thing.name)] ([uncreated_component_parts[path] || 1])")
-	if(length(.) && show_directly)
-		to_chat(user, jointext(., "<br/>"))
 
 /obj/machinery/get_examine_strings(mob/user, distance, infix, suffix)
 	. = ..()
 	if(component_parts && (hasHUD(user, HUD_SCIENCE) || (construct_state && construct_state.visible_components)))
-		. += display_parts(user)
+		. += get_part_info_strings(user)
 	if(stat & NOSCREEN)
 		. += SPAN_WARNING("It is missing a screen, making it hard to interact with.")
 	else if(stat & NOINPUT)