Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

P-51 Tristol [Cursed Gun] #808

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions code/modules/projectiles/guns/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,27 @@
scatter_unwielded = 0
aim_speed_modifier = 0

/obj/item/weapon/gun/pistol/p17/p51
name = "\improper P-51 tristol"
desc = "Сваренные друг с другом три пистолета P17. Вот кому-то делать нефиг..."
icon_state = "tp51"
default_ammo_type = /obj/item/ammo_magazine/pistol/p17/p51
allowed_ammo_types = list(/obj/item/ammo_magazine/pistol/p17/p51)
attachable_allowed = list(
/obj/item/attachable/flashlight,
/obj/item/attachable/heavy_barrel,
/obj/item/attachable/lace,
/obj/item/attachable/flashlight/under,
)

attachable_offset = list("muzzle_x" = 28, "muzzle_y" = 20,"rail_x" = 9, "rail_y" = 23, "under_x" = 18, "under_y" = 14, "stock_x" = 21, "stock_y" = 18)

recoil_backtime_multiplier = 0.7
recoil = 5
recoil_unwielded = 7
scatter = 10
scatter_unwielded = 20
fire_delay = 0.025 SECONDS

//-------------------------------------------------------
// Browning Hipower
Expand Down
8 changes: 8 additions & 0 deletions code/modules/projectiles/magazines/pistols.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,14 @@
max_rounds = 8
w_class = WEIGHT_CLASS_TINY

//-------------------------------------------------------
//P-51.
/obj/item/ammo_magazine/pistol/p17/p51
name = "\improper P-51 pocket pistol AP magazine (.380)"
desc = "Склеянные друг с другом три магазина для такого же пистолета."
max_rounds = 24
icon_state = "tp51"

//-------------------------------------------------------
//Automag. .50.

Expand Down
Binary file modified icons/obj/items/ammo/pistol.dmi
Binary file not shown.
Binary file modified icons/obj/items/gun.dmi
Binary file not shown.
Loading