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.

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

Фаллов Вектор 3 >> 1.75, убрал дубликаты кода allowed_ammo_types #766

Merged
merged 1 commit into from
Dec 6, 2024
+1 −6
Merged

Фаллов Вектор 3 >> 1.75, убрал дубликаты кода allowed_ammo_types #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_datums/bullet/submachinegun.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
accuracy_var_high = 7
damage = 20
accurate_range = 4
damage_falloff = 3
damage_falloff = 1.75
penetration = 0
additional_xeno_penetration = 10
shrapnel_chance = 25
Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/guns/rifles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
max_shells = 36 //codex
force = 20
default_ammo_type = /obj/item/ammo_magazine/rifle/ar18
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/ar18)
item_icons = list(
slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi',
slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',
Expand Down Expand Up @@ -139,7 +138,6 @@
max_shells = 50 //codex
force = 20
default_ammo_type = /obj/item/ammo_magazine/rifle/ar12
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/ar12)
item_icons = list(
slot_l_hand_str = 'icons/mob/items_lefthand_1.dmi',
slot_r_hand_str = 'icons/mob/items_righthand_1.dmi',
Expand Down Expand Up @@ -681,7 +679,6 @@
cocked_sound = 'sound/weapons/guns/interact/ak47_cocked.ogg'
default_ammo_type = /obj/item/ammo_magazine/rifle/lmg_d
allowed_ammo_types = list(/obj/item/ammo_magazine/rifle/lmg_d)

attachable_allowed = list(
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonetknife,
Expand Down
2 changes: 0 additions & 2 deletions code/modules/projectiles/guns/smgs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
type_of_casings = null
default_ammo_type = /obj/item/ammo_magazine/smg/mp19
allowed_ammo_types = list(/obj/item/ammo_magazine/smg/mp19)

w_class = WEIGHT_CLASS_NORMAL
attachable_allowed = list(
/obj/item/attachable/suppressor,
Expand Down Expand Up @@ -422,7 +421,6 @@
default_ammo_type = /obj/item/ammo_magazine/smg/uzi
allowed_ammo_types = list(/obj/item/ammo_magazine/smg/uzi, /obj/item/ammo_magazine/smg/uzi/extended)
attachable_offset = list("muzzle_x" = 30, "muzzle_y" = 20,"rail_x" = 11, "rail_y" = 27, "under_x" = 22, "under_y" = 16, "stock_x" = 22, "stock_y" = 16)

fire_delay = 0.15 SECONDS
burst_amount = 4
accuracy_mult_unwielded = 0.9
Expand Down
Loading