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.
This commit is contained in:
SkyMarshal
2013-04-17 01:51:18 -07:00
parent b3f13d4dca
commit 3456cbba35
4 changed files with 10 additions and 6 deletions

View File

@@ -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.

View File

@@ -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()

View File

@@ -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()

View File

@@ -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.