From 7827eec62975afb350336529610740fd9fd60cb5 Mon Sep 17 00:00:00 2001
From: SkyMarshal <skymarshal1729@gmail.com>
Date: Wed, 17 Apr 2013 01:51:18 -0700
Subject: [PATCH] Plasma no longer contaminates backpacks (They cannot be
 washed) Increased speed of zone equalization. Lighting controller and ticker
 now initialized after world is set up and a player has joined.

---
 code/ZAS/Plasma.dm                    | 2 +-
 code/ZAS/ZAS_Zones.dm                 | 6 +++---
 code/controllers/master_controller.dm | 7 ++++++-
 code/world.dm                         | 1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/code/ZAS/Plasma.dm b/code/ZAS/Plasma.dm
index 78c63f0f22e..d7da7f53379 100644
--- a/code/ZAS/Plasma.dm
+++ b/code/ZAS/Plasma.dm
@@ -45,7 +45,7 @@ obj/item/proc
 		//Clothing and backpacks can be contaminated.
 		if(flags & PLASMAGUARD) return 0
 		else if(istype(src,/obj/item/clothing)) return 1
-//		else if(istype(src,/obj/item/weapon/storage/backpack)) return 1 Cannot be washed :(
+		else if(istype(src,/obj/item/weapon/storage/backpack)) return 0 //Cannot be washed :(
 
 	contaminate()
 		//Do a contamination overlay? Temporary measure to keep contamination less deadly than it was.
diff --git a/code/ZAS/ZAS_Zones.dm b/code/ZAS/ZAS_Zones.dm
index 2410c255386..1ccd28aff4f 100644
--- a/code/ZAS/ZAS_Zones.dm
+++ b/code/ZAS/ZAS_Zones.dm
@@ -275,13 +275,13 @@ zone/proc/process()
  //Air Movement//
 ////////////////
 
-var/list/sharing_lookup_table = list(0.06, 0.11, 0.15, 0.18, 0.20, 0.21)
+var/list/sharing_lookup_table = list(0.08, 0.15, 0.21, 0.26, 0.30, 0.33)
 
 proc/ShareRatio(datum/gas_mixture/A, datum/gas_mixture/B, connecting_tiles)
 	//Shares a specific ratio of gas between mixtures using simple weighted averages.
 	var
 		//WOOT WOOT TOUCH THIS AND YOU ARE A RETARD
-		ratio = 0.21
+		ratio = 0.33
 		//WOOT WOOT TOUCH THIS AND YOU ARE A RETARD
 
 		size = max(1,A.group_multiplier)
@@ -368,7 +368,7 @@ proc/ShareSpace(datum/gas_mixture/A, list/unsimulated_tiles)
 
 	var
 		// Depressurize very, very fast(it's fine since many rooms are internally multiple zones)
-		ratio = 0.21
+		ratio = 0.33
 
 		old_pressure = A.return_pressure()
 
diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index 2880d034e98..a1ac4c2a193 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -46,7 +46,6 @@ datum/controller/game_controller/New()
 
 	if(!syndicate_code_phrase)		syndicate_code_phrase	= generate_code_phrase()
 	if(!syndicate_code_response)	syndicate_code_response	= generate_code_phrase()
-	if(!ticker)						ticker = new /datum/controller/gameticker()
 	if(!emergency_shuttle)			emergency_shuttle = new /datum/shuttle_controller/emergency_shuttle()
 
 datum/controller/game_controller/proc/setup()
@@ -58,6 +57,12 @@ datum/controller/game_controller/proc/setup()
 		air_master = new /datum/controller/air_system()
 		air_master.setup()
 
+	if(!ticker)
+		ticker = new /datum/controller/gameticker()
+
+
+	lighting_controller.Initialize()
+
 	setup_objects()
 	setupgenetics()
 	setupfactions()
diff --git a/code/world.dm b/code/world.dm
index 60e465b19a4..1a85ada9ba6 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -85,7 +85,6 @@
 	master_controller = new /datum/controller/game_controller()
 	spawn(1)
 		master_controller.setup()
-		lighting_controller.Initialize()
 
 	process_teleport_locs()			//Sets up the wizard teleport locations
 	process_ghost_teleport_locs()	//Sets up ghost teleport locations.