Merge remote-tracking branch 'refs/remotes/origin/master' into muzzled-masks

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

@@ -1143,6 +1143,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			H.update_inv_w_uniform()
 			H.update_inv_wear_suit()
 	
+	/*
 	if(H.noisy && H.nutrition <= NUTRITION_LEVEL_STARVING)
 		if(prob(10))
 			playsound(get_turf(H),"hunger_sounds",35,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
@@ -1150,7 +1151,8 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 	else if(H.noisy && H.nutrition <= NUTRITION_LEVEL_HUNGRY)
 		if(prob(10))
 			playsound(get_turf(H),"hunger_sounds",15,0,-5,1,ignore_walls = FALSE,channel=CHANNEL_PRED)
- 
+ 	*/
+
 	// nutrition decrease and satiety
 	if (H.nutrition > 0 && H.stat != DEAD && !H.has_trait(TRAIT_NOHUNGER))
 		// THEY HUNGER

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

@@ -94,4 +94,9 @@
 	inherent_traits = list(TRAIT_NOGUNS)
 	mutantlungs = /obj/item/organ/lungs/ashwalker
 	burnmod = 0.9
-	brutemod = 0.9
+	brutemod = 0.9
+
+/datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
+	if((C.dna.features["spines"] != "None" ) && (C.dna.features["tail"] == "None")) //tbh, it's kinda ugly for them not to have a tail yet have floating spines
+		C.dna.features["tail"] = "Smooth"
+	return ..()