Minor code changes and updated World and files for 3.60 release. --Rumble

This commit is contained in:
Rumble
2009-09-18 11:17:47 +00:00
parent f9f356823f
commit 5e3caf42ff
204 changed files with 17044 additions and 16851 deletions

View File

@@ -170,6 +170,9 @@ static int can_take_obj(struct char_data *ch, struct obj_data *obj)
} else if (!(CAN_WEAR(obj, ITEM_WEAR_TAKE))) {
act("$p: you can't take that!", FALSE, ch, obj, 0, TO_CHAR);
return (0);
} else if (OBJ_SAT_IN_BY(obj)){
act("It appears someone is sitting on $p..", FALSE, ch, obj, 0, TO_CHAR);
return (0);
}
return (1);
}