diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 597807a4c5..3b97853b9b 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -51,7 +51,6 @@
 	bald
 		name = "Bald"
 		icon_state = "bald"
-		gender = MALE
 		species_allowed = list("Human","Unathi")
 		veryshort=1
 
@@ -402,7 +401,6 @@
 	balding
 		name = "Balding Hair"
 		icon_state = "hair_e"
-		gender = MALE // turnoff!
 		veryshort=1
 
 	familyman
@@ -733,15 +731,14 @@
 	skr_tentacle_m
 		name = "Skrell Male Tentacles"
 		icon_state = "skrell_hair_m"
-		species_allowed = list("Skrell")
 		gender = MALE
+		species_allowed = list("Skrell")
 
 	skr_tentacle_f
 		name = "Skrell Female Tentacles"
 		icon_state = "skrell_hair_f"
-		species_allowed = list("Skrell")
 		gender = FEMALE
-
+		species_allowed = list("Skrell")
 //Tajaran hairstyles
 	taj_ears
 		name = "Tajaran Ears"
diff --git a/code/modules/xenoarcheaology/tools/equipment.dm b/code/modules/xenoarcheaology/tools/equipment.dm
index 1c2b1f9773..169f3459d6 100644
--- a/code/modules/xenoarcheaology/tools/equipment.dm
+++ b/code/modules/xenoarcheaology/tools/equipment.dm
@@ -11,6 +11,7 @@
 	icon_state = "engspace_helmet"
 	item_state = "engspace_helmet"
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
+	flags_inv = BLOCKHEADHAIR
 
 /obj/item/clothing/suit/space/anomaly
 	name = "Excavation suit"
@@ -27,3 +28,4 @@
 	icon_state = "cespace_helmet"
 	item_state = "cespace_helmet"
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100)
+	flags_inv = BLOCKHEADHAIR
\ No newline at end of file
diff --git a/html/changelogs/nachomeep - HEADHAIR.yml b/html/changelogs/nachomeep - HEADHAIR.yml
new file mode 100644
index 0000000000..dc0540cd68
--- /dev/null
+++ b/html/changelogs/nachomeep - HEADHAIR.yml	
@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#################################
+
+# Your name.  
+author: nachomeep
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "Helmets and other items with the BLOCKHEADHAIR tag now replace the style with shorthair rather than causing balding."