From 8fb17b2beea1c8b530fa5a56018a5d99532016bf Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 4 Apr 2017 04:26:53 -0400
Subject: [PATCH] moarrr

---
 code/game/machinery/doors/brigdoors.dm           |  6 +++++-
 code/game/objects/effects/decals/cleanable.dm    |  3 +--
 code/game/objects/items/devices/radio/headset.dm | 12 ++++--------
 code/game/objects/items/devices/radio/radio.dm   | 16 +++++++---------
 .../research/xenobiology/xenobio_camera.dm       | 10 +++++-----
 5 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index ecdd959f717..7ec9630a54c 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -63,6 +63,10 @@
 			stat |= BROKEN
 		update_icon()
 
+/obj/machinery/door_timer/Destroy()
+	QDEL_NULL(Radio)
+	targets.Cut()
+	return ..()
 
 //Main door timer loop, if it's timing and time is >0 reduce time by 1.
 // if it's less than 0, open door, reset timer
@@ -186,7 +190,7 @@
 	if(..())
 		return
 	interact(user)
-		
+
 /obj/machinery/door_timer/interact(mob/user)
 	// Used for the 'time left' display
 	var/second = round(timeleft() % 60)
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 48a85e7e704..cfde9ab55a4 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -1,9 +1,8 @@
 /obj/effect/decal/cleanable
 	var/list/random_icon_states = list()
-	var/targeted_by = null			// Used so cleanbots can't claim a mess.
 	var/noscoop = 0   //if it has this, don't let it be scooped up
 	var/noclear = 0    //if it has this, don't delete it when its' scooped up
-	
+
 /obj/effect/decal/cleanable/proc/can_bloodcrawl_in()
 	return FALSE
 
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 30e02824cd1..9fd1e40b4f7 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -32,12 +32,8 @@
 	recalculateChannels(1)
 
 /obj/item/device/radio/headset/Destroy()
-	if(keyslot1)
-		qdel(keyslot1)
-	if(keyslot2)
-		qdel(keyslot2)
-	keyslot1 = null
-	keyslot2 = null
+	QDEL_NULL(keyslot1)
+	QDEL_NULL(keyslot2)
 	return ..()
 
 /obj/item/device/radio/headset/list_channels(var/mob/user)
@@ -63,7 +59,7 @@
 		return RADIO_CONNECTION_FAIL
 
 	return ..()
-	
+
 /obj/item/device/radio/headset/is_listening()
 	if(ishuman(loc))
 		var/mob/living/carbon/human/H = loc
@@ -71,7 +67,7 @@
 			return ..()
 	else if(isanimal(loc) || isAI(loc))
 		return ..()
-	
+
 	return FALSE
 
 /obj/item/device/radio/headset/alt
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index c4fedf48255..05bce7ad51c 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -30,7 +30,6 @@ var/global/list/default_medbay_channels = list(
 	var/frequency = PUB_FREQ //common chat
 	var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
 	var/canhear_range = 3 // the range which mobs can hear this radio from
-	var/obj/item/device/radio/patch_link = null
 	var/datum/wires/radio/wires = null
 	var/b_stat = 0
 	var/broadcasting = 0
@@ -54,14 +53,14 @@ var/global/list/default_medbay_channels = list(
 
 	var/list/internal_channels
 
-/obj/item/device/radio
 	var/datum/radio_frequency/radio_connection
 	var/list/datum/radio_frequency/secure_radio_connections = new
 
-	proc/set_frequency(new_frequency)
-		radio_controller.remove_object(src, frequency)
-		frequency = new_frequency
-		radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+
+/obj/item/device/radio/proc/set_frequency(new_frequency)
+	radio_controller.remove_object(src, frequency)
+	frequency = new_frequency
+	radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
 
 
 /obj/item/device/radio/New()
@@ -74,14 +73,13 @@ var/global/list/default_medbay_channels = list(
 	global_radios |= src
 
 /obj/item/device/radio/Destroy()
-	qdel(wires)
-	wires = null
+	QDEL_NULL(wires)
 	if(radio_controller)
 		radio_controller.remove_object(src, frequency)
 		for(var/ch_name in channels)
 			radio_controller.remove_object(src, radiochannels[ch_name])
-	patch_link = null
 	global_radios -= src
+	follow_target = null
 	return ..()
 
 
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 9e0e26a0252..40f20ea4dde 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -77,11 +77,11 @@
 	else if(istype(O, /obj/item/weapon/storage/bag))
 		var/obj/item/weapon/storage/P = O
 		var/loaded = 0
-		for(var/obj/G in P.contents)
-			if(istype(G, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
-				loaded = 1
-				monkeys++
-				qdel(G)
+		for(var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/MC in P.contents)
+			loaded = 1
+			monkeys++
+			P.remove_from_storage(MC)
+			qdel(MC)
 		if(loaded)
 			to_chat(user, "<span class='notice'>You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.</span>")
 		return