Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit

code/modules/lighting/lighting_object.dm

@@ -125,7 +125,7 @@
 // Variety of overrides so the overlays don't get affected by weird things.
 
 /atom/movable/lighting_object/ex_act(severity, target, origin)
-	return 0
+	return FALSE
 
 /atom/movable/lighting_object/singularity_act()
 	return

code/modules/lighting/lighting_turf.dm

@@ -62,7 +62,7 @@
 // Used to get a scaled lumcount.
 /turf/proc/get_lumcount(var/minlum = 0, var/maxlum = 1)
 	if(!lighting_object)
-		return 1
+		return TRUE
 
 	var/totallums = (lc_topright? (lc_topright.lum_r + lc_topright.lum_g + lc_topright.lum_b) : 0) \
 	+ (lc_bottomright? (lc_bottomright.lum_r + lc_bottomright.lum_g + lc_bottomright.lum_b) : 0) \