[MIRROR] Refactors photocopiers and fixes some bugs with them. [MDB IGNORE] (#19428)

* Refactors photocopiers and fixes some bugs with them. (#73316) ## About The Pull Request I set out today to fix a bug with photocopiers, I couldn't replicate the bug but instead found two more and removed a bunch of duplicate code. Fixes being able to print blanks despite having no money to print them. Fixes paperwork not being removed from the photocopier when mounting it. ## Why It's Good For The Game duplicate code bad, bug fixes good. ## Changelog 🆑 fix: You cannot print blank documents from a photocopier if you cannot afford them anymore. fix: Mounting the photocopier will now eject paperwork as it does with photos and paper. refactor: Lots of duplicate code and some unnecessary vars removed from photocopier code. /🆑 * Refactors photocopiers and fixes some bugs with them. --------- Co-authored-by: NamelessFairy <40036527+NamelessFairy@users.noreply.github.com>
2026-07-14 17:45:02 +01:00 · 2023-02-19 03:46:16 +01:00
parent 0bfae9d0ee
commit 11e5ff08b9
1 changed files with 99 additions and 147 deletions
@@ -12,11 +12,12 @@
 #define DOCUMENT_TONER_USE 0.75
 /// How much toner is used for making a copy of an ass.
 #define ASS_TONER_USE 0.625
-/// The maximum amount of copies you can make with one press of the copy button.
-#define MAX_COPIES_AT_ONCE 10
 /// How much toner is used for making a copy of paperwork
 #define PAPERWORK_TONER_USE 0.75

+/// The maximum amount of copies you can make with one press of the copy button.
+#define MAX_COPIES_AT_ONCE 10
+
 /obj/machinery/photocopier
 	name = "photocopier"
 	desc = "Used to copy important documents and anatomy studies."
@@ -26,18 +27,10 @@
 	power_channel = AREA_USAGE_EQUIP
 	max_integrity = 300
 	integrity_failure = 0.33
-	/// A reference to an `/obj/item/paper` inside the copier, if one is inserted. Otherwise null.
-	var/obj/item/paper/paper_copy
-	/// A reference to an `/obj/item/photo` inside the copier, if one is inserted. Otherwise null.
-	var/obj/item/photo/photo_copy
-	/// A reference to an `/obj/item/documents` inside the copier, if one is inserted. Otherwise null.
-	var/obj/item/documents/document_copy
 	/// A reference to a mob on top of the photocopier trying to copy their ass. Null if there is no mob.
 	var/mob/living/ass
 	/// A reference to the toner cartridge that's inserted into the copier. Null if there is no cartridge.
 	var/obj/item/toner/toner_cartridge
-	/// A reference to an `/obj/item/paperwork` inside the copier, if one is inserted. Otherwise null.
-	var/obj/item/paperwork/paperwork_copy
 	/// How many copies will be printed with one click of the "copy" button.
 	var/num_copies = 1
 	/// Used with photos. Determines if the copied photo will be in greyscale or color.
@@ -46,6 +39,8 @@
 	var/busy = FALSE
 	/// Variable needed to determine the selected category of forms on Photocopier.js
 	var/category
+	///Variable that holds a reference to any object supported for photocopying inside the photocopier
+	var/obj/object_copy

 /obj/machinery/photocopier/Initialize(mapload)
 	. = ..()
@@ -53,25 +48,17 @@
 	toner_cartridge = new(src)

 /obj/machinery/photocopier/handle_atom_del(atom/deleting_atom)
-	if(deleting_atom == paper_copy)
-		paper_copy = null
-	if(deleting_atom == photo_copy)
-		photo_copy = null
-	if(deleting_atom == document_copy)
-		document_copy = null
+	if(deleting_atom == object_copy)
+		object_copy = null
 	if(deleting_atom == ass)
 		ass = null
 	if(deleting_atom == toner_cartridge)
 		toner_cartridge = null
-	if(deleting_atom == paperwork_copy)
-		paperwork_copy = null
 	return ..()

 /obj/machinery/photocopier/Destroy()
-	QDEL_NULL(paper_copy)
-	QDEL_NULL(photo_copy)
+	QDEL_NULL(object_copy)
 	QDEL_NULL(toner_cartridge)
-	QDEL_NULL(paperwork_copy)
 	ass = null //the mob isn't actually contained and just referenced, no need to delete it.
 	return ..()

@@ -98,7 +85,7 @@
 	catch()
 		data["forms_exist"] = FALSE

-	if(photo_copy)
+	if(istype(object_copy, /obj/item/photo))
 		data["is_photo"] = TRUE
 		data["color_mode"] = color_mode

@@ -127,56 +114,46 @@
 	switch(action)
 		// Copying paper, photos, documents and asses.
 		if("make_copy")
-			if(busy)
-				to_chat(usr, span_warning("[src] is currently busy copying something. Please wait until it is finished."))
+			if(check_busy(usr))
 				return FALSE
-			if(paper_copy)
-				if(!paper_copy.get_total_length())
-					to_chat(usr, span_warning("An error message flashes across [src]'s screen: \"The supplied paper is blank. Aborting.\""))
-					return FALSE
-				// Basic paper
-				if(istype(paper_copy, /obj/item/paper))
-					do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy)), usr)
-					return TRUE
-			// Copying photo.
-			if(photo_copy)
-				do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy)), usr)
-				return TRUE
-			// Copying Documents.
-			if(document_copy)
-				do_copy_loop(CALLBACK(src, PROC_REF(make_document_copy)), usr)
-				return TRUE
 			// ASS COPY. By Miauw
 			if(ass)
