Merge pull request UristMcStation#1364 from Glloyd/doing_things

fixes issues with fur and fur recipes
ErrorsWindows · Oct 26, 2023 · 25a56a5 · 25a56a5
2 parents 35978d3 + 9e5a9d4
commit 25a56a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/code/modules/materials/definitions/materials_organic.dm b/code/modules/materials/definitions/materials_organic.dm
@@ -172,16 +172,20 @@
 	brute_armor = 2
 
 /material/skin/fur
-	name = MATERIAL_SKIN_FUR
 	icon_colour = "#7a726d"
 	tans_to = MATERIAL_LEATHER_FUR
 	scrapes_to = MATERIAL_HIDE_GENERIC
 
+/material/skin/fur/brown
+	name = MATERIAL_SKIN_FUR
+	icon_colour = "#5b4128"
+
 /material/skin/fur/gray
 	name = MATERIAL_SKIN_FUR_GRAY
 
 /material/skin/fur/white
 	name = MATERIAL_SKIN_FUR_WHITE
+	icon_colour = "#c1bab3"
 
 /material/skin/fur/orange
 	name = MATERIAL_SKIN_FUR_ORANGE

diff --git a/code/modules/urist/modules/materials/recipes_skin.dm b/code/modules/urist/modules/materials/recipes_skin.dm
@@ -4,7 +4,7 @@
 	. += new/datum/stack_recipe/goatpelt(src)
 	. += new/datum/stack_recipe/sheeppelt(src)
 
-/material/skin/fur/generate_recipes(reinforce_material)
+/material/skin/fur/brown/generate_recipes(reinforce_material)
 	. = ..(reinforce_material)
 
 	. += new/datum/stack_recipe/brownbearpelt(src)
@@ -13,7 +13,7 @@
 	. += new/datum/stack_recipe/lionpelt(src)
 	. += new/datum/stack_recipe/foxpelt(src)
 
-/material/skin/fur/grey/generate_recipes(reinforce_material)
+/material/skin/fur/gray/generate_recipes(reinforce_material)
 	. = ..(reinforce_material)
 
 	. += new/datum/stack_recipe/graywolfpelt(src)