diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm
index 65bd6d0ca80..c6dd02ad103 100644
--- a/code/modules/clothing/spacesuits/rig.dm
+++ b/code/modules/clothing/spacesuits/rig.dm
@@ -102,7 +102,7 @@
 	desc = "A special suit that protects against hazardous, low pressure environments. Has radiation shielding."
 	icon_state = "rig-engineering"
 	item_state = "eng_hardsuit"
-	slowdown = 1
+	slowdown = 4
 	armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)
 	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -360,6 +360,7 @@
 	flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | ONESIZEFITSALL
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 80)
 	sprite_sheets = null
+	slowdown = 2
 
 //Singuloth armor
 /obj/item/clothing/head/helmet/space/rig/singuloth
@@ -426,7 +427,7 @@
 	name = "blood-red hardsuit"
 	desc = "An advanced suit that protects against injuries during special operations. Property of Gorlex Marauders."
 	item_state = "syndie_hardsuit"
-	slowdown = 1
+	slowdown = 2
 	w_class = 3
 	armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 60)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/device/suit_cooling_unit)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index f04aa782306..a992e634193 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -5,19 +5,24 @@
 		tally = 5
 
 	//Bone White - added additional slow for wearing a rig suit.  Does not stack with having IS_SLOW flag (Diona)
-	if(wear_suit && istype(wear_suit,/obj/item/clothing/suit/space))
-		var/datum/gas_mixture/environment = loc.return_air()
-		var/local_pressure = environment.return_pressure()
-		switch (local_pressure)
-			if(20 to 40)
-				tally = 1
-			if(40 to 60)
-				tally = 2
-			if(60 to 80)
-				tally = 3
-			if(80 to INFINITY)
-				tally = 4
+	if(wear_suit)
+		if(wear_suit.slowdown > 0)
+			var/datum/gas_mixture/environment = loc.return_air()
+			var/local_pressure = environment.return_pressure()
+			switch (local_pressure)
+				if(20 to 40)
+					tally = min(1,wear_suit.slowdown)
+				if(40 to 60)
+					tally = min(2,wear_suit.slowdown)
+				if(60 to 80)
+					tally = min(3,wear_suit.slowdown)
+				if(80 to INFINITY)
+					tally = min(4,wear_suit.slowdown)
 
+		tally = min(wear_suit.slowdown, tally)  // Initial slow will never get more powerful than the slowdown on the suit.
+
+	//if(wear_suit)  // These two lines are now redundant due to comment above
+	//	tally += wear_suit.slowdown
 
 	if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
 
@@ -45,8 +50,6 @@
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
 	if (hungry >= 70) tally += hungry/50
 
-	if(wear_suit)
-		tally += wear_suit.slowdown
 
 	if(!buckled || (buckled && !istype(buckled, /obj/structure/stool/bed/chair/wheelchair)))
 		if(shoes)