Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355

[MIRROR] Code Consistency: luminosity --> light_range
This commit is contained in:
LetterJay
2017-10-23 03:44:46 -04:00
committed by GitHub
8 changed files with 75 additions and 77 deletions
@@ -9,7 +9,7 @@
density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = NO_POWER_USE
luminosity = 4
light_range = 4
layer = ABOVE_OBJ_LAYER
var/obj/machinery/field/generator/FG1 = null
var/obj/machinery/field/generator/FG2 = null
@@ -8,7 +8,7 @@
anchored = TRUE
density = TRUE
layer = MASSIVE_OBJ_LAYER
luminosity = 6
light_range = 6
appearance_flags = 0
var/current_size = 1
var/allowed_size = 1
@@ -278,7 +278,7 @@
desc = "[initial(desc)] It glows fiercely with inner fire."
name = "supermatter-charged [initial(name)]"
consumedSupermatter = 1
luminosity = 10
set_light(10)
return