diff --git a/media/clothing/clothingItems/Amputation_Right_Hand.xml b/media/clothing/clothingItems/Amputation_Right_Hand.xml index 1ea543f..d20f03a 100644 --- a/media/clothing/clothingItems/Amputation_Right_Hand.xml +++ b/media/clothing/clothingItems/Amputation_Right_Hand.xml @@ -6,6 +6,7 @@ false false 6 + none Amputations\skin01b Amputations\skin02b Amputations\skin03b diff --git a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml index 44c31ef..7743997 100644 --- a/media/clothing/clothingItems/Amputation_Right_LowerArm.xml +++ b/media/clothing/clothingItems/Amputation_Right_LowerArm.xml @@ -8,6 +8,7 @@ false 5 6 + none Amputations\skin01b Amputations\skin02b diff --git a/media/lua/shared/NPCs/ExtraBodyLocations.lua b/media/lua/shared/NPCs/ExtraBodyLocations.lua index 58a9175..5298ce4 100644 --- a/media/lua/shared/NPCs/ExtraBodyLocations.lua +++ b/media/lua/shared/NPCs/ExtraBodyLocations.lua @@ -41,16 +41,18 @@ function TocSetSleeves(check) local group = BodyLocations.getGroup("Human") if check then print("TOC: Rolling up sleeves") - group:getOrCreateLocation("ArmRight") - group:getOrCreateLocation("ArmLeft") group:getOrCreateLocation("ArmRight_Prot") group:getOrCreateLocation("ArmLeft_Prot") + group:getOrCreateLocation("ArmRight") + group:getOrCreateLocation("ArmLeft") + else print("TOC: Won't roll up sleeve") - addBodyLocationBefore("ArmRight", "Jacket") - addBodyLocationBefore("ArmLeft", "Jacket") - addBodyLocationBefore("ArmRight_Prot", "Shoes") - addBodyLocationBefore("ArmLeft_Prot", "Shoes") + addBodyLocationBefore("ArmRight_Prot", "Jacket") + addBodyLocationBefore("ArmLeft_Prot", "Jacket") + addBodyLocationBefore("ArmRight", "ArmLeft_Prot") + addBodyLocationBefore("ArmLeft", "ArmRight") + end end diff --git a/media/models_X/Amputation_Right_LowerArm_Male.fbx b/media/models_X/Amputation_Right_LowerArm_Male.fbx index 11580ca..253de43 100644 Binary files a/media/models_X/Amputation_Right_LowerArm_Male.fbx and b/media/models_X/Amputation_Right_LowerArm_Male.fbx differ diff --git a/media/models_X/Prost_Left_Hand_Hook_Female.fbx b/media/models_X/Prost_Left_Hand_Hook_Female.fbx index f7e1516..ecc9f8b 100644 Binary files a/media/models_X/Prost_Left_Hand_Hook_Female.fbx and b/media/models_X/Prost_Left_Hand_Hook_Female.fbx differ diff --git a/media/models_X/Prost_Left_Hand_Hook_Male.fbx b/media/models_X/Prost_Left_Hand_Hook_Male.fbx index f7e1516..949b263 100644 Binary files a/media/models_X/Prost_Left_Hand_Hook_Male.fbx and b/media/models_X/Prost_Left_Hand_Hook_Male.fbx differ diff --git a/media/models_X/Prost_Right_Hand_Hook_Female.fbx b/media/models_X/Prost_Right_Hand_Hook_Female.fbx index 84604ee..811be9f 100644 Binary files a/media/models_X/Prost_Right_Hand_Hook_Female.fbx and b/media/models_X/Prost_Right_Hand_Hook_Female.fbx differ diff --git a/media/models_X/Prost_Right_Hand_Hook_Male.fbx b/media/models_X/Prost_Right_Hand_Hook_Male.fbx index 84604ee..3f5223c 100644 Binary files a/media/models_X/Prost_Right_Hand_Hook_Male.fbx and b/media/models_X/Prost_Right_Hand_Hook_Male.fbx differ diff --git a/media/scripts/TOC_models_item.txt b/media/scripts/TOC_models_item.txt index 7181e8b..8c13a58 100644 --- a/media/scripts/TOC_models_item.txt +++ b/media/scripts/TOC_models_item.txt @@ -3,14 +3,14 @@ module TOC model MetalHook { mesh = WorldItems/hook, - texture = Clothes/metal, + texture = WorldItems/metal, scale = 0.15, } model WoodenHook { mesh = WorldItems/hook, - texture = Clothes/wood, + texture = WorldItems/wood, scale = 0.15, } } \ No newline at end of file diff --git a/media/textures/Clothes/metal.png b/media/textures/Clothes/metal.png index 504f91f..e1346bc 100644 Binary files a/media/textures/Clothes/metal.png and b/media/textures/Clothes/metal.png differ diff --git a/media/textures/Clothes/wood.png b/media/textures/Clothes/wood.png index 943b477..b214afb 100644 Binary files a/media/textures/Clothes/wood.png and b/media/textures/Clothes/wood.png differ diff --git a/media/textures/WorldItems/metal.png b/media/textures/WorldItems/metal.png index e9c4e5d..504f91f 100644 Binary files a/media/textures/WorldItems/metal.png and b/media/textures/WorldItems/metal.png differ diff --git a/media/textures/WorldItems/wood.png b/media/textures/WorldItems/wood.png index a028265..943b477 100644 Binary files a/media/textures/WorldItems/wood.png and b/media/textures/WorldItems/wood.png differ diff --git a/models_stuff/working_left_hand_hook.blend b/models_stuff/working_left_hand_hook.blend new file mode 100644 index 0000000..86f3583 Binary files /dev/null and b/models_stuff/working_left_hand_hook.blend differ diff --git a/models_stuff/working_left_hand_hook_male.blend b/models_stuff/working_left_hand_hook_male.blend new file mode 100644 index 0000000..231bb4e Binary files /dev/null and b/models_stuff/working_left_hand_hook_male.blend differ diff --git a/models_stuff/working_right_hand_hook.blend b/models_stuff/working_right_hand_hook.blend new file mode 100644 index 0000000..5ffa0ed Binary files /dev/null and b/models_stuff/working_right_hand_hook.blend differ diff --git a/models_stuff/working_right_left_hand_hook_female.blend b/models_stuff/working_right_left_hand_hook_female.blend new file mode 100644 index 0000000..4c3de5e Binary files /dev/null and b/models_stuff/working_right_left_hand_hook_female.blend differ