From 9ced03b85bd4b53a8b16f7ac01f791ccc6d9cc2b Mon Sep 17 00:00:00 2001
From: Matt Milosevic <minima38123@gmail.com>
Date: Thu, 9 Jun 2016 13:46:15 +0200
Subject: [PATCH] Line notes

---
 code/game/turfs/turf.dm                           | 6 ++++--
 code/modules/admin/verbs/map_template_loadverb.dm | 4 ++--
 code/modules/awaymissions/maploader/reader.dm     | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 32dce73e4f6..144d600ce59 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -167,13 +167,13 @@
 	var/old_lighting_overlay = lighting_overlay
 	var/old_blueprint_data = blueprint_data
 
-	air_master.remove_from_active(src)
+	if(air_master)
+		air_master.remove_from_active(src)
 
 	var/turf/W = new path(src)
 	if(!defer_change)
 		W.AfterChange()
 	W.blueprint_data = old_blueprint_data
-	return W
 
 	if(istype(W, /turf/simulated))
 		W:Assimilate_Air()
@@ -194,6 +194,8 @@
 		else
 			lighting_clear_overlays()
 
+		return W
+
 /turf/proc/AfterChange() //called after a turf has been replaced in ChangeTurf()
 	levelupdate()
 	CalculateAdjacentTurfs()
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index dd20e77f28e..3c31499f2ca 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -14,11 +14,11 @@
 		return
 
 	var/list/preview = list()
-	for(var/S in template.get_affected_turfs(T,centered = 1))
+	for(var/S in template.get_affected_turfs(T,centered = TRUE))
 		preview += image('icons/turf/overlays.dmi',S,"greenOverlay")
 	usr.client.images += preview
 	if(alert(usr,"Confirm location.","Template Confirm","Yes","No") == "Yes")
-		if(template.load(T, centered = 1))
+		if(template.load(T, centered = TRUE))
 			message_admins("<span class='adminnotice'>[key_name_admin(usr)] has placed a map template ([template.name]) at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[T.x];Y=[T.y];Z=[T.z]'>(JMP)</a></span>")
 		else
 			to_chat(usr, "Failed to place map")
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index f7f2e56b2fa..25c930163bf 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -4,7 +4,7 @@
 
 //As of 3.6.2016
 //global datum that will preload variables on atoms instanciation
-var/global/use_preloader = 0
+var/global/use_preloader = FALSE
 var/global/dmm_suite/preloader/_preloader = new
 
 /dmm_suite
@@ -383,7 +383,7 @@ var/global/dmm_suite/preloader/_preloader = new
 
 /dmm_suite/preloader/proc/setup(list/the_attributes, path)
 	if(the_attributes.len)
-		use_preloader = 1
+		use_preloader = TRUE
 		attributes = the_attributes
 		target_path = path
 
@@ -393,7 +393,7 @@ var/global/dmm_suite/preloader/_preloader = new
 		if(islist(value))
 			value = deepCopyList(value)
 		what.vars[attribute] = value
-	use_preloader = 0
+	use_preloader = FALSE
 
 /area/template_noop
 	name = "Area Passthrough"