From 31a2f6d5ef86fd72a6a653480beef0cc63824128 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sun, 25 Dec 2011 00:52:36 -0500 Subject: [PATCH 1/2] library category fixes, moved edit appearence->fun where it should be --- code/game/magic/library.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm index 44be67318c..a18a3f3a29 100644 --- a/code/game/magic/library.dm +++ b/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 += "[book.author][book.title][book.category][book.id]" dat += "
" diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 1e8dc322f4..5c57602b09 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/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 From 67af6ac4d23efdb7f6e6f27e13efbeb5a39f50fc Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Sun, 25 Dec 2011 00:55:18 -0500 Subject: [PATCH 2/2] future-proof food code for other critters snacking --- code/modules/food/food.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/food/food.dm b/code/modules/food/food.dm index 59a22ce474..d2b451da6b 100644 --- a/code/modules/food/food.dm +++ b/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"