Underbarrel Gun Attachments #3825
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarkSuckerberg
requested changes
Nov 27, 2024
| @@ -114,7 +125,7 @@ | |||
| /datum/component/attachment_holder/proc/do_attach(obj/item/attachment, mob/user, bypass_checks) | |||
| var/slot = SEND_SIGNAL(attachment, COMSIG_ATTACHMENT_GET_SLOT) | |||
| slot = attachment_slot_from_bflag(slot) | |||
| if(!(attachment.type in valid_types)) | |||
| if(!(is_type_in_list(attachment,valid_types))) | |||
There was a problem hiding this comment.
perhaps make valid_types a typecache?
There was a problem hiding this comment.
made it a typecache, hopefully I did it right
code/game/objects/items/attachments/gun_attachments/flamethrower.dm
Outdated
Show resolved
Hide resolved
code/game/objects/items/attachments/gun_attachments/riot_launcher.dm
Outdated
Show resolved
Hide resolved
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Gristlebee <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Gristlebee <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Gristlebee <[email protected]>
…her.dm Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Gristlebee <[email protected]>
…er.dm Co-authored-by: Mark Suckerberg <[email protected]> Signed-off-by: Gristlebee <[email protected]>
…test-Fork into underbarrel-guns
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
rye-rice
approved these changes
Dec 11, 2024
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About The Pull Request
Adds underbarrel gun attachments. Current roster is the underbarrel shotgun, e-gun, flamethrower, flaregun, riot grenade launcher, and 40mm grenade launcher. The first five can be bought from the outpost cargo.
Underbarrel guns can be fired/reloaded/interacted with by swapping the fire select to underbarrel.
Cleans up the riot grenade launcher code a bit.
Underbarrel gun sprites are recolors of Rye-rice's underbarrel grenade launcher.
Why It's Good For The Game
Adds some more customization and personalization options to a players loadout, and I think it's neat.
Changelog
🆑 Gristlebee, Rye-rice
add: Underbarrel guns
fix: Grenade launcher code
/:cl: