Resolves conflicts.

code/modules/projectiles/guns/energy/laser.dm

@@ -125,6 +125,19 @@
 	origin_tech = "combat=4;magnets=4;powerstorage=3"
 	shaded_charge = 1
 
+/obj/item/gun/energy/immolator/multi
+	name = "multi lens immolator cannon"
+	desc = "A large laser cannon, similar to the Immolator Laser, with toggleable firemodes. It is frequently used by military-like forces through Nanotrasen."
+	icon_state = "multilensimmolator"
+	ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter)
+	origin_tech = "combat=5;magnets=5;powerstorage=4"
+
+/obj/item/gun/energy/immolator/multi/update_icon()
+	..()
+	var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+	var/append = shot.select_name
+	overlays += image(icon = icon, icon_state = "multilensimmolator-[append]")
+
 ////////Laser Tag////////////////////
 
 /obj/item/gun/energy/laser/bluetag

code/modules/projectiles/guns/energy/nuclear.dm

@@ -65,6 +65,11 @@
 	ammo_x_offset = 1
 	shaded_charge = 1
 
+/obj/item/gun/energy/gun/blueshield/pdw9
+	name = "PDW-9 taser pistol"
+	desc = "A military grade sidearm, used by many militia forces throughout the local sector."
+	icon_state = "pdw9pistol"
+
 /obj/item/gun/energy/gun/turret
 	name = "hybrid turret gun"
 	desc = "A heavy hybrid energy cannon with two settings: Stun and kill."

code/modules/projectiles/guns/medbeam.dm

@@ -23,6 +23,9 @@
 	processing_objects.Remove(src)
 	return ..()
 
+/obj/item/gun/medbeam/handle_suicide()
+	return
+
 /obj/item/gun/medbeam/dropped(mob/user)
 	..()
 	LoseTarget()

code/modules/projectiles/guns/projectile/automatic.dm

@@ -257,7 +257,7 @@
 
 /obj/item/gun/projectile/automatic/lasercarbine
 	name = "\improper IK-60 Laser Carbine"
-	desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers
+	desc = "A short, compact carbine like rifle, relying more on battery cartridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations."
 	icon_state = "lasercarbine"
 	item_state = "laser"
 	w_class = WEIGHT_CLASS_NORMAL

code/modules/projectiles/guns/projectile/pistol.dm

@@ -27,15 +27,27 @@
 	can_suppress = 0
 
 /obj/item/gun/projectile/automatic/pistol/enforcer
-	name = "Enforcer .45"
+	name = "Enforcer"
 	desc = "A pistol of modern design."
 	icon_state = "enforcer_grey"
 	force = 10
-	mag_type = /obj/item/ammo_box/magazine/m45/enforcer45
+	mag_type = /obj/item/ammo_box/magazine/enforcer
 	can_suppress = TRUE
 	unique_reskin = TRUE
 	can_flashlight = TRUE
 
+/obj/item/gun/projectile/automatic/pistol/enforcer/New()
+	..()
+	options["Grey slide"] = "enforcer_grey"
+	options["Red slide"] = "enforcer_red"
+	options["Green slide"] = "enforcer_green"
+	options["Tan slide"] = "enforcer_tan"
+	options["Black slide"] = "enforcer_black"
+	options["Green Handle"] = "enforcer_greengrip"
+	options["Tan Handle"] = "enforcer_tangrip"
+	options["Red Handle"] = "enforcer_redgrip"
+	options["Cancel"] = null
+
 /obj/item/gun/projectile/automatic/pistol/enforcer/update_icon()
 	..()
 	if(current_skin)
@@ -54,17 +66,11 @@
 /obj/item/gun/projectile/automatic/pistol/enforcer/ui_action_click()
 	toggle_gunlight()
 
-/obj/item/gun/projectile/automatic/pistol/enforcer/New()
+/obj/item/gun/projectile/automatic/pistol/enforcer/lethal
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/lethal/New()
+	magazine = new/obj/item/ammo_box/magazine/enforcer/lethal
 	..()
-	options["Grey slide"] = "enforcer_grey"
-	options["Red slide"] = "enforcer_red"
-	options["Green slide"] = "enforcer_green"
-	options["Tan slide"] = "enforcer_tan"
-	options["Black slide"] = "enforcer_black"
-	options["Green Handle"] = "enforcer_greengrip"
-	options["Tan Handle"] = "enforcer_tangrip"
-	options["Red Handle"] = "enforcer_redgrip"
-	options["Cancel"] = null
 
 /obj/item/gun/projectile/automatic/pistol/deagle
 	name = "desert eagle"

code/modules/projectiles/guns/projectile/toy.dm

@@ -42,8 +42,8 @@
 	..()
 
 /obj/item/gun/projectile/automatic/toy/pistol/enforcer
-	name = "Enforcer trainer"
-	desc = "A foam version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets."
+	name = "Foam Enforcer"
+	desc = "A foam shooting version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets."
 	icon_state = "enforcer"
 	mag_type = /obj/item/ammo_box/magazine/toy/enforcer
 	can_flashlight = TRUE