From 19c7c8d6513e086eadb8a3d81b49eb54457bd2c4 Mon Sep 17 00:00:00 2001
From: Ravensdale <Tri@rdinn.com>
Date: Tue, 16 Apr 2013 08:43:19 -0700
Subject: [PATCH] Bugfix: Adds in a check to make sure atmos code has been
 loaded before trying to generate, preventing some runtimes.

Tweak: Removes captain's armour from spawn code.

Tweak: Captain's PDA now spawns with messenger on but is now undetonateable.
---
 code/game/jobs/job/captain.dm              | 2 +-
 code/game/objects/items/devices/PDA/PDA.dm | 2 +-
 code/game/turfs/turf.dm                    | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm
index bdfe09e5da9..f705a6cfc6d 100644
--- a/code/game/jobs/job/captain.dm
+++ b/code/game/jobs/job/captain.dm
@@ -24,7 +24,7 @@
 		U.hastie = new /obj/item/clothing/tie/medal/gold/captain(U)
 		H.equip_to_slot_or_del(U, slot_w_uniform)
 		H.equip_to_slot_or_del(new /obj/item/device/pda/captain(H), slot_belt)
-		H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit)
+		//H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/captain(H), slot_wear_suit)
 		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(H), slot_shoes)
 		H.equip_to_slot_or_del(new /obj/item/clothing/head/caphat(H), slot_head)
 		H.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(H), slot_glasses)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 4da2378e65c..5edc69e7d26 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -117,7 +117,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 /obj/item/device/pda/captain
 	default_cartridge = /obj/item/weapon/cartridge/captain
 	icon_state = "pda-c"
-	toff = 1
+	//toff = 1
 
 /obj/item/device/pda/cargo
 	default_cartridge = /obj/item/weapon/cartridge/quartermaster
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 42a251468a5..6b21b320595 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -251,8 +251,9 @@
 			W.zone = src.zone
 			W.zone.AddTurf(W)
 
-		for(var/turf/simulated/T in orange(src,1))
-			air_master.tiles_to_update.Add(T)
+		if(air_master)
+			for(var/turf/simulated/T in orange(src,1))
+				air_master.tiles_to_update.Add(T)
 
 		W.levelupdate()
 		return W