Fix for #958, #959

- Added a way to obtain a pet without BEing
- Attempted to figure out how to bring up the pet tool bar

scripts/object/tangible/component/weapon/lightsaber/item_color_crystal_02_20.py

@@ -11,10 +11,6 @@ def setup(core, object):
 	object.setStringAttribute('condition', '1000/1000')
 	object.setStringAttribute("@obj_attr_n:color", "Windu's Guile")
 	object.setAttachment('radial_filename', 'item/tunable')
-<<<<<<< HEAD
-	return
-=======
 	object.setStringAttribute('@obj_attr_n:crystal_owner", "\\#D1F56F UNTUNED \\#FFFFFF ')
 	return
 	
->>>>>>> origin/master

scripts/object/tangible/deed/pet_deed/merek_deed.py

@@ -1,4 +1,10 @@
 import sys
 
 def setup(core, object):
-	return
+	object.setAttachment('radial_filename', 'deeds/petDeed')
+	return
+
+def use(core, actor, object):
+	core.petService.generatePet(actor, object, 'pet_merek', 'object/intangible/pet/shared_merek_hue.iff')
+	return
+