Merge pull request #11581 from Ghommie/Ghommie-cit637

M/F body preferences.
2020-03-23 10:34:02 -07:00
parent 8ca7ffd780 c798b31d6f
commit 57429493c6
20 changed files with 67 additions and 44 deletions
@@ -121,11 +121,10 @@
 					if(isalienadult(ass) || istype(ass, /mob/living/simple_animal/hostile/alien)) //Xenos have their own asses, thanks to Pybro.
 						temp_img = icon('icons/ass/assalien.png')
 					else if(ishuman(ass)) //Suit checks are in check_ass
-						if(ass.gender == MALE)
-							temp_img = icon('icons/ass/assmale.png')
-						else if(ass.gender == FEMALE)
+						var/mob/living/carbon/human/H = ass
+						if(H.dna.features["body_model"] == FEMALE)
 							temp_img = icon('icons/ass/assfemale.png')
-						else 									//In case anyone ever makes the generic ass. For now I'll be using male asses.
+						else
 							temp_img = icon('icons/ass/assmale.png')
 					else if(isdrone(ass)) //Drones are hot
 						temp_img = icon('icons/ass/assdrone.png')