diff --git a/code/game/objects/effects/spawners/masterlootdrop.dm b/code/game/objects/effects/spawners/masterlootdrop.dm index 4244819a853..93f4d5fd98a 100644 --- a/code/game/objects/effects/spawners/masterlootdrop.dm +++ b/code/game/objects/effects/spawners/masterlootdrop.dm @@ -282,6 +282,7 @@ /obj/item/gun/ballistic/revolver/buntline = 1, /obj/item/gun/ballistic/revolver/taurjudge = 1, /obj/item/gun/ballistic/automatic/ak556 = 1, + /obj/item/gun/ballistic/automatic/aksmol = 2, ) /obj/effect/spawner/lootdrop/f13/rare_guns diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm index 0c207398b5e..c684900e705 100644 --- a/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -221,7 +221,7 @@ icon = 'icons/fallout/objects/guns/ammo.dmi' caliber = list(CALIBER_556) ammo_type = /obj/item/ammo_casing/a556 - max_ammo = 25 + max_ammo = 35 multiple_sprites = 2 custom_materials = list(/datum/material/iron = MATS_LIGHT_RIFLE_MAGAZINE) w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index bf217905e5d..9d7a2a3f4a3 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -2395,6 +2395,31 @@ can_suppress = TRUE fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg' + +/obj/item/gun/ballistic/automatic/aksmol + name = "Ak74u" + desc = "A AK74u assault rifle. Rechambered in 5.45x39 NATO , this assault rifle was the answer for a more lighter assault rifle. This one comes with wood furniture and has no stock, allowing much easier carry at the cost of higher recoil." + icon = 'icons/fallout/objects/guns/ballistic.dmi' + lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi' + righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi' + item_state = "ak74utest" + icon_state = "ak74utest" + mag_type = /obj/item/ammo_box/magazine/m556/rifle + init_mag_type = /obj/item/ammo_box/magazine/m556/rifle + weapon_class = WEAPON_CLASS_NORMAL + weapon_weight = GUN_TWO_HAND_ONLY + damage_multiplier = GUN_LESS_DAMAGE_T2 + init_recoil = AUTORIFLE_RECOIL(1.5, 1.5) + init_firemodes = list( + /datum/firemode/automatic/rpm200, + /datum/firemode/semi_auto + ) + can_flashlight = FALSE + can_bayonet = FALSE + can_scope = TRUE + can_suppress = TRUE + fire_sound = 'sound/f13weapons/assaultrifle_fire.ogg' + /* * * * * * * * * * * * Police Assault Rifle * Baseline 5mm autorifle @@ -2943,13 +2968,14 @@ init_mag_type = /obj/item/ammo_box/magazine/machinegundrummag weapon_class = WEAPON_CLASS_RIFLE weapon_weight = GUN_TWO_HAND_ONLY - slowdown = GUN_SLOWDOWN_RIFLE_LMG * 1.5 + slowdown = GUN_SLOWDOWN_PISTOL_LIGHT * 0.6 damage_multiplier = GUN_LESS_DAMAGE_T2 cock_delay = GUN_COCK_RIFLE_BASE init_recoil = LMG_RECOIL(1.8, 1.8) init_firemodes = list( - /datum/firemode/burst/four/slower + /datum/firemode/automatic/rpm40 ) + autofire_shot_delay = 4 can_scope = FALSE can_suppress = FALSE can_bayonet = FALSE diff --git a/icons/fallout/objects/guns/ammo.dmi b/icons/fallout/objects/guns/ammo.dmi index 34fcea39b1c..2d3806fb2e3 100644 Binary files a/icons/fallout/objects/guns/ammo.dmi and b/icons/fallout/objects/guns/ammo.dmi differ diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi index 31d2c2203ad..d5384b57aa2 100644 Binary files a/icons/fallout/objects/guns/ballistic.dmi and b/icons/fallout/objects/guns/ballistic.dmi differ diff --git a/icons/fallout/onmob/weapons/guns_lefthand.dmi b/icons/fallout/onmob/weapons/guns_lefthand.dmi index 957f53a9eeb..def204547b9 100644 Binary files a/icons/fallout/onmob/weapons/guns_lefthand.dmi and b/icons/fallout/onmob/weapons/guns_lefthand.dmi differ diff --git a/icons/fallout/onmob/weapons/guns_righthand.dmi b/icons/fallout/onmob/weapons/guns_righthand.dmi index 76b511a2bb4..1c5cbc67955 100644 Binary files a/icons/fallout/onmob/weapons/guns_righthand.dmi and b/icons/fallout/onmob/weapons/guns_righthand.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index e4d196b0a40..7e4c862fa57 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -1275,13 +1275,8 @@ /obj/item/storage/box/large/custom_kit/tk420634/PopulateContents() new /obj/item/melee/onehanded/knife/trench(src) - new /obj/item/ammo_box/c9mm(src) - new /obj/item/ammo_box/c9mm(src) - new /obj/item/ammo_box/magazine/uzim9mm/(src) - new /obj/item/reagent_containers/food/snacks/grown/poppy/lily(src) - new /obj/item/binoculars(src) - new /obj/item/gun/ballistic/automatic/smg/mini_uzi/mac10/worn(src) - new /obj/item/ammo_box/c9mm(src) + new /obj/item/card/lowbounty(src) + new /obj/item/gun_upgrade/scope/killer(src) /datum/gear/donator/kits/tk420634_2 name = "Catgirl Kit" diff --git a/modular_coyote/eris/code/gun_firemode.dm b/modular_coyote/eris/code/gun_firemode.dm index 94ad100c9c1..f8281f30671 100644 --- a/modular_coyote/eris/code/gun_firemode.dm +++ b/modular_coyote/eris/code/gun_firemode.dm @@ -204,6 +204,19 @@ fire_type_default = GUN_FIREMODE_AUTO shoot_delay_default = GUN_FIRE_RATE_150 + +/datum/firemode/automatic/rpm75 + name = "fully automatic" + desc = "Automatic - 75rpm" + fire_type_default = GUN_FIREMODE_AUTO + shoot_delay_default = GUN_FIRE_RATE_75 + +/datum/firemode/automatic/rpm40 + name = "fully automatic" + desc = "Automatic - 40rpm" + fire_type_default = GUN_FIREMODE_AUTO + shoot_delay_default = GUN_FIRE_RATE_40 + /datum/firemode/burst name = "Burstfire" desc = "Shoot multiple shots per triggerpull."