Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-23-10-2025

code/modules/paperwork/folders.dm

@@ -6,6 +6,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	pressure_resistance = 2
 	resistance_flags = FLAMMABLE
+	obj_flags = UNIQUE_RENAME | RENAME_NO_DESC
 	/// The background color for tgui in hex (with a `#`)
 	var/bg_color = "#7f7f7f"
 	/// A typecache of the objects that can be inserted into a folder
@@ -94,8 +95,6 @@
 /obj/item/folder/item_interaction(mob/living/user, obj/item/tool, list/modifiers)
 	if(is_type_in_typecache(tool, folder_insertables))
 		return insertables_act(user, tool)
-	if(IS_WRITING_UTENSIL(tool))
-		return writing_utensil_act(user, tool)
 	if(tool.tool_behaviour == TOOL_KNIFE || tool.tool_behaviour == TOOL_WIRECUTTER)
 		return sharp_thing_act(user, tool)
 	return NONE
@@ -106,20 +105,10 @@
 	update_appearance()
 	return ITEM_INTERACT_SUCCESS
 
-/obj/item/folder/proc/writing_utensil_act(mob/user, obj/item/writing_instrument)
-	if(!user.can_write(writing_instrument))
-		return ITEM_INTERACT_BLOCKING
-
-	var/inputvalue = tgui_input_text(user, "What would you like to label the folder?", "Folder Labelling", max_length = MAX_NAME_LEN)
-
-	if(!inputvalue)
-		return ITEM_INTERACT_BLOCKING
-	if(!user.can_perform_action(src))
-		return ITEM_INTERACT_BLOCKING
-
-	name = "folder[(inputvalue ? " - '[inputvalue]'" : null)]"
+/obj/item/folder/nameformat(input, user)
 	playsound(src, SFX_WRITING_PEN, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, SOUND_FALLOFF_EXPONENT + 3, ignore_walls = FALSE)
-	return ITEM_INTERACT_SUCCESS
+	return"folder[(input ? " - '[input]'" : null)]"
+
 
 /obj/item/folder/proc/sharp_thing_act(mob/user, obj/item/sharp_tool)
 	if(contents.len)

code/modules/paperwork/ticketmachine.dm

@@ -31,7 +31,8 @@
 /obj/machinery/ticket_machine/Initialize(mapload)
 	. = ..()
 	update_appearance()
-	find_and_hang_on_wall()
+	if(mapload)
+		find_and_hang_on_wall()
 
 /obj/machinery/ticket_machine/Destroy()
 	for(var/obj/item/ticket_machine_ticket/ticket in tickets)