Merge pull request #7486 from Novacat/nova-pathfinder

Fixes Kisuke's gunsword

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

@@ -7,13 +7,13 @@
 
 	icon_override = 'icons/vore/custom_guns_vr.dmi'
 	item_state = null
-	item_icons = null
+	item_icons = list(slot_r_hand_str = 'icons/vore/custom_guns_vr.dmi', slot_l_hand_str = 'icons/vore/custom_guns_vr.dmi')
+	item_state_slots = list(slot_r_hand_str = "gbuster_r", slot_l_hand_str = "gbuster_l")
 
 	w_class = ITEMSIZE_NORMAL
 	origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 4)
-	slot_flags = null
 	projectile_type = /obj/item/projectile/beam/stun
-	fire_sound = 'sound/weapons/gauss_shoot.ogg'
+	fire_sound = 'sound/weapons/mandalorian.ogg'
 	charge_meter = 1
 
 	cell_type = /obj/item/weapon/cell/device/weapon/gunsword
@@ -22,7 +22,7 @@
 
 	firemodes = list(
 	list(mode_name="stun", charge_cost=240,projectile_type=/obj/item/projectile/beam/stun, modifystate="gbuster", fire_sound='sound/weapons/Taser.ogg'),
-	list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam, modifystate="gbuster", fire_sound='sound/weapons/gauss_shoot.ogg'),
+	list(mode_name="lethal", charge_cost=480,projectile_type=/obj/item/projectile/beam/imperial, modifystate="gbuster", fire_sound='sound/weapons/gauss_shoot.ogg'),
 	)