merging to lirria

leveldesign/game_element/sitem/handled_item/bib_broom.sitem

@@ -16,7 +16,7 @@
     </STRUCT>
     <STRUCT Name="3d">
       <ATOM Name="shape" Value="broom.shape"/>
-      <ATOM Name="icon" Value="MW_staff.tga"/>
+      <ATOM Name="icon" Value="to_broom.tga"/>
       <ATOM Name="icon background" Value="BK_fyros.tga"/>
       <ATOM Name="anim_set" Value="2HLance"/>
       <STRUCT Name="fx">

leveldesign/game_element/sitem/handled_item/drool_fish.sitem

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.0 $" State="modified">
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="drooling_fish"/>
+      <ATOM Name="origin" Value="fyros"/>
+      <ATOM Name="family" Value="handled item"/>
+      <STRUCT Name="EquipmentInfo">
+        <ARRAY Name="EquipmentSlots">
+          <ATOM Name="right_hand" Value="Right Hand"/>
+          <ATOM Name="left_hand" Value="Left Hand"/>
+        </ARRAY>
+      </STRUCT>
+      <ATOM Name="Bulk" Value="10"/>
+      <ATOM Name="Saleable" Value="false"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="fish.shape"/>
+      <ATOM Name="icon" Value="to_fish.tga"/>
+      <ATOM Name="icon background" Value="BK_fyros.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+      <STRUCT Name="fx">
+        <ARRAY Name="StaticFXs">
+          <STRUCT>
+            <ATOM Name="Name" Value="fish.ps"/>
+            <ATOM Name="Bone" Value="box_arme"/>
+          </STRUCT>
+        </ARRAY>
+      </STRUCT>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>

leveldesign/game_element/sitem/handled_item/pendo_toy1.sitem

@@ -20,8 +20,8 @@
       <ATOM Name="shape" Value="pendo_toy.shape"/>
       <ATOM Name="shape_female" Value="pendo_toy_f.shape"/>
       <ATOM Name="map_variant" Value="Low Quality"/>
-      <ATOM Name="icon" Value="r2_palette_entities.tga"/>
+      <ATOM Name="icon" Value="ico_pendo_pet.tga"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
+      <ATOM Name="icon background" Value="cp_back.tga"/>
       <ATOM Name="icon overlay" Value="r2_palette_entities.tga"/>
       <ATOM Name="anim_set" Value="Dagger"/>
     </STRUCT>

leveldesign/game_element/sitem/handled_item/pendo_toy2.sitem

@@ -20,8 +20,8 @@
       <ATOM Name="shape" Value="pendo_toy.shape"/>
       <ATOM Name="shape_female" Value="pendo_toy_f.shape"/>
       <ATOM Name="map_variant" Value="Medium Quality"/>
-      <ATOM Name="icon" Value="r2_palette_entities.tga"/>
+      <ATOM Name="icon" Value="ico_pendo_pet.tga"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
+      <ATOM Name="icon background" Value="BK_tryker.tga"/>
       <ATOM Name="icon overlay" Value="r2_palette_entities.tga"/>
       <ATOM Name="anim_set" Value="Dagger"/>
     </STRUCT>

leveldesign/game_element/sitem/handled_item/pendo_toy3.sitem

@@ -20,8 +20,8 @@
       <ATOM Name="shape" Value="pendo_toy.shape"/>
       <ATOM Name="shape_female" Value="pendo_toy_f.shape"/>
       <ATOM Name="map_variant" Value="High Quality"/>
-      <ATOM Name="icon" Value="r2_palette_entities.tga"/>
+      <ATOM Name="icon" Value="ico_pendo_pet.tga"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
+      <ATOM Name="icon background" Value="BK_outpost.tga"/>
       <ATOM Name="icon overlay" Value="r2_palette_entities.tga"/>
       <ATOM Name="anim_set" Value="Dagger"/>
     </STRUCT>

primitives/newbieland/urban_newbieland.primitive

@@ -446,6 +446,7 @@
             <ANGLE VALUE="6.037747"/>
             <PROPERTY TYPE="string_array">
               <NAME>chat_parameters</NAME>
+              <STRING>shop : Matis:Fyros:HAIRDRESSING_FEMALE:HAIRDRESSING_MALE:TATOO_MALE:TATOO_FEMALE</STRING>
               <STRING>shop : NEWBIELAND_LARMOR_ALL</STRING>
               <STRING>item : pendo_toy1.sitem 1</STRING>
               <STRING>item : pendo_toy2.sitem 1</STRING>