Merge branch 'master' into override-override

code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -1516,3 +1516,18 @@
 /datum/sprite_accessory/moth_wings/snow
 	name = "Snow"
 	icon_state = "snow"
+
+//Lunasune
+/datum/sprite_accessory/mam_ears/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	hasinner = 1
+	extra = TRUE
+	extra_color_src = MUTCOLORS2
+	ckeys_allowed = list("invader4352")
+
+/datum/sprite_accessory/mam_tails/lunasune
+	name = "lunasune"
+	icon_state = "lunasune"
+	extra = TRUE
+	ckeys_allowed = list("invader4352")

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

@@ -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)