Merge pull request #2648 from jinxynii/master

gun fixes, jaggachi and aldric
ARF-SS13 · Jul 16, 2023 · 121b884 · 121b884
2 parents bc6dfc5 + 26491fc
commit 121b884
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 23 deletions.
diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm
@@ -241,7 +241,7 @@ also: most hitscan weapons have more charge than their normal projectile counter
 
 /obj/item/ammo_casing/energy/laser/AK470M
 	projectile_type = /obj/item/projectile/beam/laser/pistol/AK470M
-	e_cost = 165 //basically infinite shots
+	e_cost = 66.66 //30 shots roughly.
 	fire_sound = 'sound/f13weapons/WattzRifleFire.ogg'
 
 /obj/item/ammo_casing/energy/laser/solar

diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
@@ -632,6 +632,24 @@
 		/datum/firemode/semi_auto/slow
 	)
 
+/obj/item/gun/energy/laser/LaserAK/worn
+	name = "Laser AK470M"
+	desc = "An AK470 that was rebuilt with spare parts found around the wastes."
+	icon_state = "LaserAK"
+	item_state = null
+	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
+	cell_type = "/obj/item/stock_parts/cell/ammo/mfc"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser/AK470M)
+	ammo_x_offset = 4
+	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
+	righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
+	weapon_class = WEAPON_CLASS_RIFLE
+	weapon_weight = GUN_ONE_HAND_ONLY
+	init_firemodes = list(
+	/datum/firemode/semi_auto,
+	/datum/firemode/automatic/rpm300
+	)
+	init_recoil = LASER_AUTORIFLE_RECOIL(1, 1)
 
 //AER9 Laser rifle
 /obj/item/gun/energy/laser/aer9

diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm
@@ -84,25 +84,3 @@
 	/datum/firemode/automatic/rpm300
 	)
 	init_recoil = LASER_AUTORIFLE_RECOIL(1, 1)
-
-/obj/item/gun/energy/laser/LaserAK/worn
-	name = "Laser AK470M"
-	desc = "An AK470 that was rebuilt with parts from a Freeblade blaster."
-	can_remove = 0
-	can_charge = 0
-	selfcharge = 1
-	icon_state = "LaserAK"
-	item_state = null
-	icon = 'modular_citadel/icons/obj/guns/VGguns.dmi'
-	cell_type = "/obj/item/stock_parts/cell/pulse/carbine"
-	ammo_type = list(/obj/item/projectile/beam/laser/pistol/AK470M)
-	ammo_x_offset = 4
-	lefthand_file = 'modular_citadel/icons/mob/citadel/guns_lefthand.dmi'
-	righthand_file = 'modular_citadel/icons/mob/citadel/guns_righthand.dmi'
-	weapon_class = WEAPON_CLASS_RIFLE
-	weapon_weight = GUN_ONE_HAND_ONLY
-	init_firemodes = list(
-	/datum/firemode/semi_auto,
-	/datum/firemode/automatic/rpm300
-	)
-	init_recoil = LASER_AUTORIFLE_RECOIL(1, 1)
diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm
@@ -168,6 +168,8 @@
 	desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unlucky target. This ones glows purple and has the words; Pick a god and pray. etched into the side."
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/eve/caster)
 	cell_type = /obj/item/stock_parts/cell/ammo/mfc
+	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
 	can_scope = FALSE
 	equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
 	weapon_class = WEAPON_CLASS_CARBINE
@@ -186,6 +188,8 @@
 	desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unfortunate soul."
 	ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/caster)
 	cell_type = /obj/item/stock_parts/cell/ammo/mfc
+	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
 	can_scope = FALSE
 	equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
 	weapon_class = WEAPON_CLASS_CARBINE