diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm
index 08cf736db77..c43951f5dd2 100644
--- a/code/game/objects/effects/gibs.dm
+++ b/code/game/objects/effects/gibs.dm
@@ -1,14 +1,14 @@
 /proc/gibs(atom/location, var/list/viruses, var/datum/dna/MobDNA)
-	new /obj/effect/gibspawner/generic(get_turf(location),viruses,MobDNA)
+	new /obj/effect/gibspawner/generic(location,viruses,MobDNA)
 
 /proc/hgibs(atom/location, var/list/viruses, var/datum/dna/MobDNA)
-	new /obj/effect/gibspawner/human(get_turf(location),viruses,MobDNA)
+	new /obj/effect/gibspawner/human(location,viruses,MobDNA)
 
 /proc/xgibs(atom/location, var/list/viruses)
-	new /obj/effect/gibspawner/xeno(get_turf(location),viruses)
+	new /obj/effect/gibspawner/xeno(location,viruses)
 
 /proc/robogibs(atom/location, var/list/viruses)
-	new /obj/effect/gibspawner/robot(get_turf(location),viruses)
+	new /obj/effect/gibspawner/robot(location,viruses)
 
 /obj/effect/gibspawner
 	var/sparks = 0 //whether sparks spread on Gib()
@@ -20,8 +20,7 @@
 	New(location, var/list/viruses, var/datum/dna/MobDNA)
 		..()
 
-		if(istype(loc,/turf)) //basically if a badmin spawns it
-			Gib(loc,viruses,MobDNA)
+		Gib(loc,viruses,MobDNA)
 
 	proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null)
 		if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len)
@@ -59,7 +58,8 @@
 					else if(istype(src, /obj/effect/gibspawner/human)) // Probably a monkey
 						gib.blood_DNA["Non-human DNA"] = "A+"
 					var/list/directions = gibdirections[i]
-					if(directions.len)
-						gib.streak(directions)
+					if(istype(loc,/turf))
+						if(directions.len)
+							gib.streak(directions)
 
 		del(src)
\ No newline at end of file