cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from Tastyfish/master

Browse Source 
Library category fixes, moved edit appearance->fun where it should be
This commit is contained in:
Albert Iordache
2011-12-25 04:44:26 -08:00
parent cf43b6726d 359ffe93e1
commit 462a32f57a
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/magic/library.dm
View File

@@ -77,7 +77,7 @@
var/list/catbooks = new() var/list/catbooks = new()
// get books in category // get books in category
for(var/datum/archived_book/B in books) for(var/datum/archived_book/B in books)
if(category && !findtext(category, B.category)) if(!category || (category != B.category))
continue; continue;
catbooks += B catbooks += B
world << "cat [category]: [B.title]" 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; continue;
if(title && !findtext(title, book.title)) if(title && !findtext(title, book.title))
continue; continue;
if(category && !findtext(category, book.category)) if(!category || (category != "Any" && category != book.category))
continue; continue;
dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>" dat += "<tr><td>[book.author]</td><td>[book.title]</td><td>[book.category]</td><td>[book.id]</td></tr>"
dat += "</table><BR>" dat += "</table><BR>"

2
code/modules/admin/admin_verbs.dm
View File

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

10
code/modules/food/food.dm
View File

@@ -37,6 +37,16 @@
if(sattisfaction_text) if(sattisfaction_text)
M.emote("[sattisfaction_text]") M.emote("[sattisfaction_text]")
del(src) 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 /obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy" name = "candy"