-				do_copy_loop(CALLBACK(src, PROC_REF(make_ass_copy)), usr)
-				return TRUE
-			// Copying paperwork
-			if(paperwork_copy)
-				do_copy_loop(CALLBACK(src, PROC_REF(make_paperwork_copy)), usr)
+				do_copy_loop(CALLBACK(src, PROC_REF(make_ass_copy), usr), usr)
 				return TRUE
+			else
+				if(istype(object_copy, /obj/item/paper))
+					var/obj/item/paper/paper_copy = object_copy
+					if(!paper_copy.get_total_length())
+						to_chat(usr, span_warning("An error message flashes across [src]'s screen: \"The supplied paper is blank. Aborting.\""))
+						return FALSE
+					// Basic paper
+					do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy), paper_copy), usr)
+					return TRUE
+				// Copying photo.
+				if(istype(object_copy, /obj/item/photo))
+					do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy), object_copy), usr)
+					return TRUE
+				// Copying Documents.
+				if(istype(object_copy, /obj/item/documents))
+					do_copy_loop(CALLBACK(src, PROC_REF(make_document_copy), object_copy), usr)
+					return TRUE
+				// Copying paperwork
+				if(istype(object_copy, /obj/item/paperwork))
+					do_copy_loop(CALLBACK(src, PROC_REF(make_paperwork_copy), object_copy), usr)
+					return TRUE

 		// Remove the paper/photo/document from the photocopier.
 		if("remove")
-			if(paper_copy)
-				remove_photocopy(paper_copy, usr)
-				paper_copy = null
-			else if(photo_copy)
-				remove_photocopy(photo_copy, usr)
-				photo_copy = null
-			else if(document_copy)
-				remove_photocopy(document_copy, usr)
-				document_copy = null
+			if(object_copy)
+				remove_photocopy(object_copy, usr)
+				object_copy = null
 			else if(check_ass())
 				to_chat(ass, span_notice("You feel a slight pressure on your ass."))
-			else if(paperwork_copy)
-				remove_photocopy(paperwork_copy, usr)
-				paperwork_copy = null
 			return TRUE

 		// AI printing photos from their saved images.
 		if("ai_photo")
