Fixed MEDIT_SEX, typos, socials, and added char_from_furniture check --Rumble

changelog

@@ -36,6 +36,10 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
 tbaMUD 3.6
+[Jul 26 2009] - Rumble
+  Added a char_from_furniture call in char_from_room.
+  Removed medit_disp_stats_menu from MEDIT_SEX case.
+  Updated a few socials and found a few typos.
 [Jul 25 2009] - Rumble
   Fixed zedit_level to recognize changes and save properly.
   Removed duplicate struct from db.h

lib/misc/socials.new

@@ -2893,20 +2893,20 @@ $n looks at your $t and seems to think it could use a little trimming off the to
 You look at $p and think it could use a little trimming off the top.
 $n looks at $p and seems to think it could use a little trimming off the top.
 
-~halo halo 0 8 8 0
+~halo halo 0 8 8 31
 You whip out the ol' halo. That should prove your innocence.
-$n loads object 15400 and dons it.
+$n loads a halo and dons it.
 $N could use a good disguise.
-$n loads object 15400 and gives it to $N.
+$n loads a halo and gives it to $N.
 $n gives you a halo. Apparently you don't look angelic enough.
 Too late, that person already made a getaway.
-You load object 15400 and place it on your head.
-$n loads object 15400 and dons it.
-#
-#
-#
-#
-#
+You load a halo and place it on your head.
+$n loads a halo and dons it.
+You place a halo on $S $t.
+$n places a halo on $N's $t.
+$n places a halo on your $t.
+You place a halo on $p.
+$n places a halo on $p.
 
 ~handraise handraise 0 8 8 0
 You raise your hand - me me me!
@@ -4366,7 +4366,7 @@ $n peers intently at $p.
 ~perspire perspire 0 5 0 0
 Cool down?
 $n perspires!
-You look at $s and begin to perspire.
+You look at $S and begin to perspire.
 $n looks at $N and begins to perspire.
 $n looks at you and begins to perspire.
 You begin to perspire.
@@ -6868,6 +6868,21 @@ You don't see them here.
 #
 #
 
+~vice vice 0 8 8 0
+You perform careful maintenance on your vice and attach the four foot crank extension.
+$n expertly strips down the vice and carefully oils the steel parts. Satisfied, $n reassembles the vice and attaches the four-foot extension to the crank.
+You place $S head in the jaws of the vice and tighten them enough to prevent movement. Slowly, you crank the vice tighter and tighter, enjoying the rising amplitude of the screams until the splintering climax when the skull shatters. $N is quiet now.
+$n stuns $N with a quick punch and forces $S head into the vice. $N screams and thrashes helplessly but the steel jaws hold $M tight. Grinning sadistically, $n slowly turns the crank until the skull cracks with a sickening pop. $N has been silenced.
+$n forces your head into the vice and tightens the steel jaws preventing all movement. Smiling sadistically, $e cranks the handle as your screaming headache becomes everything. Then there is nothing but peace. 
+Your vice remains empty. 
+You place your own head into a vice and turn the crank until your conscienceness fades.
+$n puts $s own head into a vice and turns the crank until there is a loud pop.
+You place $S $t in the jaws of the vice and tighten them enough to prevent movement. Slowly, you crank the vice tighter and tighter, enjoying the rising amplitude of the screams until the splintering climax when the $t shatters. $N is quiet now.
+$n stuns $N with a quick punch and forces $S $t into the vice. $N screams and thrashes helplessly but the steel jaws hold $M tight. Grinning sadistically, $n slowly turns the crank until the $t cracks with a sickening pop. $N has been silenced.
+$n forces your $t into the vice and tightens the steel jaws preventing all movement. Smiling sadistically, $e cranks the handle as your screaming $tache becomes everything. Then there is nothing but peace.
+#
+#
+
 ~waggle waggle 0 5 0 0
 You waggle your eyebrows impressively. Go, caterpillars, go!
 $n waggles $s eyebrows. Geez, look at those caterpillars go!

lib/text/news

@@ -7,7 +7,10 @@ NEW COMMANDS AND NEW MUD BEHAVIOR:
 **  Check out the latest news and information on the tbaMUD codebase at
     @Chttp://tbamud.com@n.
 
