mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 01:53:35 +01:00
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:
@@ -251,16 +251,16 @@
|
||||
|
||||
del(D)
|
||||
return
|
||||
if(D)
|
||||
for(var/atom/A in D.loc)
|
||||
if(A == user) continue
|
||||
if(A.density) del(D)
|
||||
|
||||
for(var/atom/A in D.loc)
|
||||
if(A == user) continue
|
||||
if(A.density) del(D)
|
||||
sleep(1)
|
||||
if(D)
|
||||
spawn(10) del(D)
|
||||
|
||||
sleep(1)
|
||||
|
||||
spawn(10) del(D)
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
|
||||
@@ -735,10 +735,11 @@
|
||||
if(istype(M, /mob/living/carbon/human))
|
||||
if(M == user)
|
||||
M << "\blue You take a bite of [src]."
|
||||
if(reagents.total_volume)
|
||||
reagents.reaction(M, INGEST)
|
||||
spawn(5)
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
if(reagents)
|
||||
if(reagents.total_volume)
|
||||
reagents.reaction(M, INGEST)
|
||||
spawn(5)
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
src.amount--
|
||||
playsound(M.loc,'eatfood.ogg', rand(10,50), 1)
|
||||
M.nutrition += src.heal_amt * 10
|
||||
@@ -760,11 +761,11 @@
|
||||
if(!do_mob(user, M)) return
|
||||
for(var/mob/O in viewers(world.view, user))
|
||||
O.show_message("\red [user] feeds [M] [src].", 1)
|
||||
|
||||
if(reagents.total_volume)
|
||||
reagents.reaction(M, INGEST)
|
||||
spawn(5)
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
if(reagents)
|
||||
if(reagents.total_volume)
|
||||
reagents.reaction(M, INGEST)
|
||||
spawn(5)
|
||||
reagents.trans_to(M, reagents.total_volume)
|
||||
src.amount--
|
||||
playsound(M.loc, 'eatfood.ogg', rand(10,50), 1)
|
||||
M.nutrition += src.heal_amt * 10
|
||||
|
||||
@@ -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")
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -1276,8 +1276,9 @@ var/showadminmessages = 1
|
||||
if("showgm")
|
||||
if(!ticker)
|
||||
alert("The game hasn't started yet!")
|
||||
else
|
||||
else if (ticker.mode)
|
||||
alert("The game mode is [ticker.mode.name]")
|
||||
else alert("For some reason there's a ticker, but not a game mode")
|
||||
if("manifest")
|
||||
var/dat = "<B>Showing Crew Manifest.</B><HR>"
|
||||
dat += "<table cellspacing=5><tr><th>Name</th><th>Position</th></tr>"
|
||||
|
||||
@@ -33,7 +33,8 @@
|
||||
src.verbs += /mob/proc/ghostize
|
||||
|
||||
var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
|
||||
mind.store_memory("Time of death: [tod]", 0)
|
||||
if (mind) mind.store_memory("Time of death: [tod]", 0)
|
||||
else src << "We seem to have misplaced your mind datum, so we can't add this to your memory, but you died at [tod]"
|
||||
|
||||
var/cancel
|
||||
for (var/mob/M in world)
|
||||
|
||||
@@ -1196,8 +1196,10 @@
|
||||
|
||||
/mob/verb/memory()
|
||||
set name = "Notes"
|
||||
|
||||
mind.show_memory(src)
|
||||
if(mind)
|
||||
mind.show_memory(src)
|
||||
else
|
||||
src << "The game appears to have misplaced your mind datum, so we can't show you your notes."
|
||||
|
||||
/mob/verb/add_memory(msg as message)
|
||||
set name = "Add Note"
|
||||
@@ -1374,7 +1376,8 @@
|
||||
// world << "comparing [B.current] to [eye]"
|
||||
if (B.current == eye)
|
||||
for (var/mob/living/silicon/decoy/D in world)
|
||||
eye = D
|
||||
if (eye)
|
||||
eye = D
|
||||
if (eye)
|
||||
src.client.eye = eye
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user