Skip to content

фикс перевода дроби #13679

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.

Sign up for GitHub

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

Merged
merged 18 commits into from
Jan 23, 2025
Merged

фикс перевода дроби #13679

Changes from 7 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3ef0cfc
Update bullets.dm
maleyvich Dec 12, 2024
c81b46a
Update bullets.dm
maleyvich Dec 12, 2024
f1ddf8e
Update bullets.dm
maleyvich Dec 12, 2024
e840c49
Update bullets.dm
maleyvich Dec 12, 2024
9d38251
Update bullets.dm
maleyvich Dec 12, 2024
00fd70f
Update code/modules/projectiles/ammunition/bullets.dm
maleyvich Dec 12, 2024
4f03429
Update code/modules/projectiles/ammunition/bullets.dm
maleyvich Dec 12, 2024
4d0cb82
Update boxes.dm
maleyvich Dec 12, 2024
2828730
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
16901f3
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
74e6d46
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
6644075
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
002066c
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
19f26f7
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
fa731e9
Update code/modules/projectiles/ammunition/boxes.dm
maleyvich Jan 7, 2025
5ee249f
Merge branch 'master' into buckshot-fix
maleyvich Jan 7, 2025
74d1bf3
Merge branch 'master' into buckshot-fix
AzzyDreemurr13 Jan 13, 2025
58523d4
Merge branch 'master' into buckshot-fix
AzzyDreemurr13 Jan 20, 2025
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
12 changes: 6 additions & 6 deletions code/modules/projectiles/ammunition/bullets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,44 +90,44 @@

/obj/item/ammo_casing/shotgun
name = "shotgun slug"
desc = "Патрон от 12-го калибра типа пуля."
desc = "Патрон 12-го калибра типа \"пуля\"."
icon_state = "blshell"
caliber = "shotgun"
projectile_type = /obj/item/projectile/bullet/slug
m_amt = 3750

/obj/item/ammo_casing/shotgun/buckshot
name = "buckshot shell"
desc = "Патрон от 12-го калибра типа картечь."
desc = "Патрон 12-го калибра типа \"картечь\"."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

почему не просто дробь

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

дробь и картечь хоть и очень похожие понятия но всё-же различающиеся
пусть останется как было..

icon_state = "gshell"
pellets = 7
projectile_type = /obj/item/projectile/bullet/pellet

/obj/item/ammo_casing/shotgun/beanbag
name = "beanbag shell"
desc = "Патрон от 12-го калибра типа травматический."
desc = "Патрон 12-го калибра типа \"травмат\"."
icon_state = "bshell"
projectile_type = /obj/item/projectile/bullet/weakbullet/beanbag
m_amt = 300

/obj/item/ammo_casing/shotgun/stunshot
name = "stun shell"
desc = "Патрон от 12-го калибра типа электрошок."
desc = "Патрон 12-го калибра типа \"электрошок\"."
icon_state = "stunshell"
projectile_type = /obj/item/projectile/bullet/stunshot
pellets = 5
m_amt = 2500

/obj/item/ammo_casing/shotgun/incendiary
name = "incendiary shell"
desc = "Патрон от 12-го калибра типа зажигательный."
desc = "Патрон 12-го калибра типа \"зажигательный\"."
icon_state = "ishell"
projectile_type = /obj/item/projectile/bullet/incendiary/buckshot
pellets = 12

/obj/item/ammo_casing/shotgun/dart
name = "shotgun darts"
desc = "Патрон от 12-го калибра типа дротик."
desc = "Патрон 12 калибра типа \"флешетта\"."
icon_state = "cshell"
projectile_type = /obj/item/projectile/energy/dart
m_amt = 2500
Expand Down
Loading