diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index e32d365298..86664404d1 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -54,10 +54,10 @@
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null
 
-/obj/item/weapon/gun/energy/chrono_gun/New(var/obj/item/weapon/chrono_eraser/T)
+/obj/item/weapon/gun/energy/chrono_gun/Initialize()
 	. = ..()
-	if(istype(T))
-		TED = T
+	if(istype(loc, /obj/item/weapon/chrono_eraser))
+		TED = loc
 	else //admin must have spawned it
 		TED = new(src.loc)
 		qdel(src)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index fb1d375854..441d40db8f 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -46,8 +46,8 @@
 //Syndicate sub-machine guns.
 /obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r
 
-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
@@ -55,8 +55,8 @@
 //Barman's shotgun
 /obj/item/weapon/gun/ballistic/shotgun/sc_pump
 
-/obj/item/weapon/gun/ballistic/shotgun/sc_pump/New()
-	..()
+/obj/item/weapon/gun/ballistic/shotgun/sc_pump/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 0de56aa86a..3a91c3207e 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -420,8 +420,8 @@
 	var/badmin_mode = FALSE
 	var/static/list/blacklisted_vars = list("locs", "loc", "contents", "x", "y", "z")
 
-/obj/item/weapon/gun/energy/laser/chameleon/New()
-	..()
+/obj/item/weapon/gun/energy/laser/chameleon/Initialize()
+	. = ..()
 	chameleon_action = new(src)
 	chameleon_action.chameleon_type = /obj/item/weapon/gun
 	chameleon_action.chameleon_name = "Gun"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 2dffe0a567..6fb4e6276f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -60,8 +60,8 @@
 	var/datum/action/toggle_scope_zoom/azoom
 
 
-/obj/item/weapon/gun/New()
-	..()
+/obj/item/weapon/gun/Initialize()
+	. = ..()
 	if(pin)
 		pin = new pin(src)
 	if(gun_light)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index a7a8b75da2..80be30a06a 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -9,8 +9,8 @@
 	var/obj/item/ammo_box/magazine/magazine
 	var/casing_ejector = 1 //whether the gun ejects the chambered casing
 
-/obj/item/weapon/gun/ballistic/New()
-	..()
+/obj/item/weapon/gun/ballistic/Initialize()
+	. = ..()
 	if(!spawnwithmagazine)
 		update_icon()
 		return
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 2f7036cab8..70d399b107 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -99,10 +99,9 @@
 /obj/item/weapon/gun/ballistic/automatic/c20r/unrestricted
 	pin = /obj/item/device/firing_pin
 
-/obj/item/weapon/gun/ballistic/automatic/c20r/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/c20r/Initialize()
+	. = ..()
 	update_icon()
-	return
 
 /obj/item/weapon/gun/ballistic/automatic/c20r/afterattack()
 	..()
@@ -150,20 +149,18 @@
 	fire_delay = 2
 	pin = /obj/item/device/firing_pin/implant/pindicate
 
-/obj/item/weapon/gun/ballistic/automatic/m90/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/m90/Initialize()
+	. = ..()
 	underbarrel = new /obj/item/weapon/gun/ballistic/revolver/grenadelauncher(src)
 	update_icon()
-	return
 
 /obj/item/weapon/gun/ballistic/automatic/m90/unrestricted
 	pin = /obj/item/device/firing_pin
 
-/obj/item/weapon/gun/ballistic/automatic/m90/unrestricted/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/m90/unrestricted/Initialize()
+	. = ..()
 	underbarrel = new /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/unrestricted(src)
 	update_icon()
-	return
 
 /obj/item/weapon/gun/ballistic/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
 	if(select == 2)
@@ -259,8 +256,8 @@
 /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted
 	pin = /obj/item/device/firing_pin
 
-/obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/Initialize()
+	. = ..()
 	update_icon()
 
 /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/update_icon()
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index bc0668cd66..a246871e61 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -9,16 +9,16 @@
 	item_state = "backpack"
 	slot_flags = SLOT_BACK
 	w_class = WEIGHT_CLASS_HUGE
