From b020d295f7ecf42561820a4ebaf9b6d7c5521605 Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:31:38 -0400 Subject: [PATCH 1/7] trying a fix i bet you this is why it broke!!! --- code/modules/projectiles/guns/energy/laser.dm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 4b93bc77b32..f28f10d943e 100644 --- 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/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) //AER9 Laser rifle /obj/item/gun/energy/laser/aer9 From dad31c7140dfd1ba61f218796f9249b290691e4c Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:34:14 -0400 Subject: [PATCH 2/7] Update laser.dm --- code/modules/projectiles/ammunition/energy/laser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 62a926a3aba..e616a6e8df5 100644 --- 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 From 92b2580645c1b49a5453458f3a2a62a8bc45462b Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:35:05 -0400 Subject: [PATCH 3/7] Update plasma_cit.dm --- .../projectiles/guns/energy/plasma_cit.dm | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm index 3717396e6be..9aeac5a95f2 100644 --- 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) From b67ca5862c7214a5ceb7d2e410d2f33fcfb608ed Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:38:03 -0400 Subject: [PATCH 4/7] ass --- code/modules/projectiles/guns/energy/plasmaf13.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm index 642aa7949d7..541a1fdb75e 100644 --- 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/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/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/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/guns_righthand.dmi' can_scope = FALSE equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg' weapon_class = WEAPON_CLASS_CARBINE From c6d87fd60cba53682bce4807fd24dc8882dc6639 Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:40:14 -0400 Subject: [PATCH 5/7] Update laser.dm --- code/modules/projectiles/guns/energy/laser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index f28f10d943e..ad4bb7ef959 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -639,7 +639,7 @@ 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/projectile/beam/laser/pistol/AK470M) + 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' From 6154fb907f32ce06893d6b60b017ce90da2770ee Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:45:31 -0400 Subject: [PATCH 6/7] Update plasmaf13.dm --- code/modules/projectiles/guns/energy/plasmaf13.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm index 541a1fdb75e..c1ba43a4c48 100644 --- a/code/modules/projectiles/guns/energy/plasmaf13.dm +++ b/code/modules/projectiles/guns/energy/plasmaf13.dm @@ -188,8 +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/guns_lefthand.dmi' - righthand_file = 'icons/fallout/onmob/guns_righthand.dmi' + 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 From 26491fcc867093f549ed873564c4ba69f6593248 Mon Sep 17 00:00:00 2001 From: gob <73593198+jinxynii@users.noreply.github.com> Date: Sun, 16 Jul 2023 19:49:44 -0400 Subject: [PATCH 7/7] Update plasmaf13.dm --- code/modules/projectiles/guns/energy/plasmaf13.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm index c1ba43a4c48..3a43941e6d3 100644 --- a/code/modules/projectiles/guns/energy/plasmaf13.dm +++ b/code/modules/projectiles/guns/energy/plasmaf13.dm @@ -168,8 +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/guns_lefthand.dmi' - righthand_file = 'icons/fallout/onmob/guns_righthand.dmi' + 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