Merge pull request #139 from Tastyfish/master

Library category fixes, moved edit appearance->fun where it should be

code/game/magic/library.dm

@@ -77,7 +77,7 @@
 		var/list/catbooks = new()
 		// get books in category
 		for(var/datum/archived_book/B in books)
-			if(category && !findtext(category, B.category))
+			if(!category || (category != B.category))
 				continue;
 			catbooks += B
 			world << "cat [category]: [B.title]"
@@ -435,7 +435,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 						continue;
 					if(title && !findtext(title, book.title))
 						continue;
-					if(category && !findtext(category, book.category))
+					if(!category || (category != "Any" && category != book.category))
 						continue;
 					dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>"
 				dat += "</table><BR>"

code/modules/admin/admin_verbs.dm

@@ -762,7 +762,7 @@
 
 /client/proc/editappear(mob/living/carbon/human/M as mob in world)
 	set name = "Edit Appearance"
-	set category = "Admin"
+	set category = "Fun"
 	if(!istype(M, /mob/living/carbon/human))
 		usr << "\red You can only do this to humans!"
 		return

code/modules/food/food.dm

@@ -37,6 +37,16 @@
 				if(sattisfaction_text)
 					M.emote("[sattisfaction_text]")
 				del(src)
+		else
+			if(bitecount == 0 || prob(50))
+				M.emote("nibbles away at the [src]")
+			bitecount++
+			if(bitecount >= 5)
+				var/speak_emote = pick(M:speak_emote)
+				var/sattisfaction_text = pick("[speak_emote] for more!", "[speak_emote] from enjoyment.", "looks at the area where the [src] was")
+				if(sattisfaction_text)
+					M.emote("[sattisfaction_text]")
+				del(src)
 
 /obj/item/weapon/reagent_containers/food/snacks/candy
 	name = "candy"