-	var/obj/item/weapon/gun/ballistic/minigun/gun = null
+	var/obj/item/weapon/gun/ballistic/minigun/gun
 	var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded.
 	var/overheat = 0
 	var/overheat_max = 40
 	var/heat_diffusion = 1
 
-/obj/item/weapon/minigunpack/New()
+/obj/item/weapon/minigunpack/Initialize()
+	. = ..()
 	gun = new(src)
 	START_PROCESSING(SSobj, src)
-	..()
 
 /obj/item/weapon/minigunpack/Destroy()
 	STOP_PROCESSING(SSobj, src)
@@ -110,15 +110,15 @@
 	casing_ejector = 0
 	var/obj/item/weapon/minigunpack/ammo_pack
 
-/obj/item/weapon/gun/ballistic/minigun/New()
+/obj/item/weapon/gun/ballistic/minigun/Initialize()
 	SET_SECONDARY_FLAG(src, SLOWS_WHILE_IN_HAND)
 
-	if(!ammo_pack)
-		if(istype(loc,/obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
-			ammo_pack = loc
-			..()
-		else
-			qdel(src)//No pack, no gun
+	if(istype(loc, /obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
+		ammo_pack = loc
+	else
+		return INITIALIZE_HINT_QDEL //No pack, no gun
+	
+	return ..()
 
 /obj/item/weapon/gun/ballistic/minigun/attack_self(mob/living/user)
 	return
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 892defa9f4..2ce432bf31 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -6,8 +6,8 @@
 	origin_tech = "combat=3;materials=2"
 	casing_ejector = 0
 
-/obj/item/weapon/gun/ballistic/revolver/New()
-	..()
+/obj/item/weapon/gun/ballistic/revolver/Initialize()
+	. = ..()
 	if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
 		verbs -= /obj/item/weapon/gun/ballistic/revolver/verb/spin
 
@@ -95,8 +95,8 @@
 	unique_rename = 1
 	unique_reskin = 1
 
-/obj/item/weapon/gun/ballistic/revolver/detective/New()
-	..()
+/obj/item/weapon/gun/ballistic/revolver/detective/Initialize()
+	. = ..()
 	options["Default"] = "detective"
 	options["Leopard Spots"] = "detective_leopard"
 	options["Black Panther"] = "detective_panther"
@@ -177,8 +177,8 @@
 	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rus357
 	var/spun = FALSE
 
-/obj/item/weapon/gun/ballistic/revolver/russian/New()
-	..()
+/obj/item/weapon/gun/ballistic/revolver/russian/Initialize()
+	. = ..()
 	do_spin()
 	spun = TRUE
 	update_icon()
@@ -271,8 +271,8 @@
 	unique_rename = 1
 	unique_reskin = 1
 
-/obj/item/weapon/gun/ballistic/revolver/doublebarrel/New()
-	..()
+/obj/item/weapon/gun/ballistic/revolver/doublebarrel/Initialize()
+	. = ..()
 	options["Default"] = "dshotgun"
 	options["Dark Red Finish"] = "dshotgun-d"
 	options["Ash"] = "dshotgun-f"
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 918acd27a1..6fc3fd3687 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -147,8 +147,8 @@
 
 	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted/arcane_barrage
 
-/obj/item/weapon/gun/ballistic/shotgun/boltaction/enchanted/New()
-	..()
+/obj/item/weapon/gun/ballistic/shotgun/boltaction/enchanted/Initialize()
+	. = ..()
 	bolt_open = 1
 	pump()
 	gun_type = type
@@ -213,8 +213,8 @@
 	var/toggled = 0
 	var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
 
-/obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube/New()
-	..()
+/obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube/Initialize()
+	. = ..()
 	if (!alternate_magazine)
 		alternate_magazine = new mag_type(src)
 
diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm
index 89f6655d8e..9b8044dac8 100644
--- a/code/modules/projectiles/guns/ballistic/toy.dm
+++ b/code/modules/projectiles/guns/ballistic/toy.dm
@@ -35,9 +35,9 @@
 /obj/item/weapon/gun/ballistic/automatic/toy/pistol/riot
 	mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
 
-/obj/item/weapon/gun/ballistic/automatic/toy/pistol/riot/New()
+/obj/item/weapon/gun/ballistic/automatic/toy/pistol/riot/Initialize()
 	magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
-	..()
+	return ..()
 
 /obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted
 	pin = /obj/item/device/firing_pin
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 9e642b0cef..b022941f78 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -25,8 +25,8 @@
 	update_icon()
 
 
-/obj/item/weapon/gun/energy/New()
-	..()
+/obj/item/weapon/gun/energy/Initialize()
+	. = ..()
 	if(cell_type)
 		power_supply = new cell_type(src)
 	else
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 52f9852344..a8edc727b3 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -22,9 +22,9 @@
 	charge_sections = 3
 	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
 
-/obj/item/weapon/gun/energy/e_gun/mini/New()
+/obj/item/weapon/gun/energy/e_gun/mini/Initialize()
 	gun_light = new /obj/item/device/flashlight/seclite(src)
-	..()
+	return ..()
 
 /obj/item/weapon/gun/energy/e_gun/mini/update_icon()
 	..()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 0f108fcc76..e8d48373da 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -68,7 +68,7 @@
 	unique_frequency = TRUE
 	max_mod_capacity = 80
 
-/obj/item/weapon/gun/energy/kinetic_accelerator/New()
+/obj/item/weapon/gun/energy/kinetic_accelerator/Initialize()
 	. = ..()
 	if(!holds_charge)
 		empty()
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index b3e55f2423..43431a65c3 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -17,9 +17,9 @@
 /obj/item/weapon/gun/energy/pulse/prize
 	pin = /obj/item/device/firing_pin
 
-/obj/item/weapon/gun/energy/pulse/prize/New()
+/obj/item/weapon/gun/energy/pulse/prize/Initialize()
 	. = ..()
-	GLOB.poi_list |= src
+	GLOB.poi_list += src
 	var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(src)]"
 
 	message_admins(msg)
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 58a756a28d..9c30eefd2f 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -44,8 +44,8 @@
 		charges--//... drain a charge
 		recharge_newshot()
 
-/obj/item/weapon/gun/magic/New()
-	..()
+/obj/item/weapon/gun/magic/Initialize()
+	. = ..()
 	charges = max_charges
 	chambered = new ammo_type(src)
 	if(can_charge)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index fe93a58838..247273e3f4 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -9,13 +9,13 @@
 	max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
 	var/variable_charges = 1
 
-/obj/item/weapon/gun/magic/wand/New()
+/obj/item/weapon/gun/magic/wand/Initialize()
 	if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
 		if(prob(33))
 			max_charges = Ceiling(max_charges / 3)
 		else
 			max_charges = Ceiling(max_charges / 2)
-	..()
+	return ..()
 
 /obj/item/weapon/gun/magic/wand/examine(mob/user)
 	..()
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 37d576a8ff..46758f8889 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -16,8 +16,8 @@
 
 	weapon_weight = WEAPON_MEDIUM
 
-/obj/item/weapon/gun/medbeam/New()
-	..()
+/obj/item/weapon/gun/medbeam/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
 /obj/item/weapon/gun/medbeam/Destroy(mob/user)
@@ -128,6 +128,6 @@
 /obj/item/weapon/gun/medbeam/mech
 	mounted = 1
 
-/obj/item/weapon/gun/medbeam/mech/New()
-	..()
+/obj/item/weapon/gun/medbeam/mech/Initialize()
+	. = ..()
 	STOP_PROCESSING(SSobj, src) //Mech mediguns do not process until installed, and are controlled by the holder obj
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 09547b0d98..2e8a29cded 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -14,8 +14,8 @@
 	var/list/syringes = list()
 	var/max_syringes = 1
 
-/obj/item/weapon/gun/syringe/New()
-	..()
+/obj/item/weapon/gun/syringe/Initialize()
+	. = ..()
 	chambered = new /obj/item/ammo_casing/syringegun(src)
 
 /obj/item/weapon/gun/syringe/recharge_newshot()