From 4d29723302d039b259d3566752acfb3e7dfc5c05 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 3 Dec 2017 18:25:54 -0500 Subject: [PATCH] Update lighting.dm --- code/modules/power/lighting.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 635a17056d..9f12e25bd2 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -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")