new->init refactor

code/game/objects/items/devices/flashlight.dm

@@ -504,15 +504,9 @@
 	on = 1 //Bio-luminesence has one setting, on.
 	power_use = 0
 
-<<<<<<< HEAD
-/obj/item/device/flashlight/slime/New()
-	..()
-	set_light(light_range, light_power, light_color)
-=======
 /obj/item/device/flashlight/slime/Initialize()
 	. = ..()
-	set_light(brightness_on, flashlight_power, flashlight_colour)
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
+	set_light(light_range, light_power, light_color)
 
 /obj/item/device/flashlight/slime/update_brightness()
 	return

code/game/objects/items/devices/paicard.dm

@@ -22,15 +22,9 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
 	if(istype(rig))
 		rig.forced_move(direction, user)
 
-<<<<<<< HEAD
-/obj/item/device/paicard/New()
-	..()
-	add_overlay("pai-off")
-=======
 /obj/item/device/paicard/Initialize()
 	. = ..()
-	overlays += "pai-off"
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
+	add_overlay("pai-off")
 
 /obj/item/device/paicard/Destroy()
 	//Will stop people throwing friend pAIs into the singularity so they can respawn

code/game/objects/items/devices/radio/radio.dm

@@ -1,7 +1,6 @@
 // Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
 //VOREStation Edit Start - Updating this for Virgo
 var/global/list/default_internal_channels = list(
-<<<<<<< HEAD
 	num2text(PUB_FREQ) = list(),
 	num2text(AI_FREQ)  = list(access_synth),
 	num2text(ENT_FREQ) = list(),
@@ -22,27 +21,6 @@ var/global/list/default_medbay_channels = list(
 	num2text(PUB_FREQ) = list(),
 	num2text(MED_FREQ) = list(),
 	num2text(MED_I_FREQ) = list()
-=======
-	num2text(PUB_FREQ) =   list(),
-	num2text(AI_FREQ)  =   list(access_synth),
-	num2text(ENT_FREQ) =   list(),
-	num2text(ERT_FREQ) =   list(access_cent_specops),
-	num2text(COMM_FREQ) =  list(access_heads),
-	num2text(ENG_FREQ) =   list(access_engine_equip, access_atmospherics),
-	num2text(MED_FREQ) =   list(access_medical_equip),
-	num2text(MED_I_FREQ) = list(access_medical_equip),
-	num2text(SEC_FREQ) =   list(access_security),
-	num2text(SEC_I_FREQ) = list(access_security),
-	num2text(SCI_FREQ) =   list(access_tox,access_robotics,access_xenobiology),
-	num2text(SUP_FREQ) =   list(access_cargo),
-	num2text(SRV_FREQ) =   list(access_janitor, access_hydroponics)
-)
-
-var/global/list/default_medbay_channels = list(
-	num2text(PUB_FREQ) =   list(),
-	num2text(MED_FREQ) =   list(access_medical_equip),
-	num2text(MED_I_FREQ) = list(access_medical_equip)
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 )
 //VOREStation Edit End