Merge branch 'master' into upstream-merge-29940

2017-08-21 23:29:24 -05:00
parent 87b3df3069 b5e7f7f7fe
commit a0cf777040
364 changed files with 4317 additions and 3134 deletions
@@ -30,13 +30,11 @@
 	var/reset_path = /obj/effect/ctf/flag_reset

 /obj/item/weapon/twohanded/ctf/Destroy()
-	if(reset)
-		qdel(reset)
-		reset = null
-	. = ..()
+	QDEL_NULL(reset)
+	return ..()

 /obj/item/weapon/twohanded/ctf/Initialize()
-	..()
+	. = ..()
 	SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
 	if(!reset)
 		reset = new reset_path(get_turf(src))