diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 76fc0172346..0dc9fc9a236 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -30,6 +30,7 @@
var/sawn_state = SAWN_INTACT
var/burst_size = 1
var/fire_delay = 0
+ var/heavy_weapon = 0
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
@@ -87,6 +88,11 @@
else
user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
+ if(heavy_weapon)
+ if(user.get_inactive_hand())
+ if(prob(15))
+ user.visible_message("[src] flies out of [user]'s hands!", "[src] kicks out of your grip!")
+ user.drop_item()
/obj/item/weapon/gun/emp_act(severity)
for(var/obj/O in contents)
@@ -153,6 +159,12 @@
/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params)
add_fingerprint(user)
+ if(heavy_weapon)
+ if(user.get_inactive_hand())
+ recoil = 4 //one-handed kick
+ else
+ recoil = initial(recoil)
+
for(var/i = 1 to burst_size)
if(!issilicon(user))
if( i>1 && !(src in get_both_hands(user))) //for burst firing
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index b149e35bafc..ada98ef6ec2 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -110,5 +110,14 @@
/obj/item/weapon/gun/energy/gun/turret
name = "hybrid turret gun"
- desc = "A basic hybrid energy gun with two settings: Stun and kill."
+ desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
+ icon_state = "turretlaser"
+ slot_flags = null
+ w_class = 5
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+ heavy_weapon = 1
+ can_flashlight = 0
+ trigger_guard = 0
+
+obj/item/weapon/gun/energy/gun/turret/update_icon()
+ icon_state = initial(icon_state)
\ No newline at end of file
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index a7e40af19df..08a5cc66f76 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 60f6aa556aa..7e1732b7365 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 393b957c655..95d3553a1c5 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