From ee53c92a9704afcb318fb1e7975affd7110ed67a Mon Sep 17 00:00:00 2001 From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> Date: Wed, 21 Jun 2023 02:25:06 -0600 Subject: [PATCH] [NO GBP] Fixes papercutter's Exited() proc (#76153) ## About The Pull Request #76131 was merged instead of drafted when asking for this change Look at this the items get removed right yippee yahoo ![dreamseeker_RJx37zbvzN](https://github.com/tgstation/tgstation/assets/76465278/e68e11d7-212e-42de-baf9-01890b1955ad) ## Why It's Good For The Game ~~maintainer told me to~~ Makes removing stuff from the cutter actually work right ## Changelog No player-facing changes --- code/modules/paperwork/paper_cutter.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 4e467a2501d..ab7c4b2b537 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -71,12 +71,12 @@ if(!isnull(stored_blade)) stored_blade.forceMove(drop_location()) -/obj/item/papercutter/Exited(atom/movable/leaving, direction) +/obj/item/papercutter/Exited(atom/movable/leaving, atom/new_loc) + . = ..() if(leaving == stored_paper) stored_paper = null if(leaving == stored_blade) stored_blade = null - return ..() /obj/item/papercutter/suicide_act(mob/living/user) if(iscarbon(user) && stored_blade)