Underbarrel Gun Attachments #3825
Open
+600
−87
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
github-actions
bot
added
DME Edit
Sprites
MarkSuckerberg
requested changes
Nov 27, 2024
Comment on lines
+91
to
+92
| #define COMSIG_ATTACHMENT_WEILD "attach-weild" | ||
| #define COMSIG_ATTACHMENT_UNWEILD "attach-unwield" |
There was a problem hiding this comment.
Suggested change
| #define COMSIG_ATTACHMENT_WEILD "attach-weild" | |
| #define COMSIG_ATTACHMENT_UNWEILD "attach-unwield" | |
| #define COMSIG_ATTACHMENT_WIELD "attach-wield" | |
| #define COMSIG_ATTACHMENT_UNWIELD "attach-unwield" |
Comment on lines
+17
to
+19
| ///Called on the parents weild | ||
| var/datum/callback/on_wield | ||
| ///Called on the parents unweild |
There was a problem hiding this comment.
Suggested change
| ///Called on the parents weild | |
| var/datum/callback/on_wield | |
| ///Called on the parents unweild | |
| ///Called on the parents wield | |
| var/datum/callback/on_wield | |
| ///Called on the parents unwield |
Comment on lines
+71
to
+72
| RegisterSignal(parent, COMSIG_ATTACHMENT_WEILD, PROC_REF(try_wield)) | ||
| RegisterSignal(parent, COMSIG_ATTACHMENT_UNWEILD, PROC_REF(try_unwield)) |
There was a problem hiding this comment.
Suggested change
| RegisterSignal(parent, COMSIG_ATTACHMENT_WEILD, PROC_REF(try_wield)) | |
| RegisterSignal(parent, COMSIG_ATTACHMENT_UNWEILD, PROC_REF(try_unwield)) | |
| RegisterSignal(parent, COMSIG_ATTACHMENT_WIELD, PROC_REF(try_wield)) | |
| RegisterSignal(parent, COMSIG_ATTACHMENT_UNWIELD, PROC_REF(try_unwield)) |
| @@ -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?
|
|
||
| /obj/item/reagent_containers/glass/beaker/flamethrower_underbarrel | ||
| name = "internal fuel tank" | ||
| desc = "An internal fuel tank for a flamethrower. You shouldnt have been able to pull this out." |
There was a problem hiding this comment.
Suggested change
| desc = "An internal fuel tank for a flamethrower. You shouldnt have been able to pull this out." | |
| desc = "An internal fuel tank for a flamethrower. You shouldn't have been able to pull this out." |
|
|
||
| /obj/item/gun/grenadelauncher/underbarrel | ||
| name = "underbarrel riot grenade launcher" | ||
| desc = "An even terribler thing. Just despicable really. You shouldnt be seeing this." |
There was a problem hiding this comment.
Suggested change
| desc = "An even terribler thing. Just despicable really. You shouldnt be seeing this." | |
| desc = "An even more terrible thing. Just despicable, really. You shouldn't be seeing this." |
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: