Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…

…to shiptouchup
shiptest-ss13 · Dec 8, 2023 · a76a572 · a76a572
2 parents f05431a + 89b2647
commit a76a572
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
@@ -148,11 +148,11 @@
 	. = ..()
 	if(istype(I, /obj/item/clothing/glasses/eyepatch))
 		var/obj/item/clothing/glasses/eyepatch/old_patch = I
-		var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new/obj/item/clothing/glasses/blindfold/eyepatch
-		double_patch.forceMove(user.drop_location())
+		var/obj/item/clothing/glasses/blindfold/eyepatch/double_patch = new()
 		to_chat(user, "<span class='notice'>You combine the eyepatches with a knot.</span>")
-		old_patch.Destroy()
-		Destroy()
+		qdel(old_patch)
+		qdel(src)
+		user.put_in_hands(double_patch)
 
 /obj/item/clothing/glasses/monocle
 	name = "monocle"

diff --git a/html/changelogs/AutoChangeLog-pr-2576.yml b/html/changelogs/AutoChangeLog-pr-2576.yml
@@ -0,0 +1,5 @@
+author: MarkSuckerberg
+changes:
+  - {tweak: Combining eyepatches should now try to put the result into your hands
+      afterwards}
+delete-after: true