Merge pull request #2346 from Fox-McCloud/suspicious-dereferencing

More Dereferencing

code/game/objects/items/devices/sensor_device.dm

@@ -1,5 +1,5 @@
 /obj/item/device/sensor_device
-	name = "handheld crew monitor" 
+	name = "handheld crew monitor"
 	desc = "A miniature machine that tracks suit sensors across the station."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "scanner"
@@ -7,10 +7,15 @@
 	slot_flags = SLOT_BELT
 	origin_tech = "biotech=3;materials=3;magnets=3"
 	var/datum/nano_module/crew_monitor/crew_monitor
-	
+
 /obj/item/device/sensor_device/New()
 	crew_monitor = new(src)
 
+/obj/item/device/sensor_device/Destroy()
+	qdel(crew_monitor)
+	crew_monitor = null
+	return ..()
+
 /obj/item/device/sensor_device/attack_self(mob/user as mob)
 	ui_interact(user)
 

code/game/objects/items/weapons/flamethrower.dm

@@ -25,10 +25,13 @@
 /obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
 		qdel(weldtool)
+		weldtool = null
 	if(igniter)
 		qdel(igniter)
+		igniter = null
 	if(ptank)
 		qdel(ptank)
+		ptank = null
 	return ..()
 
 

code/game/objects/items/weapons/grenades/smokebomb.dm

@@ -15,6 +15,7 @@
 
 	Destroy()
 		qdel(smoke)
+		smoke = null
 		return ..()
 
 	prime()

code/game/objects/objs.dm

@@ -1,6 +1,5 @@
 /obj
 	//var/datum/module/mod		//not used
-	var/w_amt = 0	// waster amounts
 	var/origin_tech = null	//Used by R&D to determine what research bonuses it grants.
 	var/reliability = 100	//Used by SOME devices to determine how reliable they are.
 	var/crit_fail = 0