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
@@ -29,8 +29,8 @@
 	var/stored_power = 0//Power to deploy per tick


-/obj/machinery/power/am_control_unit/New()
-	..()
+/obj/machinery/power/am_control_unit/Initialize()
+	. = ..()
 	linked_shielding = list()
 	linked_cores = list()

@@ -39,8 +39,7 @@
 	for(var/obj/machinery/am_shielding/AMS in linked_shielding)
 		AMS.control_unit = null
 		qdel(AMS)
-	qdel(fueljar)
-	fueljar = null
+	QDEL_NULL(fueljar)
 	return ..()