From 6ff0b13638dfaea37bf27238b0459a352ae0238f Mon Sep 17 00:00:00 2001
From: oranges <email@oranges.net.nz>
Date: Wed, 28 Sep 2016 22:19:59 +0000
Subject: [PATCH] Make sure some proximity using items clean up when destroyed

---
 code/game/machinery/flasher.dm     | 4 ++++
 code/modules/assembly/proximity.dm | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 3dbeadfd33d..80ff532d236 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -31,6 +31,10 @@
 	else
 		bulb = new /obj/item/device/assembly/flash/handheld(src)
 
+/obj/machinery/flasher/Destroy()
+	remove_from_proximity_list(src, range)
+	..()
+
 /obj/machinery/flasher/Move()
 	remove_from_proximity_list(src, range)
 	..()
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index 083709793b0..8690a82d115 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -81,6 +81,9 @@
 	if(scanning)
 		addtimer(src, "sense", 0)
 
+/obj/item/device/assembly/prox_sensor/Destroy()
+	remove_from_proximity_list(src, sensitivity)
+	..()
 
 /obj/item/device/assembly/prox_sensor/toggle_scan(scan)
 	if(!secured)