-**  New sacrifice command allows you to donate a corpse to the Gods.
+**  An "areas" command to list open areas. 
+
+**  New preference editor for players: prefedit. Use it to enable two new
+    toggles autodoor and autokey.
 
 **  Your prompt will now show (news) and (motd) whenever these files
     have been updated.
@@ -42,7 +45,7 @@ NEW COMMANDS AND NEW MUD BEHAVIOR:
 **  NEW AFK toggle that displays in your prompt, under who, and when people
     look at the room.
 
-**  You now have almost 180 stock zones to play.
+**  You now have over 180 stock zones to play.
 
 **  You can now interact with rooms, mobs, and objects through triggers.
 
@@ -50,8 +53,8 @@ NEW COMMANDS AND NEW MUD BEHAVIOR:
     inventory won't be as long. i.e. (3) A waybread.
 
 **  Over 100 new socials, and the gemote command to use socials over the gossip
-    channel. Socials can now target bodyparts too, behave. Check them out and 
-    feel free to suggest new ones.
+    channel. Socials can now target bodyparts too! Please behave. Check them 
+    out and feel free to suggest new ones. 
 
 **  You can now use color! @RHELP COLORCODES@n.
 
@@ -63,7 +66,7 @@ NEW COMMANDS AND NEW MUD BEHAVIOR:
 **  The player description length has been increased so please write a decent 
     description for yourself.
 
-**  You can now set your pagelength!
+**  You can now set your pagelength and pagewidth!
 
 **  You can now "look around" to see anything of interest in the room. But,
     some things may still be hidden and require further investigation.

src/act.informative.c

@@ -2360,7 +2360,7 @@ ACMD(do_whois)
 
   /* We either have our victim from file or he's playing or function has returned. */
   sprinttype(GET_SEX(victim), genders, buf, sizeof(buf));
-  send_to_char(ch, "Name: %s  %s\r\nSex: %s\r\n", GET_NAME(victim),
+  send_to_char(ch, "Name: %s %s\r\nSex: %s\r\n", GET_NAME(victim),
                    (victim->player.title ? victim->player.title : ""), buf);
 
   sprinttype (victim->player.chclass, pc_class_types, buf, sizeof(buf));

src/handler.c

@@ -387,6 +387,8 @@ void char_from_room(struct char_data *ch)
   if (FIGHTING(ch) != NULL)
     stop_fighting(ch);
 
+  char_from_furniture(ch);
+
   if (GET_EQ(ch, WEAR_LIGHT) != NULL)
     if (GET_OBJ_TYPE(GET_EQ(ch, WEAR_LIGHT)) == ITEM_LIGHT)
       if (GET_OBJ_VAL(GET_EQ(ch, WEAR_LIGHT), 2))	/* Light is ON */

src/interpreter.c

@@ -341,8 +341,8 @@ cpp_extern const struct command_info cmd_info[] = {
   { "zreset"   , "zreset"  , POS_DEAD    , do_zreset   , LVL_BUILDER, 0 },
   { "zedit"    , "zedit"   , POS_DEAD    , do_oasis_zedit, LVL_BUILDER, 0 },
   { "zlist"    , "zlist"   , POS_DEAD    , do_oasis_list, LVL_BUILDER, SCMD_OASIS_ZLIST },
-  { "zlock"    , "zlock"   , POS_DEAD    , do_zlock    , LVL_BUILDER, 0 },
-  { "zunlock"  , "zunlock" , POS_DEAD    , do_zunlock  , LVL_BUILDER, 0 },
+  { "zlock"    , "zlock"   , POS_DEAD    , do_zlock    , LVL_GOD, 0 },
+  { "zunlock"  , "zunlock" , POS_DEAD    , do_zunlock  , LVL_GOD, 0 },
   { "zcheck"   , "zcheck"  , POS_DEAD    , do_zcheck   , LVL_GOD, 0 },
   { "zpurge"   , "zpurge"  , POS_DEAD    , do_zpurge   , LVL_BUILDER, 0 },
 

src/medit.c

@@ -874,8 +874,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
 
   case MEDIT_SEX:
     GET_SEX(OLC_MOB(d)) = LIMIT(i, 0, NUM_GENDERS - 1);
-    medit_disp_stats_menu(d);
-    return;
+    break;
 
   case MEDIT_HITROLL:
     GET_HITROLL(OLC_MOB(d)) = LIMIT(i, 0, 50);