Code Consistency: luminosity --> light_range

code/game/machinery/lightswitch.dm

@@ -8,11 +8,18 @@
 	anchored = TRUE
 	desc = "Make dark."
 	var/on = TRUE
+<<<<<<< HEAD
 	var/area/area = null
 	var/otherarea = null
 	//	luminosity = 1
 
 /obj/machinery/light_switch/Initialize()
+=======
+	var/area/area = null
+	var/otherarea = null
+
+/obj/machinery/light_switch/Initialize()
+>>>>>>> afd8bb7... Code Consistency: luminosity --> light_range (#31355)
 	. = ..()
 	area = get_area(src)
 

code/game/objects/items/weaponry.dm

@@ -73,7 +73,7 @@
 	flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1
 	slot_flags = null
 	block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
-	luminosity = 3
+	light_range = 3
 	attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
 	var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
 	var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK