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

Jump to bottom

You can no longer fit OT grenades in grenade launchers #6049

Closed
wants to merge 2 commits into from
Closed

You can no longer fit OT grenades in grenade launchers #6049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2400085
Update gun_attachables.dm
iloveloopers Mar 30, 2024
6b6a563
Update grenade_launcher.dm
iloveloopers Mar 30, 2024
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/gun_attachables.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2797,7 +2797,7 @@ Defined in conflicts.dm of the #defines folder.
if(!breech_open)
to_chat(user, SPAN_WARNING("\The [src]'s breech must be open to load grenades! (use unique-action)"))
return
if(!istype(G) || istype(G, /obj/item/explosive/grenade/spawnergrenade/))
if(!istype(G) || istype(G, /obj/item/explosive/grenade/spawnergrenade/) || istype(G, /obj/item/explosive/grenade/custom))
to_chat(user, SPAN_WARNING("[src] doesn't accept that type of grenade."))
return
if(!G.active) //can't load live grenades
Expand Down
4 changes: 1 addition & 3 deletions code/modules/projectiles/guns/specialist/launcher/grenade_launcher.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
///Does it launch its grenades in a low arc or a high? Do they strike people in their path, or fly beyond?
var/is_lobbing = FALSE
///Verboten munitions. This is a blacklist. Anything in this list isn't loadable.
var/disallowed_grenade_types = list(/obj/item/explosive/grenade/spawnergrenade, /obj/item/explosive/grenade/alien, /obj/item/explosive/grenade/incendiary/molotov, /obj/item/explosive/grenade/flashbang)
var/disallowed_grenade_types = list(/obj/item/explosive/grenade/spawnergrenade, /obj/item/explosive/grenade/alien, /obj/item/explosive/grenade/incendiary/molotov, /obj/item/explosive/grenade/flashbang, /obj/item/explosive/grenade/custom)
///What is this weapon permitted to fire? This is a whitelist. Anything in this list can be fired. Anything.
var/valid_munitions = list(/obj/item/explosive/grenade)

Expand Down Expand Up @@ -201,8 +201,6 @@
fired.forceMove(get_turf(src))
fired.throw_atom(target, 20, SPEED_VERY_FAST, user, null, NORMAL_LAUNCH, pass_flags)



//Doesn't use these. Listed for reference.
/obj/item/weapon/gun/launcher/grenade/load_into_chamber()
return
Expand Down
Loading