Morrowinventory Port (#75)

code/game/objects/structures/dresser.dm

@@ -19,6 +19,7 @@
 	new /obj/item/stack/sheet/mineral/wood(drop_location(), 10)
 	qdel(src)
 
+/* skyrat edit - the dresser is useless with our inventory system
 /obj/structure/dresser/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
 	. = ..()
 	if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
@@ -80,3 +81,4 @@
 	if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return default_color
 	return sanitize_hexcolor(n_color, 3, FALSE, default_color)
+*/

code/game/objects/structures/watercloset.dm

@@ -412,6 +412,14 @@
 				H.update_inv_wear_suit()
 			else if(H.w_uniform && wash_obj(H.w_uniform))
 				H.update_inv_w_uniform()
+			//skyrat edit
+			else if(H.w_underwear && wash_obj(H.w_underwear))
+				H.update_inv_w_underwear()
+			else if(H.w_socks && wash_obj(H.w_socks))
+				H.update_inv_w_socks()
+			else if(H.w_underwear && wash_obj(H.w_shirt))
+				H.update_inv_w_shirt()
+			//
 			if(washgloves)
 				H.clean_blood()
 				SEND_SIGNAL(H, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
@@ -424,8 +432,11 @@
 				H.update_body()
 			if(H.glasses && washglasses && wash_obj(H.glasses))
 				H.update_inv_glasses()
-			if(H.ears && washears && wash_obj(H.ears))
+			if(H.ears && washears && wash_obj(H.ears) && wash_obj(H.ears_extra)) //skyrat edit
 				H.update_inv_ears()
+				//skyrat edit
+				H.update_inv_ears_extra()
+				//
 			if(H.belt && wash_obj(H.belt))
 				H.update_inv_belt()
 		else