Skip to content

Commit

Permalink
[qdel] Еще немного работающих дестроев и синга без света.
Browse files Browse the repository at this point in the history
  • Loading branch information
ZVee committed Jan 25, 2016
1 parent 1da29f0 commit e9a1b7a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 4 additions & 0 deletions code/game/machinery/fax.dm
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ var/list/alldepartments = list("Central Command")
if( !("[department]" in alldepartments) )
alldepartments += department

/obj/machinery/faxmachine/Destroy()
allfaxes -= src
return ..()

/obj/machinery/faxmachine/process()
return 0

Expand Down
5 changes: 5 additions & 0 deletions code/modules/economy/ATM.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ log transactions
spark_system.set_up(5, 0, src)
spark_system.attach(src)

/obj/machinery/atm/Destroy()
if(spark_system)
qdel(spark_system)
return ..()

/obj/machinery/atm/process()
if(stat & NOPOWER)
return
Expand Down
13 changes: 2 additions & 11 deletions code/modules/lighting/lighting_atom.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
// Will update the light (duh).
// Creates or destroys it if needed, makes it update values, makes sure it's got the correct source turf...
/atom/proc/update_light()
set waitfor = FALSE
if(gcDestroyed)
return

if(!lighting_corners_initialised)
sleep(20)

if(!light_power || !light_range) // We won't emit light anyways, destroy the light source.
if(light)
light.destroy()
Expand All @@ -42,7 +35,6 @@
// Incase any lighting vars are on in the typepath we turn the light on in New().
/atom/New()
. = ..()

if(light_power && light_range)
update_light()

Expand All @@ -55,7 +47,7 @@
if(light)
light.destroy()
light = null
. = ..()
return ..()

/atom/movable/New()
. = ..()
Expand All @@ -71,8 +63,7 @@
opacity = 0
T.recalc_atom_opacity()
T.reconsider_lights()

. = ..()
return ..()

// Should always be used to change the opacity of an atom.
// It notifies (potentially) affected light sources so they can update (if needed).
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/singularity/singularity.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var/global/list/uneatable = list(
anchored = 1
density = 1
layer = 6
light_range = 6
//light_range = 6
unacidable = 1 //Don't comment this out.
use_power = 0
var/current_size = 1
Expand Down

0 comments on commit e9a1b7a

Please sign in to comment.