From 0d3b1d3ca22d9b23d3a2edaaf4d2d56f9d463d4d Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 14 Jan 2016 17:37:47 -0500 Subject: merge male and neutral --- items/equip-arms/item2160_RedCottonGloves.xml | 3 +-- items/equip-arms/item2161_GreenCottonGloves.xml | 3 +-- items/equip-arms/item2162_DarkBlueCottonGloves.xml | 3 +-- items/equip-arms/item2163_YellowCottonGloves.xml | 3 +-- items/equip-arms/item2164_LightBlueCottonGloves.xml | 3 +-- items/equip-arms/item2165_PinkCottonGloves.xml | 3 +-- items/equip-arms/item2166_BlackCottonGloves.xml | 3 +-- items/equip-arms/item2167_OrangeCottonGloves.xml | 3 +-- items/equip-arms/item2168_PurpleCottonGloves.xml | 3 +-- items/equip-arms/item2169_DarkGreenCottonGloves.xml | 3 +-- items/equip-arms/item531_MinerGloves.xml | 3 +-- items/equip-arms/item532_LeatherGloves.xml | 3 +-- items/equip-arms/item563_WinterGloves.xml | 3 +-- items/equip-arms/item741_CottonGloves.xml | 3 +-- items/equip-arms/item756_AssassinGloves.xml | 3 +-- items/equip-arms/item794_BromenalGloves.xml | 3 +-- items/equip-arms/item868_SilkGloves.xml | 3 +-- 17 files changed, 17 insertions(+), 34 deletions(-) (limited to 'items/equip-arms') diff --git a/items/equip-arms/item2160_RedCottonGloves.xml b/items/equip-arms/item2160_RedCottonGloves.xml index 1cafd289..fdce9a60 100644 --- a/items/equip-arms/item2160_RedCottonGloves.xml +++ b/items/equip-arms/item2160_RedCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060 equipment/hands/generic-female.xml|#581a1a,a41111,c03a3a,ff6060 - equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060 - equipment/hands/generic.xml|#581a1a,a41111,c03a3a,ff6060 diff --git a/items/equip-arms/item2161_GreenCottonGloves.xml b/items/equip-arms/item2161_GreenCottonGloves.xml index 5100a216..36473d25 100644 --- a/items/equip-arms/item2161_GreenCottonGloves.xml +++ b/items/equip-arms/item2161_GreenCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e equipment/hands/generic-female.xml|#255511,579932,4aaf36,4ed65e - equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e - equipment/hands/generic.xml|#255511,579932,4aaf36,4ed65e diff --git a/items/equip-arms/item2162_DarkBlueCottonGloves.xml b/items/equip-arms/item2162_DarkBlueCottonGloves.xml index 6a5fd402..e1e75c48 100644 --- a/items/equip-arms/item2162_DarkBlueCottonGloves.xml +++ b/items/equip-arms/item2162_DarkBlueCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2 equipment/hands/generic-female.xml|#1a1a41,392b6e,4c529f,5d5dc2 - equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2 - equipment/hands/generic.xml|#1a1a41,392b6e,4c529f,5d5dc2 diff --git a/items/equip-arms/item2163_YellowCottonGloves.xml b/items/equip-arms/item2163_YellowCottonGloves.xml index de527dc7..7afed4d9 100644 --- a/items/equip-arms/item2163_YellowCottonGloves.xml +++ b/items/equip-arms/item2163_YellowCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9 equipment/hands/generic-female.xml|#846928,dab641,ffef93,fff7c9 - equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9 - equipment/hands/generic.xml|#846928,dab641,ffef93,fff7c9 diff --git a/items/equip-arms/item2164_LightBlueCottonGloves.xml b/items/equip-arms/item2164_LightBlueCottonGloves.xml index 1202b522..ff5310ae 100644 --- a/items/equip-arms/item2164_LightBlueCottonGloves.xml +++ b/items/equip-arms/item2164_LightBlueCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#16486e,498ec5,e4f2fc equipment/hands/generic-female.xml|#16486e,498ec5,e4f2fc - equipment/hands/generic.xml|#16486e,498ec5,e4f2fc - equipment/hands/generic.xml|#16486e,498ec5,e4f2fc diff --git a/items/equip-arms/item2165_PinkCottonGloves.xml b/items/equip-arms/item2165_PinkCottonGloves.xml index 6f2365ec..0805d074 100644 --- a/items/equip-arms/item2165_PinkCottonGloves.xml +++ b/items/equip-arms/item2165_PinkCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf equipment/hands/generic-female.xml|#bf369b,f25cb1,ff87b7,ffcccf - equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf - equipment/hands/generic.xml|#bf369b,f25cb1,ff87b7,ffcccf diff --git a/items/equip-arms/item2166_BlackCottonGloves.xml b/items/equip-arms/item2166_BlackCottonGloves.xml index 6fc71655..7a4d4122 100644 --- a/items/equip-arms/item2166_BlackCottonGloves.xml +++ b/items/equip-arms/item2166_BlackCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa equipment/hands/generic-female.xml|#111111,222222,333333,444444,555555,aaaaaa - equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa - equipment/hands/generic.xml|#111111,222222,333333,444444,555555,aaaaaa diff --git a/items/equip-arms/item2167_OrangeCottonGloves.xml b/items/equip-arms/item2167_OrangeCottonGloves.xml index 1f68a31f..91a6470d 100644 --- a/items/equip-arms/item2167_OrangeCottonGloves.xml +++ b/items/equip-arms/item2167_OrangeCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830 equipment/hands/generic-female.xml|#80280f,b04810,ef681f,ffb830 - equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830 - equipment/hands/generic.xml|#80280f,b04810,ef681f,ffb830 diff --git a/items/equip-arms/item2168_PurpleCottonGloves.xml b/items/equip-arms/item2168_PurpleCottonGloves.xml index 8195f86e..4d4b7133 100644 --- a/items/equip-arms/item2168_PurpleCottonGloves.xml +++ b/items/equip-arms/item2168_PurpleCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab equipment/hands/generic-female.xml|#1a0a33,380f4d,82158c,b359ab - equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab - equipment/hands/generic.xml|#1a0a33,380f4d,82158c,b359ab diff --git a/items/equip-arms/item2169_DarkGreenCottonGloves.xml b/items/equip-arms/item2169_DarkGreenCottonGloves.xml index 153bba0e..4e93a623 100644 --- a/items/equip-arms/item2169_DarkGreenCottonGloves.xml +++ b/items/equip-arms/item2169_DarkGreenCottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e equipment/hands/generic-female.xml|#0b300b,195519,3e832e,3e9c3e - equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e - equipment/hands/generic.xml|#0b300b,195519,3e832e,3e9c3e diff --git a/items/equip-arms/item531_MinerGloves.xml b/items/equip-arms/item531_MinerGloves.xml index d167e581..530b4bcf 100644 --- a/items/equip-arms/item531_MinerGloves.xml +++ b/items/equip-arms/item531_MinerGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#202020,505050 equipment/hands/generic-female.xml|#202020,505050 - equipment/hands/generic.xml|#202020,505050 - equipment/hands/generic.xml|#202020,505050 diff --git a/items/equip-arms/item532_LeatherGloves.xml b/items/equip-arms/item532_LeatherGloves.xml index c16e9b15..de36c2ce 100644 --- a/items/equip-arms/item532_LeatherGloves.xml +++ b/items/equip-arms/item532_LeatherGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#4e2e18,c8752f equipment/hands/generic-female.xml|#4e2e18,c8752f - equipment/hands/generic.xml|#4e2e18,c8752f - equipment/hands/generic.xml|#4e2e18,c8752f diff --git a/items/equip-arms/item563_WinterGloves.xml b/items/equip-arms/item563_WinterGloves.xml index d4744e6d..c6fd3feb 100644 --- a/items/equip-arms/item563_WinterGloves.xml +++ b/items/equip-arms/item563_WinterGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff equipment/hands/generic-female.xml|#202020,c0c0c0,ffffff,ffffff - equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff - equipment/hands/generic.xml|#202020,c0c0c0,ffffff,ffffff diff --git a/items/equip-arms/item741_CottonGloves.xml b/items/equip-arms/item741_CottonGloves.xml index 4bcba343..90de57f1 100644 --- a/items/equip-arms/item741_CottonGloves.xml +++ b/items/equip-arms/item741_CottonGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#a4b2b2,ffffff equipment/hands/generic-female.xml|#a4b2b2,ffffff - equipment/hands/generic.xml|#a4b2b2,ffffff - equipment/hands/generic.xml|#a4b2b2,ffffff diff --git a/items/equip-arms/item756_AssassinGloves.xml b/items/equip-arms/item756_AssassinGloves.xml index 13ea6f94..5688637f 100644 --- a/items/equip-arms/item756_AssassinGloves.xml +++ b/items/equip-arms/item756_AssassinGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/assassin.xml equipment/hands/assassin-female.xml - equipment/hands/assassin.xml - equipment/hands/assassin.xml diff --git a/items/equip-arms/item794_BromenalGloves.xml b/items/equip-arms/item794_BromenalGloves.xml index 35cfe47d..3328cde8 100644 --- a/items/equip-arms/item794_BromenalGloves.xml +++ b/items/equip-arms/item794_BromenalGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/bromenalgloves.xml equipment/hands/bromenalgloves-female.xml - equipment/hands/bromenalgloves.xml - equipment/hands/bromenalgloves.xml diff --git a/items/equip-arms/item868_SilkGloves.xml b/items/equip-arms/item868_SilkGloves.xml index 7be4f944..0184a903 100644 --- a/items/equip-arms/item868_SilkGloves.xml +++ b/items/equip-arms/item868_SilkGloves.xml @@ -7,8 +7,7 @@ + equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff equipment/hands/generic-female.xml|#87876c,bbc39c,edf4e1,ffffff - equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff - equipment/hands/generic.xml|#87876c,bbc39c,edf4e1,ffffff -- cgit v1.2.3-70-g09d2