Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

code/modules/shieldgen/emergency_shield.dm

@@ -24,7 +24,7 @@
 /obj/machinery/shield/proc/check_failure()
 	if (src.health <= 0)
 		visible_message("\blue The [src] dissipates!")
-		del(src)
+		qdel(src)
 		return
 
 /obj/machinery/shield/New()
@@ -32,7 +32,7 @@
 	..()
 	update_nearby_tiles(need_rebuild=1)
 
-/obj/machinery/shield/Del()
+/obj/machinery/shield/Destroy()
 	opacity = 0
 	density = 0
 	update_nearby_tiles()
@@ -54,7 +54,6 @@
 	playsound(src.loc, 'sound/effects/EMPulse.ogg', 75, 1)
 
 	check_failure()
-
 	opacity = 1
 	spawn(20) if(src) opacity = 0
 
@@ -78,25 +77,25 @@
 	switch(severity)
 		if(1.0)
 			if (prob(75))
-				del(src)
+				qdel(src)
 		if(2.0)
 			if (prob(50))
-				del(src)
+				qdel(src)
 		if(3.0)
 			if (prob(25))
-				del(src)
+				qdel(src)
 	return
 
 /obj/machinery/shield/emp_act(severity)
 	switch(severity)
 		if(1)
-			del(src)
+			qdel(src)
 		if(2)
 			if(prob(50))
-				del(src)
+				qdel(src)
 
 /obj/machinery/shield/blob_act()
-	del(src)
+	qdel(src)
 
 
 /obj/machinery/shield/hitby(AM as mob|obj)
@@ -145,11 +144,10 @@
 	use_power = 0
 	idle_power_usage = 0
 
-/obj/machinery/shieldgen/Del()
+/obj/machinery/shieldgen/Destroy()
 	collapse_shields()
 	..()
 
-
 /obj/machinery/shieldgen/proc/shields_up()
 	if(active) return 0 //If it's already turned on, how did this get called?
 
@@ -183,7 +181,7 @@
 
 /obj/machinery/shieldgen/proc/collapse_shields()
 	for(var/obj/machinery/shield/shield_tile in deployed_shields)
-		del(shield_tile)
+		qdel(shield_tile)
 
 /obj/machinery/shieldgen/power_change()
 	..()
@@ -200,7 +198,7 @@
 
 	if(malfunction)
 		if(deployed_shields.len && prob(5))
-			del(pick(deployed_shields))
+			qdel(pick(deployed_shields))
 	else
 		if (check_delay <= 0)
 			create_shields()
@@ -223,7 +221,7 @@
 	if(health <= 0)
 		spawn(0)
 			explosion(get_turf(src.loc), 0, 0, 1, 0, 0, 0)
-		del(src)
+		qdel(src)
 	update_icon()
 	return
 

code/modules/shieldgen/energy_field.dm

@@ -17,7 +17,7 @@
 	..()
 	update_nearby_tiles()
 
-/obj/effect/energy_field/Del()
+/obj/effect/energy_field/Destroy()
 	update_nearby_tiles()
 	..()
 

code/modules/shieldgen/sheldwallgen.dm

@@ -6,7 +6,7 @@
 		icon_state = "Shield_Gen"
 		anchored = 0
 		density = 1
-		req_access = list(access_teleporter)
+		req_access = list(access_engine_equip)
 		var/active = 0
 		var/power = 0
 		var/state = 0
@@ -199,14 +199,14 @@
 		T2 = T
 		if(locate(/obj/machinery/shieldwall) in T)
 			F = (locate(/obj/machinery/shieldwall) in T)
-			del(F)
+			qdel(F)
 
 		if(locate(/obj/machinery/shieldwallgen) in T)
 			G = (locate(/obj/machinery/shieldwallgen) in T)
 			if(!G.active)
 				break
 
-/obj/machinery/shieldwallgen/Del()
+/obj/machinery/shieldwallgen/Destroy()
 	src.cleanup(1)
 	src.cleanup(2)
 	src.cleanup(4)
@@ -252,9 +252,9 @@
 		else
 			B.storedpower -= generate_power_usage
 	else
-		del(src) //need at least two generator posts
+		qdel(src) //need at least two generator posts
 
-/obj/machinery/shieldwall/Del()
+/obj/machinery/shieldwall/Destroy()
 	update_nearby_tiles()
 	..()
 
@@ -265,11 +265,11 @@
 /obj/machinery/shieldwall/process()
 	if(needs_power)
 		if(isnull(gen_primary)||isnull(gen_secondary))
-			del(src)
+			qdel(src)
 			return
 
 		if(!(gen_primary.active)||!(gen_secondary.active))
-			del(src)
+			qdel(src)
 			return
 
 		if(prob(50))

code/modules/shieldgen/shield_gen.dm

@@ -39,6 +39,12 @@
 	field = new/list()
 	..()
 
+/obj/machinery/shield_gen/Destroy()
+	for(var/obj/effect/energy_field/D in field)
+		field.Remove(D)
+		D.loc = null
+	..()
+
 /obj/machinery/shield_gen/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/weapon/card/id))
 		var/obj/item/weapon/card/id/C = W
@@ -208,7 +214,7 @@
 		for(var/turf/O in covered_turfs)
 			var/obj/effect/energy_field/E = new(O)
 			field.Add(E)
-		del covered_turfs
+		qdel(covered_turfs)
 
 		for(var/mob/M in view(5,src))
 			M << "\icon[src] You hear heavy droning start up."