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

fix prevent belt flare being filled by dump in action leaving no space for flare gun. #4110

Merged
merged 16 commits into from
Aug 20, 2023

Conversation

Huffie56
Copy link
Contributor

@Huffie56 Huffie56 commented Aug 5, 2023

About the pull request

fixes: #1450

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑
fix: prevent belt flare being filled by dump in action leaving no space for flare gun.
/:cl:

@github-actions github-actions bot added the Fix Fix one bug, make ten more label Aug 5, 2023
@Huffie56 Huffie56 marked this pull request as ready for review August 7, 2023 14:51
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft August 9, 2023 04:33
@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 9, 2023

tried a bunch of option nothing work like i want. get plenty of errors..
and when i don't code change does nothing....

@Huffie56 Huffie56 marked this pull request as ready for review August 10, 2023 13:38
@Huffie56
Copy link
Contributor Author

it's working but i need to try to tight the code better....

code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft August 10, 2023 15:22
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
@Huffie56 Huffie56 marked this pull request as ready for review August 11, 2023 09:23
@Huffie56 Huffie56 requested a review from Drulikar August 15, 2023 14:19
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/storage.dm Outdated Show resolved Hide resolved
@Drulikar Drulikar marked this pull request as draft August 18, 2023 07:52
@Huffie56
Copy link
Contributor Author

i tested this fix and it seem to work now just need to check if i can't simplify the code i added and change the single letter variable.

Copy link
Contributor

@Drulikar Drulikar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple suggestions you can apply. I will re-test when you feel its ready and undrafted.

code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
code/game/objects/items/storage/belt.dm Outdated Show resolved Hide resolved
Huffie56 and others added 2 commits August 18, 2023 20:41
apply drulikar modification

Co-authored-by: Drathek <[email protected]>
@Huffie56 Huffie56 marked this pull request as ready for review August 18, 2023 19:03
@Huffie56
Copy link
Contributor Author

Huffie56 commented Aug 18, 2023

should be fine tried to remove as many single letter variable as i could.
did the parents of the proc....

@Drulikar Drulikar added this pull request to the merge queue Aug 20, 2023
Merged via the queue into cmss13-devs:master with commit 6311be9 Aug 20, 2023
26 checks passed
cm13-github added a commit that referenced this pull request Aug 20, 2023
@Huffie56 Huffie56 deleted the belt_flare_fix branch August 20, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Fix Fix one bug, make ten more
Projects
None yet
Development

Successfully merging this pull request may close these issues.

You can fill ammobelts weapon slot if using a dump method
2 participants