diff --git a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
index 130cf6a2675..75b356857c3 100644
--- a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
+++ b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
@@ -169,7 +169,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	return
 
 /datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob)
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 4, i++)
 			step(M, pick(cardinal))
 	if(prob(20))
@@ -199,7 +199,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	..()
 	return
 /datum/reagent/methamphetamine/addiction_act_stage3(var/mob/living/M as mob)
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 4, i++)
 			step(M, pick(cardinal))
 	M.Jitter(15)
@@ -209,7 +209,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	..()
 	return
 /datum/reagent/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 8, i++)
 			step(M, pick(cardinal))
 	M.Jitter(20)
@@ -317,7 +317,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	M.adjustBrainLoss(1)
 	M.adjustToxLoss(0.1)
 	M.hallucination += 10
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		step(M, pick(cardinal))
 		step(M, pick(cardinal))
 	..()
@@ -333,7 +333,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 
 /datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
 	M.hallucination += 10
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 8, i++)
 			step(M, pick(cardinal))
 	if(prob(20))
@@ -347,7 +347,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 
 /datum/reagent/bath_salts/addiction_act_stage1(var/mob/living/M as mob)
 	M.hallucination += 10
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 8, i++)
 			step(M, pick(cardinal))
 	M.Jitter(5)
@@ -358,7 +358,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	return
 /datum/reagent/bath_salts/addiction_act_stage2(var/mob/living/M as mob)
 	M.hallucination += 20
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 8, i++)
 			step(M, pick(cardinal))
 	M.Jitter(10)
@@ -370,7 +370,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	return
 /datum/reagent/bath_salts/addiction_act_stage3(var/mob/living/M as mob)
 	M.hallucination += 30
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 12, i++)
 			step(M, pick(cardinal))
 	M.Jitter(15)
@@ -382,7 +382,7 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
 	return
 /datum/reagent/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
 	M.hallucination += 40
-	if(M.canmove && !istype(M.loc, /turf/space))
+	if(M.canmove && !istype(M.loc, /atom/movable))
 		for(var/i = 0, i < 16, i++)
 			step(M, pick(cardinal))
 	M.Jitter(50)