diff --git a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm
index 40f6a81135e..3732b1c37d3 100644
--- a/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm
+++ b/code/modules/mob/living/carbon/human/species/station/machine_subspecies.dm
@@ -84,6 +84,9 @@
 
 /datum/species/machine/shell/get_bodytype()
 	return bodytype
+	
+/datum/species/machine/shell/equip_survival_gear(var/mob/living/carbon/human/H)
+	check_tag(H, H.client)
 
 /datum/species/machine/industrial
 	name = "Industrial Frame"
diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm
index d332f3c8a30..c6caa898649 100644
--- a/code/modules/mob/living/carbon/human/species/station/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station/station.dm
@@ -566,6 +566,10 @@ datum/species/machine/handle_post_spawn(var/mob/living/carbon/human/H)
 		if ("yellow IPC screen")
 			return LIGHT_COLOR_YELLOW
 
+/datum/species/machine/equip_survival_gear(var/mob/living/carbon/human/H)
+	check_tag(H, H.client)
+	H.gender = NEUTER
+
 /datum/species/bug
 	name = "Vaurca Worker"
 	short_name = "vau"