Merge branch 'master' into modsuits

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

@@ -17,7 +17,7 @@
 		icon_state = "beacon-off"
 
 /obj/item/beacon/Destroy()
-	GLOB.teleportbeacons.Remove(src)
+	GLOB.teleportbeacons -= src
 	return ..()
 
 /obj/item/beacon/attack_self(mob/user)
@@ -27,7 +27,7 @@
 		GLOB.teleportbeacons += src
 	else
 		icon_state = "beacon-off"
-		GLOB.teleportbeacons.Remove(src)
+		GLOB.teleportbeacons -= src
 	to_chat(user, "<span class='notice'>You [enabled ? "enable" : "disable"] the beacon.</span>")
 	return
 

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

@@ -28,6 +28,10 @@
 		mytape = new starting_tape_type(src)
 	update_icon()
 
+/obj/item/taperecorder/Destroy()
+	// QDEL_NULL(soundloop)
+	QDEL_NULL(mytape)
+	return ..()
 
 /obj/item/taperecorder/examine(mob/user)
 	. = ..()