Fixed repeating categories in the crafting menu and sorted all the recipes #11272
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // tablecrafting defines | ||
| #define CAT_NONE "" | ||
| #define CAT_WEAPONRY "Weaponry" | ||
| #define CAT_WEAPON "Weapons" | ||
| #define CAT_AMMO "Ammunition" | ||
| #define CAT_ROBOT "Robots" | ||
| #define CAT_MISC "Misc" | ||
| #define CAT_PRIMAL "Primal" | ||
| #define CAT_TAILORING "tailoring" | ||
| #define CAT_CLOTHING "Clothing" | ||
| #define CAT_EYEWEAR "Eyewear" | ||
| #define CAT_STRUCTURE "Structures" | ||
|
|
||
| // foodstuffs & drinks | ||
| #define CAT_FOOD "Foods" | ||
| #define CAT_BREAD "Breads" | ||
| #define CAT_BURGER "Burgers" | ||
| #define CAT_CAKE "Cakes" | ||
| #define CAT_EGG "Egg-Based Food" | ||
| #define CAT_MEAT "Meats" | ||
| #define CAT_MISCFOOD "Misc. Food" | ||
| #define CAT_MEXICAN "Mexican Food" | ||
| #define CAT_PASTRY "Pastries" | ||
| #define CAT_PIE "Pies" | ||
| #define CAT_PIZZA "Pizzas" | ||
| #define CAT_SALAD "Salads" | ||
| #define CAT_SEAFOOD "Seafood" | ||
| #define CAT_SANDWICH "Sandwiches" | ||
| #define CAT_SOUP "Soups" | ||
| #define CAT_SPAGHETTI "Spaghettis" | ||
| #define CAT_ICE "Frozen" | ||
| #define CAT_DRINK "Drinks" |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
|
|
||
| /datum/crafting_recipe | ||
| ///in-game display name - Optional, if not set uses result name | ||
| var/name = "" | ||
| ///type paths of items consumed associated with how many are needed | ||
| var/reqs[] = list() | ||
| //type paths of items explicitly not allowed as an ingredient | ||
| var/blacklist[] = list() | ||
| //type path of item resulting from this craft | ||
| var/result | ||
| //type paths of items needed but not consumed | ||
| var/tools[] = list() | ||
| //time in deciseconds | ||
| var/time = 30 | ||
| //type paths of items that will be placed in the result | ||
| var/parts[] = list() | ||
| //like tools but for reagents | ||
| var/chem_catalysts[] = list() | ||
|
There was a problem hiding this comment. Change these to use var/list/name |
||
| //where it shows up in the crafting UI | ||
| var/category = CAT_NONE | ||
| var/subcategory = CAT_NONE | ||
| //Set to FALSE if it needs to be learned first. | ||
| var/always_available = TRUE | ||
| ///Should only one object exist on the same turf? | ||
| var/one_per_turf = FALSE | ||
| /// Should admins be notified about this getting created by a non-antagonist? | ||
| var/dangerous_craft = FALSE | ||
|
|
||
| /datum/crafting_recipe/New() | ||
| if(!(result in reqs)) | ||
| blacklist += result | ||
|
|
||
| /** | ||
| * Run custom pre-craft checks for this recipe | ||
| * | ||
| * user: the /mob that initiated the crafting | ||
| * collected_requirements: A list of lists of /obj/item instances that satisfy reqs. Top level list is keyed by requirement path. | ||
| */ | ||
| /datum/crafting_recipe/proc/check_requirements(mob/user, list/collected_requirements) | ||
| return TRUE | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you are moving time around, you might as well change this to 3 SECONDS and use time defines instead.