Fixes crafting menu (#3787)

* Fixing crafting menu [wip] * This needs to have a reqs apparently Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Jun 12, 2024 · b4fda27 · b4fda27
1 parent 57df0ee
commit b4fda27
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/modular_nova/modules/tribal_extended/code/recipes.dm b/modular_nova/modules/tribal_extended/code/recipes.dm
@@ -112,6 +112,7 @@
 
 /datum/crafting_recipe/torch
 	name = "Torch"
+	reqs = list(/obj/item/grown/log = 1)
 	result = /obj/item/flashlight/flare/torch
 	category = CAT_MISC
 	non_craftable = TRUE

diff --git a/tgui/packages/tgui/interfaces/PersonalCrafting.tsx b/tgui/packages/tgui/interfaces/PersonalCrafting.tsx
@@ -595,6 +595,23 @@ const MaterialContent = (props) => {
 
 const FoodtypeContent = (props) => {
   const { type, diet, craftableCount } = props;
+  let iconName = '',
+    iconColor = '';
+
+  // We use iconName in the return to see if this went through.
+  if (type !== 'Can Make' && diet) {
+    if (diet.liked_food.includes(type)) {
+      iconName = 'face-laugh-beam';
+      iconColor = 'good';
+    } else if (diet.disliked_food.includes(type)) {
+      iconName = 'face-tired';
+      iconColor = 'average';
+    } else if (diet.toxic_food.includes(type)) {
+      iconName = 'skull-crossbones';
+      iconColor = 'bad';
+    }
+  }
+
   return (
     <Stack>
       <Stack.Item width="14px" textAlign="center">
@@ -606,16 +623,7 @@ const FoodtypeContent = (props) => {
       <Stack.Item>
         {type === 'Can Make'
           ? craftableCount
-          : diet &&
-            (diet.liked_food.includes(type) ? (
-              <Icon name="face-laugh-beam" color={'good'} />
-            ) : diet.disliked_food.includes(type) ? (
-              <Icon name="face-tired" color={'average'} />
-            ) : (
-              diet.toxic_food.includes(type) && (
-                <Icon name="skull-crossbones" color={'bad'} />
-              )
-            ))}
+          : iconName && <Icon name={iconName} color={iconColor} />}
       </Stack.Item>
     </Stack>
   );