Merge branch 'master' into override-override

2018-09-28 01:49:35 -05:00
parent 2daa197605 7740369d10
commit e4cdb0c853
14 changed files with 780 additions and 700 deletions
@@ -298,5 +298,10 @@
 				else
 					U.suit_style = DIGITIGRADE_SUIT_STYLE
 				H.update_inv_w_uniform()
-		if(H.shoes && !swap_back)
-			H.dropItemToGround(H.shoes)
+		if(H.shoes)
+			var/obj/item/clothing/shoes/S = H.shoes
+			if(swap_back)
+				S.adjusted = NORMAL_STYLE
+			else
+				S.adjusted = DIGITIGRADE_STYLE
+			H.update_inv_shoes()