Skip to content

Commit

Permalink
Fixes improper call of Destroy() (#2576)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

me when the maintainers don't catch this. smh

(i'm maintainers)

## Why It's Good For The Game

makes it actually delete

## Changelog

:cl:
tweak: Combining eyepatches should now try to put the result into your
hands afterwards
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
MarkSuckerberg authored Dec 8, 2023
1 parent 7fb9c9c commit 01edcc5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 01edcc5

Please sign in to comment.