Fixed another stack of runtime errors.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@225 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-09-29 20:51:24 +00:00
parent cf97d04791
commit 21f5efb892
9 changed files with 48 additions and 37 deletions
+2 -1
View File
@@ -93,7 +93,8 @@
var/prob_right_dude = rand(prob_correct_person_lower, prob_correct_person_higher)
var/prob_right_job = rand(prob_correct_job_lower, prob_correct_job_higher)
if(prob(prob_right_job))
traitor_job = correct_mob:assigned_role
if (correct_mob)
traitor_job = correct_mob:assigned_role
else
var/list/job_tmp = get_all_jobs()
job_tmp.Remove("Captain", "Security Officer", "Detective", "Head Of Security", "Head of Personnel", "Chief Engineer", "Research Director")
+6 -5
View File
@@ -21,11 +21,12 @@
if (istype(O, /obj/item/weapon/sheet/metal))
if (src.m_amount < 150000.0)
spawn(16) {
flick("autolathe_c",src)
src.m_amount += O:height * O:width * O:length * 100000.0
O:amount--
if (O:amount < 1)
del(O)
if (O)
flick("autolathe_c",src)
src.m_amount += O:height * O:width * O:length * 100000.0
O:amount--
if (O:amount < 1)
del(O)
}
else
user << "The autolathe is full. Please remove metal from the autolathe in order to insert more."
+8 -7
View File
@@ -187,14 +187,15 @@
user.machine = null
return 0
if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.status )) && (!istype(user, /mob/living/silicon/ai)))
return 0
else
src.current = C
use_power(50)
if (C)
if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.status )) && (!istype(user, /mob/living/silicon/ai)))
return 0
else
src.current = C
use_power(50)
spawn( 5 )
attack_hand(user)
spawn( 5 )
attack_hand(user)
/mob/living/silicon/ai/attack_ai(var/mob/user as mob)
if (user != src)
+2 -1
View File
@@ -324,7 +324,8 @@
for(var/atom/A in get_turf(weed))
if(A.density) continue find_weeds
the_weeds += weed
W = pick(the_weeds)
if(the_weeds.len)
W = pick(the_weeds)
if(W)
path_idle(W)
+2 -1
View File
@@ -94,7 +94,8 @@
..()
/obj/item/assembly/time_ignite/attack_self(mob/user as mob)
src.part1.attack_self(user, src.status)
if (src.part1)
src.part1.attack_self(user, src.status)
src.add_fingerprint(user)
return