SM now comes in crates #8306
Merged
SM now comes in crates #8306
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
Per issue discordia-space#7994, quick check for SM shard and crates the order if SM is present in order
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
This comment was marked as off-topic.
TheShown911
approved these changes
Sep 15, 2023
hyperioo
reviewed
Sep 15, 2023
code/controllers/subsystems/trade.dm
Outdated
| @@ -446,7 +446,7 @@ SUBSYSTEM_DEF(trade) | |||
| var/obj/structure/closet/secure_closet/personal/trade/C | |||
| var/count_of_all = collect_counts_from(shopList) | |||
| var/price_for_all = collect_price_for_list(shopList) | |||
| if(isnum(count_of_all) && count_of_all > 1) | |||
| if((isnum(count_of_all) && count_of_all > 1) || shopList.Find("/obj/machinery/power/supermatter") > -1) | |||
There was a problem hiding this comment.
From byond manual
The Find proc could be used for that purpose, but if you don't care about the position of the item in the list, in is more convenient and efficient. The expression is 1 if the item exists in the list and 0 if not.
Your > -1 will always be true ?
There was a problem hiding this comment.
I didn't realize, I just thought it would return the position and -1 if it doesn't exist like a normal language. I'll fix this
There was a problem hiding this comment.
change has been applied, searches for >0 rather than >-1
There was a problem hiding this comment.
like a normal language
This is BYOND we're dealing with my good sir!
find() returns 0 if item is not found, not -1 apparently
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.
Per issue #7994, quick check for SM shard and crates the order if SM is present in order
About The Pull Request
Per issue #7994, QoL change to put the SM from the Zayra in a crate. We do want guild techs, even if it is funny when they run into the SM they ordered.
Why It's Good For The Game
Minor QoL fix so people aren't upset about dusting themselves by accident.
Testing
Tested by ordering a single SM from Zayra
Tested by ordering an SM with other items from Zayra
Changelog
🆑
tweak: added a check to creating an order from the trade beacon so that orders containing an SM shard are crated on spawn.
/:cl: