One runtime fixed, other one didn't turn up.
I put in some stuff for it to be easier to find if it does.

Conflicts:
	code/modules/power/singularity/singularity.dm
Fixed an annoying bug with giving another player a flashlight,
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.

Conflicts:
	baystation12.dme
compile fix
I think I fixed everything it is possible to stuff a light source into.

Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/Sleeper.dm
	code/game/objects/structures/transit_tubes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/recycling/disposal.dm
compile commit
Fixed issues with cyborgs deactivating flashlights, cleaned up some module code in the process.

Conflicts:
	code/modules/mob/living/silicon/robot/inventory.dm
	code/modules/mob/living/silicon/robot/robot.dm
Added the ability to use multiple light icons to represent over four states.

Conflicts:
	baystation12.dme