Merge pull request #11698 from GunHog/MaybeNowSecWillWantThem

Added a taser function back to the Advanced Energy Gun

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

@@ -53,10 +53,10 @@
 	origin_tech = "combat=3;materials=5;powerstorage=3"
 	var/fail_state = 0
 	var/charge_tick = 0
-	can_flashlight = 0
 	pin = null
 	can_charge = 0
 	ammo_x_offset = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
 
 /obj/item/weapon/gun/energy/gun/nuclear/New()
 	..()

html/changelogs/Gun-Hog-AE-Gun-PR.yml

@@ -0,0 +1,7 @@
+ 
+author: Gun Hog
+
+delete-after: True
+
+changes: 
+  - tweak: "Nanotrasen scientists have proposed a refined prototype design for the nuclear powered Advanced Energy guns to include a taser function along with the disable and kill modes. Addtionally, they have modified the chassis blueprint to include a hardpoint for attachable seclites."