inventory quirks, fixes, and QoL tweak

src/act.informative.cpp

@@ -2498,7 +2498,7 @@ void look_in_direction(struct char_data * ch, int dir)
 }
 
 void _send_obj_contents_info_to_char(struct obj_data *obj, struct char_data *ch, int bits) {
-  send_to_char(GET_OBJ_NAME(obj), ch);
+  // send_to_char(GET_OBJ_NAME(obj), ch);
   switch (bits) {
     case FIND_OBJ_INV:
       send_to_char(" (carried): \r\n", ch);

src/act.obj.cpp

@@ -574,7 +574,7 @@ ACMD(do_put)
 		obj_from_char(obj);
 		obj_to_obj(obj, cont);
 		send_to_char(ch, "You slip %s^n into your body compartment.\r\n", decapitalize_a_an(obj));
-		act("$n slips $p^n into $s body compartment.\r\n", TRUE, ch, 0, obj, TO_ROOM);
+		act("$n slips $p^n into $s body compartment.\r\n", TRUE, ch, obj, 0, TO_ROOM);
 		return;
 	}
 
@@ -597,7 +597,7 @@ ACMD(do_put)
 		obj_from_char(obj);
 		obj_to_obj(obj, cont);
 		send_to_char(ch, "You slip %s^n into your tooth compartment.\r\n", decapitalize_a_an(obj));
-		act("$n slips $p^n into a tooth compartment.\r\n", TRUE, ch, 0, obj, TO_ROOM);
+		act("$n slips $p^n into a tooth compartment.\r\n", TRUE, ch, obj, 0, TO_ROOM);
 		return;
 	}
 
@@ -5508,9 +5508,10 @@ ACMD(do_holster)
 	else
 		obj_from_char(obj);
 	obj_to_obj(obj, cont);
-	send_to_char(ch, "You slip %s^n into %s^n and ready it for a quick draw.\r\n", GET_OBJ_NAME(obj), decapitalize_a_an(GET_OBJ_NAME(cont)));
+	send_to_char(ch, "You slip %s^n into %s^n%s.\r\n", GET_OBJ_NAME(obj), decapitalize_a_an(GET_OBJ_NAME(cont)),
+		         PRF_FLAGGED(ch, PRF_AUTOREADY) ? " and ready it for a quick draw" : "");
 	act("$n slips $p into $P.", FALSE, ch, obj, cont, TO_ROOM);
-	GET_HOLSTER_READY_STATUS(cont) = 1;
+	GET_HOLSTER_READY_STATUS(cont) = PRF_FLAGGED(ch, PRF_AUTOREADY) ? 1 : 0;
 
 	set_dropped_by_info(obj, ch);
 

src/act.other.cpp

@@ -1218,7 +1218,9 @@ const char *tog_messages[][2] = {
                             {"You will now participate in combat again.\r\n",
                              "OK, you will no longer be able to initiate combat or fight back.\r\n"},
                             {"You will now see ambiance messages and environmental echoes about traffic.\r\n",
-                             "You will no longer see ambiance messages and environmental echoes about traffic.\r\n"}
+                             "You will no longer see ambiance messages and environmental echoes about traffic.\r\n"},
+                            {"You will no longer automatically ready your holstered/sheathed weapons.\r\n",
+                             "You will now automatically ready your holstered/sheathed weapons.\r\n"}
                           };
 
 ACMD(do_toggle)
@@ -1510,6 +1512,9 @@ ACMD(do_toggle)
     } else if (is_abbrev(argument, "traffic") || is_abbrev(argument, "notraffic") || is_abbrev(argument, "no traffic")) {
       result = PRF_TOG_CHK(ch, PRF_NOTRAFFIC);
       mode = 52;
+    } else if (is_abbrev(argument, "autoready") || is_abbrev(argument, "ready")) {
+      result = PRF_TOG_CHK(ch, PRF_AUTOREADY);
+      mode = 53;
     } else {
       send_to_char("That is not a valid toggle option.\r\n", ch);
       return;
@@ -3234,6 +3239,17 @@ ACMD(do_photo)
                 continue;
             }
 
+            // Underwear is hidden by clothes.
+            if (j == WEAR_UNDERWEAR && (GET_EQ(found_ch, WEAR_UNDER) || GET_EQ(found_ch, WEAR_LEGS) || 
+                                        GET_EQ(found_ch, WEAR_BODY) || GET_EQ(found_ch, WEAR_ABOUT))) {
+              continue;
+            }
+
+            // Chest (upper body underwear) is also hidden by clothes.
+            if (j == WEAR_CHEST && (GET_EQ(found_ch, WEAR_UNDER) || GET_EQ(found_ch, WEAR_BODY) || GET_EQ(found_ch, WEAR_ABOUT))) {
+              continue;
+            }
+
             snprintf(ENDOF(buf), sizeof(buf) - strlen(buf), "%s%s\r\n", where[j], GET_OBJ_NAME(GET_EQ(found_ch, j)));
           }
         found = TRUE;
@@ -5479,4 +5495,4 @@ ACMD(do_changelog) {
   // Put them back where they came from.
   ch->in_room = old_in_room;
   ch->in_veh = old_in_veh;
-}
+}

src/awake.hpp

@@ -488,7 +488,8 @@ enum {
 #define PRF_NOFOLLOW                           69
 #define PRF_SUPPRESS_PROMPT_CHANGE             70
 #define PRF_PASSIVE_IN_COMBAT                  71
-#define PRF_MAX                                72
+#define PRF_AUTOREADY                          72
+#define PRF_MAX                                73
 
 /* log watch */
 

src/constants.cpp

@@ -745,6 +745,7 @@ struct preference_bit_struct preference_bits_v2[] = {
   { "No Follow"            , FALSE, TRUE  },
   { "No Prompt Change Message", FALSE, TRUE  },
   { "Passive Combat"       , FALSE, TRUE  },
+  { "Auto Ready"           , FALSE, TRUE  },
   { "\n"                   , 0    , 0     }
 };
 
@@ -823,6 +824,7 @@ const char *preference_bits[] =
     "NOFOLLOW",
     "!PROMPT_CHANGE_MSG",
     "PASSIVE_COMBAT",
+    "AUTOREADY",
     MAX_FLAG_MARKER
   };