Merge branch 'master' into upstream-merge-30254

2017-08-29 22:12:34 -07:00
parent c9280bd308 0b82132443
commit f33f543d8a
237 changed files with 5 additions and 3633 deletions
@@ -592,6 +592,7 @@
 	extra = 1
 	extra2 = 1
 	icon = 'icons/mob/mam_body_markings.dmi'
+	gender_specific = 1

 	/datum/sprite_accessory/mam_body_markings/xeno
 	name = "Xeno"