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
@@ -922,9 +922,10 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(num_legs < 2)
 				return FALSE
 			if(DIGITIGRADE in species_traits)
-				if(!disable_warning)
-					to_chat(H, "<span class='warning'>The footwear around here isn't compatible with your feet!</span>")
-				return FALSE
+				if(!is_species(H, /datum/species/lizard/ashwalker))
+					H.update_inv_shoes()
+				else
+					return FALSE
 			return equip_delay_self_check(I, H, bypass_equip_delay_self)
 		if(SLOT_BELT)
 			if(H.belt)