Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

2019-05-06 02:53:42 -05:00
parent 6698d9646b c039043d0f
commit 105b40a4f8
124 changed files with 3858 additions and 2579 deletions
@@ -27,14 +27,19 @@
 			if("mam_snouts" in pref_species.default_features)
 				if(H.dna.features["mam_snouts"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE

 			else if("snout" in pref_species.default_features)
 				if(H.dna.features["snout"] != "None")
 					muzzle_var = ALT_STYLE
+				else
+					muzzle_var = NORMAL_STYLE

 			else
 				muzzle_var = NORMAL_STYLE
-				H.update_inv_head()
+
+			H.update_inv_head()

 /obj/item/clothing/head/worn_overlays(isinhands = FALSE)
 	. = list()