-			if(busy)
-				to_chat(usr, span_warning("[src] is currently busy copying something. Please wait until it is finished."))
+			if(check_busy(usr))
 				return FALSE
 			var/mob/living/silicon/ai/tempAI = usr
 			if(!length(tempAI.aicamera.stored))
@@ -196,8 +173,7 @@

 		// Remove the toner cartridge from the copier.
 		if("remove_toner")
-			if(busy)
-				to_chat(usr, span_warning("[src] is currently busy copying something. Please wait until it is finished."))
+			if(check_busy(usr))
 				return
 			var/success = usr.put_in_hands(toner_cartridge)
 			if(!success)
@@ -216,38 +192,30 @@
 			return TRUE
 		// Called when you press print blank
 		if("print_blank")
-			if(busy)
-				to_chat(usr, span_warning("[src] is currently busy copying something. Please wait until it is finished."))
+			if(check_busy(usr))
 				return FALSE
 			if (toner_cartridge.charges - PAPER_TONER_USE < 0)
 				to_chat(usr, span_warning("There is not enough toner in [src] to print the form, please replace the cartridge."))
 				return FALSE
-			do_copy_loop(CALLBACK(src, PROC_REF(make_blank_print)), usr)
-			var/obj/item/paper/printblank = new /obj/item/paper (loc)
-			var/printname = sanitize(params["name"])
-			var/list/printinfo
-			for(var/infoline as anything in params["info"])
-				printinfo += infoline
-			printblank.name = printname
-			printblank.add_raw_text(printinfo)
-			printblank.update_appearance()
-			return printblank
+			do_copy_loop(CALLBACK(src, PROC_REF(make_blank_print), params), usr)
+			return TRUE

 /**
 * Determines if the photocopier has enough toner to create `num_copies` amount of copies of the currently inserted item.
 */
 /obj/machinery/photocopier/proc/has_enough_toner()
-	if(paper_copy)
-		return toner_cartridge.charges >= (PAPER_TONER_USE * num_copies)
-	else if(document_copy)
-		return toner_cartridge.charges >= (DOCUMENT_TONER_USE * num_copies)
-	else if(photo_copy)
-		return toner_cartridge.charges >= (PHOTO_TONER_USE * num_copies)
-	else if(ass)
+	if(ass)
 		return toner_cartridge.charges >= (ASS_TONER_USE * num_copies)
-	else if(paperwork_copy)
+	if(isnull(object_copy))
+		return FALSE
+	if(istype(object_copy, /obj/item/paper))
+		return toner_cartridge.charges >= (PAPER_TONER_USE * num_copies)
+	if(istype(object_copy, /obj/item/documents))
+		return toner_cartridge.charges >= (DOCUMENT_TONER_USE * num_copies)
+	if(istype(object_copy, /obj/item/photo))
+		return toner_cartridge.charges >= (PHOTO_TONER_USE * num_copies)
+	if(istype(object_copy, /obj/item/paperwork))
 		return toner_cartridge.charges >= (PAPERWORK_TONER_USE * num_copies)
-	return FALSE

 /**
 * Will invoke the passed in `copy_cb` callback in 1 second intervals, and charge the user 5 credits for each copy made.
@@ -276,6 +244,13 @@
 	update_use_power(IDLE_POWER_USE)
 	busy = FALSE

+/obj/machinery/photocopier/proc/check_busy(mob/user)
+	if(busy)
+		to_chat(user, span_warning("[src] is currently busy copying something. Please wait until it is finished."))
+		return TRUE
+	return FALSE
+
+
 /**
 * Gives items a random x and y pixel offset, between -10 and 10 for each.
 *
@@ -293,7 +268,7 @@
 *
 * Checks first if `paper_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
 */
-/obj/machinery/photocopier/proc/make_paper_copy()
+/obj/machinery/photocopier/proc/make_paper_copy(obj/item/paper/paper_copy)
 	if(!paper_copy || !toner_cartridge)
 		return

