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

Bayonets no longer mount on M41A, UGL no longer removable #515

Merged
merged 2 commits into from
Dec 26, 2024
Merged
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
2 changes: 2 additions & 0 deletions code/modules/projectiles/gun_attachables.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2972,6 +2972,7 @@ Defined in conflicts.dm of the #defines folder.
desc = "Standard pump action underslung grenade launcher. Fits the M41A, four round tube, chambers one."
icon_state = "grenade-mk1"
attach_icon = "grenade-mk1_a"
flags_attach_features = ATTACH_ACTIVATION|ATTACH_RELOADABLE|ATTACH_WEAPON
current_rounds = 0
max_rounds = 5
max_range = 10
Expand All @@ -2986,6 +2987,7 @@ Defined in conflicts.dm of the #defines folder.
desc = "Compact variant of the PN pump action underslung grenade launcher. Fits the M120 shotgun, three round tube, chambers one."
icon_state = "grenade-mk1"
attach_icon = "grenade-mk1_a"
flags_attach_features = ATTACH_ACTIVATION|ATTACH_RELOADABLE|ATTACH_WEAPON
current_rounds = 0
max_rounds = 3
max_range = 10
Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/guns/rifles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -373,15 +373,12 @@
current_mag = /obj/item/ammo_magazine/rifle/m41aMK1
attachable_allowed = list(
/obj/item/attachable/suppressor,
/obj/item/attachable/bayonet,
/obj/item/attachable/bayonet/upp,
/obj/item/attachable/reddot,
/obj/item/attachable/magnetic_harness,
/obj/item/attachable/flashlight,
/obj/item/attachable/reflex,
/obj/item/attachable/attached_gun/grenade/mk1,
/obj/item/attachable/stock/rifle/collapsible,
/obj/item/attachable/attached_gun/shotgun,
)

flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER
Expand Down
Loading