From 2454fb3ed531575f2a8f63e081305056b32cd2a3 Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 01:57:35 -0700 Subject: [PATCH 1/7] Update plasma_cit.dm --- .../projectiles/guns/energy/plasma_cit.dm | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm index c953597f491..c5514659f25 100644 --- a/code/modules/projectiles/guns/energy/plasma_cit.dm +++ b/code/modules/projectiles/guns/energy/plasma_cit.dm @@ -63,7 +63,7 @@ weapon_class = WEAPON_CLASS_NORMAL weapon_weight = GUN_ONE_HAND_ONLY -/obj/item/gun/energy/laser/LaserAK +/obj/item/gun/energy/laser/LaserAK/ name = "Laser AK470" desc = "An experimental soviet energy weapon with an integrated uranium based breeder cell. Death solves all problems -- No man, no problem." can_remove = 0 @@ -85,4 +85,24 @@ ) 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/freeblade) + 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 cf793bab71982159a6907e246e9c1508ee8fac1d Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 02:01:24 -0700 Subject: [PATCH 2/7] Update plasma_cit.dm --- code/modules/projectiles/guns/energy/plasma_cit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm index c5514659f25..0b612ceb0a9 100644 --- a/code/modules/projectiles/guns/energy/plasma_cit.dm +++ b/code/modules/projectiles/guns/energy/plasma_cit.dm @@ -63,7 +63,7 @@ weapon_class = WEAPON_CLASS_NORMAL weapon_weight = GUN_ONE_HAND_ONLY -/obj/item/gun/energy/laser/LaserAK/ +/obj/item/gun/energy/laser/LaserAK name = "Laser AK470" desc = "An experimental soviet energy weapon with an integrated uranium based breeder cell. Death solves all problems -- No man, no problem." can_remove = 0 From 1011faf124ec7e465d2924e638a17968fa05218f Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 02:09:50 -0700 Subject: [PATCH 3/7] Update __donator.dm --- .../code/modules/client/loadout/__donator.dm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 4b5cd7f98c1..41a89e17df6 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -675,6 +675,17 @@ new /obj/item/gun/ballistic/automatic/pistol/automag(src) new /obj/item/ammo_box/m44box(src) +/datum/gear/donator/kits/jaggachi_6 + name = "Army Service Kit" + path = /obj/item/storage/box/large/custom_kit/jaggachi_6 + ckeywhitelist = list("jaggachi") + +/obj/item/storage/box/large/custom_kit/jaggachi_6/PopulateContents() + new /obj/item/clothing/under/soviet(src) + new /obj/item/clothing/suit/armor/light/duster/russian_coat(src) + new /obj/item/clothing/suit/armor/light/vest/russian(src) + new /obj/item/gun/energy/laser/LaserAK/worn(src) + // K From 303af9864b6790499f0723992169f87b992e15ea Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 11:05:11 -0700 Subject: [PATCH 4/7] Update __donator.dm --- modular_citadel/code/modules/client/loadout/__donator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 41a89e17df6..203081af84d 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -665,7 +665,7 @@ new /obj/item/storage/box/gun/revolver/revolver44(src) /datum/gear/donator/kits/jaggachi_5 - name = "Army Service Kit" + name = "Soviet Service Kit" path = /obj/item/storage/box/large/custom_kit/jaggachi_5 ckeywhitelist = list("jaggachi") From 016069d1a7bdfe69ec973bbeccba90f138cf5ac5 Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 12:37:54 -0700 Subject: [PATCH 5/7] Update beams.dm --- code/modules/projectiles/projectile/beams.dm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 8703b8b1380..e0a4e9cccb0 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -458,6 +458,13 @@ muzzle_type = /obj/effect/projectile/muzzle/laser impact_type = /obj/effect/projectile/impact/laser +/obj/item/projectile/beam/laser/pistol/AK470M //AK470M + name = "laser beam" + damage = 20 + icon_state = "arcane_barrage" + impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser + light_color = LIGHT_COLOR_PURPLE + /obj/item/projectile/beam/laser/solar //Solar Scorcher name = "solar scorcher beam" damage = 28 From 2fbc90fce4a1fe78fa607207104038f69d47ba81 Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 14:26:12 -0700 Subject: [PATCH 6/7] Update laser.dm --- code/modules/projectiles/ammunition/energy/laser.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 84310474b09..62a926a3aba 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -239,6 +239,11 @@ also: most hitscan weapons have more charge than their normal projectile counter projectile_type = /obj/item/projectile/beam/laser/lasgun/hitscan/focused e_cost = 100 +/obj/item/ammo_casing/energy/laser/AK470M + projectile_type = /obj/item/projectile/beam/laser/pistol/AK470M + e_cost = 165 //basically infinite shots + fire_sound = 'sound/f13weapons/WattzRifleFire.ogg' + /obj/item/ammo_casing/energy/laser/solar projectile_type = /obj/item/projectile/beam/laser/solar e_cost = 30 //basically infinite shots From 1c7a12c38a11539a42d0315f221e5b2e64e39232 Mon Sep 17 00:00:00 2001 From: Jaggachi <132544683+Jaggachi@users.noreply.github.com> Date: Sat, 15 Jul 2023 14:30:59 -0700 Subject: [PATCH 7/7] Update plasma_cit.dm --- code/modules/projectiles/guns/energy/plasma_cit.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/plasma_cit.dm b/code/modules/projectiles/guns/energy/plasma_cit.dm index 0b612ceb0a9..3717396e6be 100644 --- a/code/modules/projectiles/guns/energy/plasma_cit.dm +++ b/code/modules/projectiles/guns/energy/plasma_cit.dm @@ -95,7 +95,7 @@ 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/freeblade) + 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'