@@ -312,7 +287,7 @@
 *
 * Checks first if `photo_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
 */
-/obj/machinery/photocopier/proc/make_photo_copy()
+/obj/machinery/photocopier/proc/make_photo_copy(obj/item/photo/photo_copy)
 	if(!photo_copy || !toner_cartridge)
 		return
 	var/obj/item/photo/copied_pic = new(loc, photo_copy.picture.Copy(color_mode == PHOTO_GREYSCALE ? TRUE : FALSE))
@@ -324,7 +299,7 @@
 *
 * Checks first if `document_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
 */
-/obj/machinery/photocopier/proc/make_document_copy()
+/obj/machinery/photocopier/proc/make_document_copy(obj/item/documents/document_copy)
 	if(!document_copy || !toner_cartridge)
 		return
 	var/obj/item/documents/photocopy/copied_doc = new(loc, document_copy)
@@ -337,7 +312,7 @@
 * Checks first if `paperwork_copy` exists. Since this proc is called from a timer, it's possible that it was removed.
 * Copies the stamp from a given piece of paperwork if it is already stamped, allowing for you to sell photocopied paperwork at the risk of losing budget money.
 */
-/obj/machinery/photocopier/proc/make_paperwork_copy()
+/obj/machinery/photocopier/proc/make_paperwork_copy(obj/item/paperwork/paperwork_copy)
 	if(!paperwork_copy || !toner_cartridge)
 		return
 	var/obj/item/paperwork/photocopy/copied_paperwork = new(loc, paperwork_copy)
@@ -351,9 +326,17 @@
 /**
 * The procedure is called when printing a blank to write off toner consumption.
 */
-/obj/machinery/photocopier/proc/make_blank_print()
+/obj/machinery/photocopier/proc/make_blank_print(params)
 	if(!toner_cartridge)
 		return
+	var/obj/item/paper/printblank = new(loc)
+	var/printname = sanitize(params["name"])
+	var/list/printinfo
+	for(var/infoline in params["info"])
+		printinfo += infoline
+	printblank.name = printname
+	printblank.add_raw_text(printinfo)
+	printblank.update_appearance()
 	toner_cartridge.charges -= PAPER_TONER_USE

 /**
@@ -362,11 +345,11 @@
 * Calls `check_ass()` first to make sure that `ass` exists, among other conditions. Since this proc is called from a timer, it's possible that it was removed.
 * Additionally checks that the mob has their clothes off.
 */
-/obj/machinery/photocopier/proc/make_ass_copy()
+/obj/machinery/photocopier/proc/make_ass_copy(mob/user)
 	if(!check_ass() || !toner_cartridge)
 		return
 	if(ishuman(ass) && (ass.get_item_by_slot(ITEM_SLOT_ICLOTHING) || ass.get_item_by_slot(ITEM_SLOT_OCLOTHING)))
