Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm

code/game/machinery/computer/computer.dm

@@ -12,6 +12,11 @@
 	var/light_range_on = 3
 	var/light_power_on = 1
 
+/obj/machinery/computer/Destroy()
+	qdel(circuit)
+	circuit = null
+	return ..()
+
 /obj/machinery/computer/initialize()
 	power_change()
 
@@ -60,7 +65,6 @@
 		for(var/x in verbs)
 			verbs -= x
 		set_broken()
-		density = 0
 
 /obj/machinery/computer/update_icon()
 	..()
@@ -125,11 +129,4 @@
 			M.deconstruct(src)
 			qdel(src)
 	else
-		src.attack_hand(user)
-	return
-
-
-
-
-
-
+		..()