Update lighting.dm

2017-12-03 18:25:54 -05:00
parent 5621507b4a
commit 4d29723302
1 changed files with 0 additions and 9 deletions
@@ -242,12 +242,8 @@
 	icon_state = "tube-empty"
 	start_with_cell = FALSE

-<<<<<<< HEAD
-/obj/machinery/light/built/New()
-=======
 /obj/machinery/light/built/Initialize()
 	. = ..()
->>>>>>> fe816da... Adds emergency lights, built into light fixtures (#33213)
 	status = LIGHT_EMPTY
 	update(0)
 	..()
@@ -262,15 +258,10 @@


 // create a new lighting fixture
-<<<<<<< HEAD
-/obj/machinery/light/New()
-	..()
-=======
 /obj/machinery/light/Initialize()
 	. = ..()
 	if(start_with_cell && !no_emergency)
 		cell = new/obj/item/stock_parts/cell/emergency_light(src)
->>>>>>> fe816da... Adds emergency lights, built into light fixtures (#33213)
 	spawn(2)
 		switch(fitting)
 			if("tube")