From 77fddc4e69d35cad7f84dd92f054b7ef35141dc2 Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 7 Jun 2017 14:11:03 -0400 Subject: [PATCH] does the thing --- code/modules/paperwork/paper.dm | 8 ++++++++ code/modules/paperwork/photography.dm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index f985099219d..8637f78f692 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -52,6 +52,14 @@ updateinfolinks() +/obj/item/weapon/paper/Destroy() + if(istype(loc, /obj/machinery/door/airlock)) + var/obj/machinery/door/airlock/A = loc + if(A.note == src) + A.note = null + return ..() + + /obj/item/weapon/paper/update_icon() if(resistance_flags & ON_FIRE) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index e9fe951f62c..c24f89a2690 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -38,6 +38,14 @@ var/sillynewscastervar //Photo objects with this set to 1 will not be ejected by a newscaster. Only gets set to 1 if a silicon puts one of their images into a newscaster +/obj/item/weapon/photo/Destroy() + if(istype(loc, /obj/machinery/door/airlock)) + var/obj/machinery/door/airlock/A = loc + if(A.note == src) + A.note = null + return ..() + + /obj/item/weapon/photo/attack_self(mob/user) user.examinate(src)