mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
A plethora of Destroy() fixes - return qdel hints and clean stuff up.
This commit is contained in:
@@ -32,13 +32,12 @@
|
||||
my_gen.field.Remove(src)
|
||||
my_gen = null
|
||||
var/turf/current_loc = get_turf(src)
|
||||
spawn(1) // Updates neightbors after we're gone.
|
||||
for(var/direction in cardinal)
|
||||
var/turf/T = get_step(current_loc, direction)
|
||||
if(T)
|
||||
for(var/obj/effect/energy_field/F in T)
|
||||
F.update_icon()
|
||||
..()
|
||||
. = ..()
|
||||
for(var/direction in cardinal)
|
||||
var/turf/T = get_step(current_loc, direction)
|
||||
if(T)
|
||||
for(var/obj/effect/energy_field/F in T)
|
||||
F.update_icon()
|
||||
|
||||
/obj/effect/energy_field/ex_act(var/severity)
|
||||
adjust_strength(-(4 - severity) * 4)
|
||||
|
||||
@@ -38,10 +38,8 @@
|
||||
..()
|
||||
|
||||
/obj/machinery/shield_gen/Destroy()
|
||||
for(var/obj/effect/energy_field/D in field)
|
||||
field.Remove(D)
|
||||
D.loc = null
|
||||
..()
|
||||
qdel_null_list(field)
|
||||
return ..()
|
||||
|
||||
/obj/machinery/shield_gen/emag_act(var/remaining_charges, var/mob/user)
|
||||
if(prob(75))
|
||||
|
||||
Reference in New Issue
Block a user