diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 941699010c2..40b6843c936 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/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() ..() diff --git a/html/changelogs/Gun-Hog-AE-Gun-PR.yml b/html/changelogs/Gun-Hog-AE-Gun-PR.yml new file mode 100644 index 00000000000..8af2390b6c9 --- /dev/null +++ b/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." diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 39a49078881..b1173e0904f 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