Revert "12/21 modernizations from TG live"

code/datums/helper_datums/getrev.dm

@@ -8,24 +8,22 @@ var/global/datum/getrev/revdata = new()
 
 /datum/getrev/New()
 	var/head_file = return_file_text(".git/logs/HEAD")
-	if(SERVERTOOLS && fexists("..\\prtestjob.lk"))
-		testmerge = file2list("..\\prtestjob.lk")
-	var/testlen = max(testmerge.len - 1, 0)
-	var/regex/head_log = new("(\\w{40}) .+> (\\d{10}).+(?=(\n.*(\\w{40}).*){[testlen]}\n*\\Z)")
+	var/regex/head_log = new("(\\w{40}) (\\w{40}).+> (\\d{10}).+\n\\Z")
 	head_log.Find(head_file)
 	parentcommit = head_log.group[1]
-	date = unix2date(text2num(head_log.group[2]))
-	commit = head_log.group[4]
+	commit = head_log.group[2]
+	var/unix_time = text2num(head_log.group[3])
+	if(SERVERTOOLS && fexists("..\\prtestjob.lk"))
+		testmerge = file2list("..\\prtestjob.lk")
+	date = unix2date(unix_time)
 	world.log << "Running /tg/ revision:"
 	world.log << "[date]"
+	world.log << commit
 	if(testmerge.len)
-		world.log << commit
 		for(var/line in testmerge)
 			if(line)
 				world.log << "Test merge active of PR #[line]"
 		world.log << "Based off master commit [parentcommit]"
-	else
-		world.log << parentcommit
 	world.log << "Current map - [MAP_NAME]" //can't think of anywhere better to put it
 
 /client/verb/showrevinfo()
@@ -33,7 +31,7 @@ var/global/datum/getrev/revdata = new()
 	set name = "Show Server Revision"
 	set desc = "Check the current server code revision"
 
-	if(revdata.parentcommit)
+	if(revdata.commit)
 		src << "<b>Server revision compiled on:</b> [revdata.date]"
 		if(revdata.testmerge.len)
 			for(var/line in revdata.testmerge)
@@ -41,7 +39,7 @@ var/global/datum/getrev/revdata = new()
 					src << "Test merge active of PR <a href='[config.githuburl]/pull/[line]'>#[line]</a>"
 			src << "Based off master commit <a href='[config.githuburl]/commit/[revdata.parentcommit]'>[revdata.parentcommit]</a>"
 		else
-			src << "<a href='[config.githuburl]/commit/[revdata.parentcommit]'>[revdata.parentcommit]</a>"
+			src << "<a href='[config.githuburl]/commit/[revdata.commit]'>[revdata.commit]</a>"
 	else
 		src << "Revision unknown"
 	src << "<b>Current Infomational Settings:</b>"

code/datums/helper_datums/map_template.dm

@@ -94,8 +94,8 @@
 
 /proc/preloadRuinTemplates()
 	// Still supporting bans by filename
-	var/list/banned = generateMapList("config/lavaruinblacklist.txt")
-	banned += generateMapList("config/spaceruinblacklist.txt")
+	var/list/banned = generateMapList("config/lavaRuinBlacklist.txt")
+	banned += generateMapList("config/spaceRuinBlacklist.txt")
 
 	for(var/item in subtypesof(/datum/map_template/ruin))
 		var/datum/map_template/ruin/ruin_type = item
@@ -117,16 +117,12 @@
 
 
 /proc/preloadShuttleTemplates()
-	var/list/unbuyable = generateMapList("config/unbuyableshuttles.txt")
-
 	for(var/item in subtypesof(/datum/map_template/shuttle))
 		var/datum/map_template/shuttle/shuttle_type = item
 		if(!(initial(shuttle_type.suffix)))
 			continue
 
 		var/datum/map_template/shuttle/S = new shuttle_type()
-		if(unbuyable.Find(S.mappath))
-			S.can_be_bought = FALSE
 
 		shuttle_templates[S.shuttle_id] = S
 		map_templates[S.shuttle_id] = S

code/datums/helper_datums/teleport.dm

@@ -82,9 +82,9 @@
 /datum/teleport/proc/playSpecials(atom/location,datum/effect_system/effect,sound)
 	if(location)
 		if(effect)
-			addtimer(src, "do_effect", 0, TIMER_NORMAL, location, effect)
+			addtimer(src, "do_effect", 0, FALSE, location, effect)
 		if(sound)
-			addtimer(src, "do_sound", 0, TIMER_NORMAL, location, sound)
+			addtimer(src, "do_sound", 0, FALSE, location, sound)
 
 /datum/teleport/proc/do_effect(atom/location, datum/effect_system/effect)
 	src = null
@@ -106,8 +106,6 @@
 		if(!center)
 			center = destination
 		for(var/turf/T in range(precision,center))
-			if(T.is_transition_turf())
-				continue // Avoid picking these.
 			var/area/A = T.loc
 			if(!A.noteleport)
 				posturfs.Add(T)
@@ -116,7 +114,7 @@
 	else
 		destturf = get_turf(destination)
 
-	if(!destturf || !curturf || destturf.is_transition_turf())
+	if(!destturf || !curturf)
 		return 0
 
 	var/area/A = get_area(curturf)
@@ -167,14 +165,14 @@
 	var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)
 	if(bagholding.len)
 		precision = max(rand(1,100)*bagholding.len,100)
-		if(isliving(teleatom))
+		if(istype(teleatom, /mob/living))
 			var/mob/living/MM = teleatom
 			MM << "<span class='warning'>The bluespace interface on your bag of holding interferes with the teleport!</span>"
 	return 1
 
 // Safe location finder
 
-/proc/find_safe_turf(zlevel = ZLEVEL_STATION, list/zlevels, extended_safety_checks = FALSE)
+/proc/find_safe_turf(zlevel = ZLEVEL_STATION, list/zlevels)
 	if(!zlevels)
 		zlevels = list(zlevel)
 	var/cycles = 1000
@@ -185,7 +183,7 @@
 		var/z = pick(zlevels)
 		var/random_location = locate(x,y,z)
 
-		if(!isfloorturf(random_location))
+		if(!(istype(random_location, /turf/open/floor)))
 			continue
 		var/turf/open/floor/F = random_location
 		if(!F.air)
@@ -217,11 +215,5 @@
 		if((pressure <= 20) || (pressure >= 550))
 			continue
 
-		if(extended_safety_checks)
-			if(istype(F, /turf/open/floor/plating/lava)) //chasms aren't /floor, and so are pre-filtered
-				var/turf/open/floor/plating/lava/L = F
-				if(!L.is_safe())
-					continue
-
 		// DING! You have passed the gauntlet, and are "probably" safe.
 		return F