diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 122d27c2ea4..76a4b543ac4 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -9,6 +9,18 @@
 		if(!I)
 			H << "<span class='notice'>You are not holding anything to equip.</span>"
 			return
+
+		if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet
+			src << "\red You must fasten the helmet to a hardsuit first. (Target the head)" // Stop eva helms equipping.
+			return 0
+
+
+		if(istype(I, /obj/item/clothing/suit/space/rig)) // If the item to be equipped is a rigid suit
+			var/obj/item/clothing/suit/space/rig/J = I
+			if(J.equip_time > 0)
+				delay_clothing_equip_to_slot_if_possible(J, 13)  // 13 = suit slot
+				return 0
+
 		if(H.equip_to_appropriate_slot(I))
 			if(hand)
 				update_inv_l_hand(0)