Revert "12/21 modernizations from TG live"

code/game/objects/items/weapons/scrolls.dm

@@ -4,12 +4,12 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "scroll"
 	var/uses = 4
-	w_class = WEIGHT_CLASS_SMALL
+	w_class = 2
 	item_state = "paper"
 	throw_speed = 3
 	throw_range = 7
 	origin_tech = "bluespace=6"
-	resistance_flags = FLAMMABLE
+	burn_state = FLAMMABLE
 
 /obj/item/weapon/teleportation_scroll/apprentice
 	name = "lesser scroll of teleportation"
@@ -37,10 +37,10 @@
 	if (!ishuman(usr))
 		return 1
 	var/mob/living/carbon/human/H = usr
-	if(H.is_holding(src))
+	if ((H == src.loc || (in_range(src, H) && istype(src.loc, /turf))))
 		H.set_machine(src)
 		if (href_list["spell_teleport"])
-			if(uses)
+			if (src.uses >= 1)
 				teleportscroll(H)
 	if(H)
 		attack_self(H)
@@ -50,28 +50,52 @@
 
 	var/A
 
-	A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in teleportlocs
-	if(!src || qdeleted(src) || !user || !user.is_holding(src) || user.incapacitated() || !A || !uses)
+	A = input(user, "Area to jump to", "BOOYEA", A) in teleportlocs|null
+	if(!A)
 		return
 	var/area/thearea = teleportlocs[A]
 
+	if (!user || user.stat || user.restrained() || uses <= 0)
+		return
+	if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
+		return
+
 	var/datum/effect_system/smoke_spread/smoke = new
 	smoke.set_up(2, user.loc)
 	smoke.attach(user)
 	smoke.start()
 	var/list/L = list()
 	for(var/turf/T in get_area_turfs(thearea.type))
-		if(!is_blocked_turf(T))
-			L += T
+		if(!T.density)
+			var/clear = 1
+			for(var/obj/O in T)
+				if(O.density)
+					clear = 0
+					break
+			if(clear)
+				L+=T
 
 	if(!L.len)
-		user << "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
+		user <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry."
 		return
 
 	if(user && user.buckled)
 		user.buckled.unbuckle_mob(user, force=1)
 
-	user.forceMove(pick(L))
+	var/list/tempL = L.Copy()
+	var/attempt = null
+	var/success = 0
+	while(tempL.len)
+		attempt = pick(tempL)
+		user.Move(attempt)
+		if(get_turf(user) == attempt)
+			success = 1
+			break
+		else
+			tempL.Remove(attempt)
+
+	if(!success)
+		user.loc = pick(L)
 
 	smoke.start()
-	uses--
+	src.uses -= 1