-		to_chat(usr, span_notice("You feel kind of silly, copying [ass == usr ? "your" : ass][ass == usr ? "" : "\'s"] ass with [ass == usr ? "your" : "[ass.p_their()]"] clothes on.") )
+		to_chat(user, span_notice("You feel kind of silly, copying [ass == user ? "your" : ass][ass == user ? "" : "\'s"] ass with [ass == user ? "your" : "[ass.p_their()]"] clothes on.") )
 		return

 	var/icon/temp_img
@@ -427,56 +410,35 @@
 	default_unfasten_wrench(user, tool)
 	return TOOL_ACT_TOOLTYPE_SUCCESS

-/obj/machinery/photocopier/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/paper))
-		if(copier_empty())
-			if(!user.temporarilyRemoveItemFromInventory(O))
-				return
-			paper_copy = O
-			do_insertion(O, user)
-		else
-			to_chat(user, span_warning("There is already something in [src]!"))
+/obj/machinery/photocopier/attackby(obj/item/object, mob/user, params)
+	if(istype(object, /obj/item/paper) || istype(object, /obj/item/photo) || istype(object, /obj/item/documents))
+		insert_copy_object(object, user)

-	else if(istype(O, /obj/item/photo))
-		if(copier_empty())
-			if(!user.temporarilyRemoveItemFromInventory(O))
-				return
-			photo_copy = O
-			do_insertion(O, user)
-		else
-			to_chat(user, span_warning("There is already something in [src]!"))
-
-	else if(istype(O, /obj/item/documents))
-		if(copier_empty())
-			if(!user.temporarilyRemoveItemFromInventory(O))
-				return
-			document_copy = O
-			do_insertion(O, user)
-		else
-			to_chat(user, span_warning("There is already something in [src]!"))
-
-	else if(istype(O, /obj/item/toner))
+	else if(istype(object, /obj/item/toner))
 		if(toner_cartridge)
 			to_chat(user, span_warning("[src] already has a toner cartridge inserted. Remove that one first."))
 			return
-		O.forceMove(src)
-		toner_cartridge = O
-		to_chat(user, span_notice("You insert [O] into [src]."))
+		object.forceMove(src)
+		toner_cartridge = object
+		to_chat(user, span_notice("You insert [object] into [src]."))

-	else if(istype(O, /obj/item/areaeditor/blueprints))
+	else if(istype(object, /obj/item/areaeditor/blueprints))
 		to_chat(user, span_warning("The Blueprint is too large to put into the copier. You need to find something else to record the document."))
-	else if(istype(O, /obj/item/paperwork))
-		if(copier_empty())
-			if(istype(O, /obj/item/paperwork/photocopy)) //No infinite paper chain. You need the original paperwork to make more copies.
-				to_chat(user, span_warning("The [O] is far too messy to produce a good copy!"))
-			else
-				if(!user.temporarilyRemoveItemFromInventory(O))
-					return
-				paperwork_copy = O
-				do_insertion(O, user)
+
+	else if(istype(object, /obj/item/paperwork))
+		if(istype(object, /obj/item/paperwork/photocopy)) //No infinite paper chain. You need the original paperwork to make more copies.
+			to_chat(user, span_warning("The [object] is far too messy to produce a good copy!"))
 		else
-			to_chat(user, span_warning("There is already something in [src]!"))
-		return ..()
+			insert_copy_object(object, user)
+
+/obj/machinery/photocopier/proc/insert_copy_object(obj/item/object, mob/user)
+	if(copier_empty())
+		if(!user.temporarilyRemoveItemFromInventory(object))
+			return
+		object_copy = object
+		do_insertion(object, user)
+	else
+		to_chat(user, span_warning("There is already something in [src]!"))

 /obj/machinery/photocopier/atom_break(damage_flag)
 	. = ..()
@@ -506,20 +468,10 @@
 		target.forceMove(drop_location())
 		ass = target

-		if(photo_copy)
-			photo_copy.forceMove(drop_location())
-			visible_message(span_warning("[photo_copy] is shoved out of the way by [ass]!"))
-			photo_copy = null
-
-		else if(paper_copy)
-			paper_copy.forceMove(drop_location())
-			visible_message(span_warning("[paper_copy] is shoved out of the way by [ass]!"))
-			paper_copy = null
-
-		else if(document_copy)
-			document_copy.forceMove(drop_location())
-			visible_message(span_warning("[document_copy] is shoved out of the way by [ass]!"))
-			document_copy = null
+		if(!isnull(object_copy))
+			object_copy.forceMove(drop_location())
+			visible_message(span_warning("[object_copy] is shoved out of the way by [ass]!"))
+			object_copy = null

 /obj/machinery/photocopier/Exited(atom/movable/gone, direction)
 	check_ass() // There was potentially a person sitting on the copier, check if they're still there.
@@ -559,7 +511,7 @@
 * Return `FALSE` is the copier has something inside of it. Returns `TRUE` if it doesn't.
 */
 /obj/machinery/photocopier/proc/copier_empty()
-	if(paper_copy || photo_copy || document_copy || check_ass() || paperwork_copy)
+	if(object_copy || check_ass())
 		return FALSE
 	else
 		return TRUE