new->init refactor

code/modules/projectiles/gun.dm

@@ -93,7 +93,6 @@
 
 	var/last_shot = 0			//records the last shot fired
 
-<<<<<<< HEAD
 //VOREStation Add - /tg/ icon system
 	var/charge_sections = 4
 	var/shaded_charge = FALSE
@@ -124,12 +123,8 @@
 	update_icon()
 //VOREStation Add End
 
-/obj/item/weapon/gun/New()
-	..()
-=======
 /obj/item/weapon/gun/Initialize()
 	. = ..()
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 	for(var/i in 1 to firemodes.len)
 		firemodes[i] = new /datum/firemode(src, firemodes[i])