diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm index f0adc348b91..f7bbde33041 100644 --- a/_maps/map_files/Talos/TGS_Talos.dmm +++ b/_maps/map_files/Talos/TGS_Talos.dmm @@ -15384,7 +15384,14 @@ /area/mainship/living/mechbunks) "jrf" = ( /obj/structure/table/mainship, -/obj/effect/spawner/random/weaponry/melee, +/obj/item/weapon/gun/rifle/mpi_km/anime, +/obj/item/ammo_magazine/rifle/mpi_km/anime, +/obj/item/ammo_magazine/rifle/mpi_km/anime, +/obj/item/ammo_magazine/rifle/mpi_km/anime, +/obj/item/ammo_magazine/rifle/mpi_km/anime, +/obj/item/ammo_magazine/rifle/mpi_km/carbine/anime, +/obj/item/ammo_magazine/rifle/mpi_km/carbine/anime, +/obj/item/ammo_magazine/rifle/mpi_km/extended/anime, /turf/open/floor/plating, /area/mainship/hull/upper_hull) "jrs" = ( diff --git a/code/modules/projectiles/attachables/stock.dm b/code/modules/projectiles/attachables/stock.dm index 7241a08d414..7f5ace42560 100644 --- a/code/modules/projectiles/attachables/stock.dm +++ b/code/modules/projectiles/attachables/stock.dm @@ -46,6 +46,11 @@ desc = "A black polymer stock, made to fit the MPi-KM." icon_state = "ak47stock_black" +/obj/item/attachable/stock/mpi_km/anime + name = "MPi-KM polymer stock" + desc = "A blue polymer stock, made to fit the MPi-KM." + icon_state = "ak47stock_anime" + /obj/item/attachable/stock/lmg_d name = "lMG-D wooden stock" desc = "A metallic stock with a wooden paint coating, made to fit lMG-D." diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index fa7127f893d..abfe0bf253c 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -561,10 +561,13 @@ /obj/item/ammo_magazine/rifle/mpi_km, /obj/item/ammo_magazine/rifle/mpi_km/plum, /obj/item/ammo_magazine/rifle/mpi_km/black, + /obj/item/ammo_magazine/rifle/mpi_km/anime, /obj/item/ammo_magazine/rifle/mpi_km/carbine, /obj/item/ammo_magazine/rifle/mpi_km/carbine/plum, /obj/item/ammo_magazine/rifle/mpi_km/carbine/black, + /obj/item/ammo_magazine/rifle/mpi_km/carbine/anime, /obj/item/ammo_magazine/rifle/mpi_km/extended, + /obj/item/ammo_magazine/rifle/mpi_km/extended/anime, ) aim_slowdown = 0.5 attachable_allowed = list( @@ -605,6 +608,37 @@ /obj/item/attachable/bayonet, ) +/obj/item/weapon/gun/rifle/mpi_km/anime + name = "\improper MPi-KM japanese rifle" + desc = "Cамый обычный калаш. Разве что... он побывал в руках странного оружейного мастера..." + fire_sound = 'sound/weapons/guns/fire/ak47-ani.ogg' + reload_sound = 'sound/weapons/guns/interact/ak47-ani_reload.ogg' + cocked_sound = 'sound/weapons/guns/interact/ak47-ani_cocked.ogg' + icon_state = "ak47_anime" + item_state = "ak47_anime" + default_ammo_type = /obj/item/ammo_magazine/rifle/mpi_km/anime + attachable_allowed = list( + /obj/item/attachable/bayonet, + /obj/item/attachable/bayonetknife, + /obj/item/attachable/bayonetknife/som, + /obj/item/attachable/flashlight, + /obj/item/attachable/magnetic_harness, + /obj/item/attachable/buildasentry, + /obj/item/attachable/stock/mpi_km/anime, + /obj/item/attachable/shoulder_mount, + /obj/item/attachable/verticalgrip, + /obj/item/weapon/gun/pistol/plasma_pistol, + /obj/item/weapon/gun/shotgun/combat/masterkey, + /obj/item/weapon/gun/flamer/mini_flamer, + /obj/item/weapon/gun/grenade_launcher/underslung, + /obj/item/weapon/gun/rifle/pepperball/pepperball_mini, + /obj/item/weapon/gun/grenade_launcher/underslung/mpi, //alt sprite, unremovable + /obj/item/attachable/reddot, + /obj/item/attachable/lasersight, + /obj/item/attachable/flashlight/under, + ) + starting_attachment_types = list(/obj/item/attachable/stock/mpi_km/anime) + /obj/item/weapon/gun/rifle/mpi_km/grenadier desc = "A cheap and robust rifle, sometimes better known as an 'AK'. Chambers 7.62x39mm. This one has a built in underbarrel grenade launcher and looks very old, but well looked after." starting_attachment_types = list( diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 08defd211f7..e14137b9cdb 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -131,6 +131,12 @@ icon_state_mini = "mag_rifle" bonus_overlay = "ak_40_black" +/obj/item/ammo_magazine/rifle/mpi_km/anime + desc = "A 7.62x39mm magazine for the Kalashnikov series of firearms. This one had an modern black polymer finish." + icon_state = "ak_40_anime" + icon_state_mini = "mag_rifle" + bonus_overlay = "ak_40_anime" + /obj/item/ammo_magazine/rifle/mpi_km/carbine name = "\improper V-34 magazine (7.62x39mm)" desc = "A 30 round 7.62x39mm magazine for the Kalashnikov series of firearms." @@ -154,6 +160,12 @@ icon_state_mini = "mag_rifle" bonus_overlay = "ak_30_black" +/obj/item/ammo_magazine/rifle/mpi_km/carbine/anime + desc = "A 30 round 7.62x39mm magazine for the Kalashnikov series of firearms. This one had an modern black polymer finish." + icon_state = "ak_30_anime" + icon_state_mini = "mag_rifle" + bonus_overlay = "ak_30_anime" + /obj/item/ammo_magazine/rifle/mpi_km/extended name = "\improper MPi-KM extended magazine (7.62x39mm)" desc = "A 60 round 7.62x39mm Kalashnikov magazine. this one is notably heavy." @@ -164,6 +176,13 @@ aim_speed_mod = 0.2 wield_delay_mod = 0.2 +/obj/item/ammo_magazine/rifle/mpi_km/extended/anime + name = "\improper MPi-KM extended anime magazine (7.62x39mm)" + desc = "A 60 round 7.62x39mm Kalashnikov magazine. this one is notably heavy." + icon_state = "ak47_ext_anime" + icon_state_mini = "mag_rifle" + bonus_overlay = "ak47_ex_anime" + // RPD /obj/item/ammo_magazine/rifle/lmg_d diff --git a/icons/Marine/gun64.dmi b/icons/Marine/gun64.dmi index 475926324c8..491d432e492 100644 Binary files a/icons/Marine/gun64.dmi and b/icons/Marine/gun64.dmi differ diff --git a/icons/Marine/marine-weapons.dmi b/icons/Marine/marine-weapons.dmi index 2d1af892c1a..689e2085603 100644 Binary files a/icons/Marine/marine-weapons.dmi and b/icons/Marine/marine-weapons.dmi differ diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi index 0eb456c6e89..a8878fc7531 100644 Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ diff --git a/icons/mob/items_lefthand_1.dmi b/icons/mob/items_lefthand_1.dmi index f42a26c520f..77e29b5f8aa 100644 Binary files a/icons/mob/items_lefthand_1.dmi and b/icons/mob/items_lefthand_1.dmi differ diff --git a/icons/mob/items_righthand_1.dmi b/icons/mob/items_righthand_1.dmi index 55932345fb8..e3bf1480491 100644 Binary files a/icons/mob/items_righthand_1.dmi and b/icons/mob/items_righthand_1.dmi differ diff --git a/icons/mob/suit_slot.dmi b/icons/mob/suit_slot.dmi index a9051cf4d00..1802d0d2fda 100644 Binary files a/icons/mob/suit_slot.dmi and b/icons/mob/suit_slot.dmi differ diff --git a/icons/obj/items/ammo.dmi b/icons/obj/items/ammo.dmi index 36fe7d7ebdf..a2b18744c1c 100644 Binary files a/icons/obj/items/ammo.dmi and b/icons/obj/items/ammo.dmi differ diff --git a/sound/weapons/guns/fire/ak47-ani.ogg b/sound/weapons/guns/fire/ak47-ani.ogg new file mode 100644 index 00000000000..fb500463341 Binary files /dev/null and b/sound/weapons/guns/fire/ak47-ani.ogg differ diff --git a/sound/weapons/guns/interact/ak47-ani_cocked.ogg b/sound/weapons/guns/interact/ak47-ani_cocked.ogg new file mode 100644 index 00000000000..f4f49e8a12f Binary files /dev/null and b/sound/weapons/guns/interact/ak47-ani_cocked.ogg differ diff --git a/sound/weapons/guns/interact/ak47-ani_reload.ogg b/sound/weapons/guns/interact/ak47-ani_reload.ogg new file mode 100644 index 00000000000..b02106050f1 Binary files /dev/null and b/sound/weapons/guns/interact/ak47-ani_reload.ogg differ