more upp nades #597
Closed
more upp nades #597
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
Doubleumc
requested changes
Dec 17, 2024
| @@ -2897,7 +2900,7 @@ Defined in conflicts.dm of the #defines folder. | |||
| update_icon() | |||
|
|
|||
| /obj/item/attachable/attached_gun/grenade/reload_attachment(obj/item/explosive/grenade/G, mob/user) | |||
| if(!breech_open) | |||
| if(!breech_open && has_breech) | |||
There was a problem hiding this comment.
Suggested change
| if(!breech_open && has_breech) | |
| if(has_breech && !breech_open) |
Real minor nitpick, but reads better if has_breech is checked before breech_open. breech_open depends on has_breech to mean something, so flows better to check has_breech first.
| @@ -2918,7 +2921,7 @@ Defined in conflicts.dm of the #defines folder. | |||
|
|
|||
| /obj/item/attachable/attached_gun/grenade/unload_attachment(mob/user, reload_override = FALSE, drop_override = FALSE, loc_override = FALSE) | |||
| . = TRUE //Always uses special unloading. | |||
| if(!breech_open) | |||
| if(!breech_open && has_breech) | |||
There was a problem hiding this comment.
Suggested change
| if(!breech_open && has_breech) | |
| if(has_breech && !breech_open) |
| @@ -2943,12 +2946,12 @@ Defined in conflicts.dm of the #defines folder. | |||
| if(user) | |||
| to_chat(user, SPAN_WARNING("You must hold [gun] with two hands to use \the [src].")) | |||
| return | |||
| if(breech_open) | |||
| if(breech_open && has_breech) | |||
There was a problem hiding this comment.
Suggested change
| if(breech_open && has_breech) | |
| if(has_breech && breech_open) |
| if(user) | ||
| to_chat(user, SPAN_WARNING("You must close the breech to fire \the [src]!")) | ||
| playsound(user, 'sound/weapons/gun_empty.ogg', 50, TRUE, 5) | ||
| return | ||
| if(!cocked) | ||
| if(!cocked && has_breech) |
There was a problem hiding this comment.
Suggested change
| if(!cocked && has_breech) | |
| if(has_breech && !cocked) |
Same as with breech_open: since cocked relies on has_breech, just reads better to check has_breech first.
|
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 UPP UGLs, 1 to each squad prep
Adds UPP impact nades
Adds UPP smoke nades
Changes some activating sounds
Explain why it's good for the game
UPP no longer lacks a nade option, provides additional playstyle to riflemen
Testing Photographs and Procedure
Screenshots & Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑
add: UPP UGL, UPP impact nades, UPP smoke bombs
fix: Activating sounds for some non-HEDP type nades
/:cl: