Skip to content

Commit

Permalink
ЕЕЕЕЕЕЕЕЕЕЕЕЕААААААААААА
Browse files Browse the repository at this point in the history
  • Loading branch information
BasiaBelov committed Nov 21, 2024
1 parent 666d8c9 commit 1c0794e
Show file tree
Hide file tree
Showing 14 changed files with 66 additions and 1 deletion.
9 changes: 8 additions & 1 deletion _maps/map_files/Talos/TGS_Talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
5 changes: 5 additions & 0 deletions code/modules/projectiles/attachables/stock.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
34 changes: 34 additions & 0 deletions code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down
19 changes: 19 additions & 0 deletions code/modules/projectiles/magazines/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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."
Expand All @@ -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
Expand Down
Binary file modified icons/Marine/gun64.dmi
Binary file not shown.
Binary file modified icons/Marine/marine-weapons.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/back.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand_1.dmi
Binary file not shown.
Binary file modified icons/mob/suit_slot.dmi
Binary file not shown.
Binary file modified icons/obj/items/ammo.dmi
Binary file not shown.
Binary file added sound/weapons/guns/fire/ak47-ani.ogg
Binary file not shown.
Binary file added sound/weapons/guns/interact/ak47-ani_cocked.ogg
Binary file not shown.
Binary file added sound/weapons/guns/interact/ak47-ani_reload.ogg
Binary file not shown.

0 comments on commit 1c0794e

Please sign in to comment.