diff --git a/media/clothing/clothingItems/Prost_HookArm_L.xml b/media/clothing/clothingItems/Prost_HookArm_L.xml index ad9e0f7..24b63a7 100644 --- a/media/clothing/clothingItems/Prost_HookArm_L.xml +++ b/media/clothing/clothingItems/Prost_HookArm_L.xml @@ -6,5 +6,5 @@ false false - Prosthesis\hookArmTest + Prosthesis\hookArm \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_HookArm_R.xml b/media/clothing/clothingItems/Prost_HookArm_R.xml index 9e237f3..dd14915 100644 --- a/media/clothing/clothingItems/Prost_HookArm_R.xml +++ b/media/clothing/clothingItems/Prost_HookArm_R.xml @@ -6,5 +6,5 @@ false false - Prosthesis\hookArmTest + Prosthesis\hookArm \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_NormalArm_L.xml b/media/clothing/clothingItems/Prost_NormalArm_L.xml index cd8e4c9..2e1dd2e 100644 --- a/media/clothing/clothingItems/Prost_NormalArm_L.xml +++ b/media/clothing/clothingItems/Prost_NormalArm_L.xml @@ -6,5 +6,5 @@ false false - Prosthesis\hookArmTest + Prosthesis\normalArm \ No newline at end of file diff --git a/media/clothing/clothingItems/Prost_NormalArm_R.xml b/media/clothing/clothingItems/Prost_NormalArm_R.xml index 3f35201..4e33e1c 100644 --- a/media/clothing/clothingItems/Prost_NormalArm_R.xml +++ b/media/clothing/clothingItems/Prost_NormalArm_R.xml @@ -6,5 +6,5 @@ false false - Prosthesis\hookArmTest + Prosthesis\normalArm \ No newline at end of file diff --git a/media/lua/client/TOC/Handlers/PlayerHandler.lua b/media/lua/client/TOC/Handlers/PlayerHandler.lua index 46c9382..969a927 100644 --- a/media/lua/client/TOC/Handlers/PlayerHandler.lua +++ b/media/lua/client/TOC/Handlers/PlayerHandler.lua @@ -236,6 +236,7 @@ function PlayerHandler.UpdateCicatrization() TOC_DEBUG.print("updating modData from cicatrization loop") modDataHandler:apply() -- TODO This is gonna be heavy. Not entirely sure else + TOC_DEBUG.print("Removing UpdateCicatrizationF") Events.EveryHours.Remove(PlayerHandler.UpdateCicatrization) -- We can remove it safely, no cicatrization happening here boys end TOC_DEBUG.print("updating cicatrization!") diff --git a/media/models_X/Prosthesis/normalArm_Ground.fbx b/media/models_X/Prosthesis/normalArm_Ground.fbx new file mode 100644 index 0000000..1c1b91b Binary files /dev/null and b/media/models_X/Prosthesis/normalArm_Ground.fbx differ diff --git a/media/scripts/TOC_models.txt b/media/scripts/TOC_models.txt new file mode 100644 index 0000000..25bc7f8 --- /dev/null +++ b/media/scripts/TOC_models.txt @@ -0,0 +1,16 @@ +module Prosthesis +{ + imports + { + Base + } + + model prostheticArm + { + mesh = Prosthesis/normalArm_Ground, + texture = Prosthetesis\normalArm, + } + + + +} \ No newline at end of file diff --git a/media/scripts/TOC_prosthesis_items.txt b/media/scripts/TOC_prosthesis_items.txt index 5709746..29fedf0 100644 --- a/media/scripts/TOC_prosthesis_items.txt +++ b/media/scripts/TOC_prosthesis_items.txt @@ -23,7 +23,7 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = genericAmputation, + Icon = armProsthetic, CanHaveHoles = false, } item Prost_HookArm_R @@ -42,7 +42,7 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = genericAmputation, + Icon = armProsthetic, CanHaveHoles = false, } @@ -62,7 +62,8 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = genericAmputation, + Icon = armProsthetic, + WorldStaticModel = prostheticArm, CanHaveHoles = false, } item Prost_NormalArm_R @@ -81,7 +82,8 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = genericAmputation, + Icon = armProsthetic, + WorldStaticModel = prostheticArm, CanHaveHoles = false, } diff --git a/media/scripts/TOC_recipes.txt b/media/scripts/TOC_recipes.txt index dfdea94..3be129e 100644 --- a/media/scripts/TOC_recipes.txt +++ b/media/scripts/TOC_recipes.txt @@ -15,7 +15,7 @@ module TOC Time:150.0, Category:Welding, OnGiveXP:Recipe.OnGiveXP.MetalWelding10, - NeedToBeLearn:true, + NeedToBeLearn:false, } recipe Craft Prosthetic Hook diff --git a/media/textures/Prosthesis/knifeArm.png b/media/textures/Prosthesis/hookArm.png similarity index 100% rename from media/textures/Prosthesis/knifeArm.png rename to media/textures/Prosthesis/hookArm.png diff --git a/media/textures/Prosthesis/hookArmTest.png b/media/textures/Prosthesis/normalArm.png similarity index 100% rename from media/textures/Prosthesis/hookArmTest.png rename to media/textures/Prosthesis/normalArm.png diff --git a/media/textures/item_armProsthetic.png b/media/textures/item_armProsthetic.png new file mode 100644 index 0000000..a011ec7 Binary files /dev/null and b/media/textures/item_armProsthetic.png differ