Merge remote-tracking branch 'upstream/master'

code/modules/mob/living/carbon/carbon.dm

@@ -898,6 +898,11 @@
 		var/obj/item/organ/I = X
 		I.Insert(src)
 
+/mob/living/carbon/proc/update_disabled_bodyparts()
+	for(var/B in bodyparts)
+		var/obj/item/bodypart/BP = B
+		BP.update_disabled()
+
 /mob/living/carbon/vv_get_dropdown()
 	. = ..()
 	. += "---"

code/modules/mob/living/carbon/human/human.dm

@@ -8,6 +8,7 @@
 /mob/living/carbon/human/Initialize()
 	verbs += /mob/living/proc/mob_sleep
 	verbs += /mob/living/proc/lay_down
+	verbs += /mob/living/carbon/human/proc/underwear_toggle //fwee
 
 	//initialize limbs first
 	create_bodyparts()

code/modules/mob/living/carbon/human/species.dm

@@ -490,11 +490,19 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	//Underwear, Undershirts & Socks
 	if(!(NO_UNDERWEAR in species_traits))
 		if(H.underwear)
+			if(H.hidden_underwear)
+				H.underwear = "Nude"
+			else
+				H.underwear = H.saved_underwear
 			var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[H.underwear]
 			if(underwear)
 				standing += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER)
 
 		if(H.undershirt)
+			if(H.hidden_undershirt)
+				H.undershirt = "Nude"
+			else
+				H.undershirt = H.saved_undershirt
 			var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
 			if(undershirt)
 				if(H.dna.species.sexes && H.gender == FEMALE)
@@ -503,6 +511,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 					standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
 
 		if(H.socks && H.get_num_legs(FALSE) >= 2)
+			if(H.hidden_socks)
+				H.socks = "Nude"
+			else
+				H.socks = H.saved_socks
 			var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
 			if(socks)
 				if(DIGITIGRADE in species_traits)