Merge remote-tracking branch 'tgstation/master' into jauntfix

# Conflicts:
#	code/modules/spells/spell_types/demon.dm

code/modules/spells/spell_types/demon.dm

@@ -149,7 +149,7 @@
 	src.ExtinguishMob()
 	if(buckled)
 		buckled.unbuckle_mob(src,force=1)
-	if(buckled_mobs.len)
+	if(has_buckled_mobs())
 		unbuckle_all_mobs(force=1)
 	if(pulledby)
 		pulledby.stop_pulling()

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -35,7 +35,7 @@
 			if(target.pulledby)
 				target.pulledby.stop_pulling()
 			target.stop_pulling()
-			if(target.buckled_mobs.len)
+			if(target.has_buckled_mobs())
 				target.unbuckle_all_mobs(force=1)
 			jaunt_disappear(animation, target)
 			target.loc = holder

code/modules/spells/spell_types/turf_teleport.dm

@@ -40,7 +40,7 @@
 		if(!target.Move(picked))
 			if(target.buckled)
 				target.buckled.unbuckle_mob(target,force=1)
-			if(target.buckled_mobs.len)
+			if(target.has_buckled_mobs())
 				target.unbuckle_all_mobs(force=1)
 			target.loc = picked
 			playsound(get_turf(user), sound2, 50,1)