From 378848bfac4e2fa067d8102ac74831800cbac8cc Mon Sep 17 00:00:00 2001 From: "mport2004@gmail.com" Date: Thu, 29 Sep 2011 07:10:36 +0000 Subject: [PATCH] Runtime fix for atmos and one last jobedit git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2292 316c924e-a436-60f5-8080-3fe189b3f50e --- code/FEA/FEA_turf_tile.dm | 1 + code/modules/mob/new_player/preferences.dm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/FEA/FEA_turf_tile.dm b/code/FEA/FEA_turf_tile.dm index b9e70451b1e..7f482934393 100644 --- a/code/FEA/FEA_turf_tile.dm +++ b/code/FEA/FEA_turf_tile.dm @@ -196,6 +196,7 @@ turf ..() assume_air(datum/gas_mixture/giver) + if(!giver) return 0 var/datum/gas_mixture/receiver = air if(istype(receiver)) if(parent&&parent.group_processing) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 29e2a67930e..bdc85a1a678 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -504,6 +504,7 @@ datum/preferences occupation[job] = 4 else occupation[job] = 0 + SetChoices(user) return 1 if(occupation[job] == 0)//Only one job may be set to "High" @@ -756,7 +757,7 @@ datum/preferences age = 30 for(var/o in occupation) - occupation[o] = 1 + occupation[o] = 0 underwear = 1 //be_syndicate = 0 be_special = 0