Another stack of runtime errors dealt with.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@260 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2010-10-10 05:36:31 +00:00
parent 5b6d51966f
commit 7391fac4e9
28 changed files with 234 additions and 424 deletions
+1 -7
View File
@@ -77,7 +77,7 @@
usr.verbs -= /mob/dead/observer/proc/dead_tele
spawn(50)
usr.verbs += /mob/dead/observer/proc/dead_tele
A = input("Area to jump to", "BOOYEA", A) in list("Engine","Hallways","Toxins","Storage","Maintenance","Crew Quarters","Medical","Security","Chapel","Bridge","Prison","AI Satellite","Thunderdome")
A = input("Area to jump to", "BOOYEA", A) in list("Engine","Hallways","Toxins","Storage","Maintenance","Crew Quarters","Medical","Security","Chapel","Bridge","AI Satellite","Thunderdome")
switch (A)
if ("Engine")
@@ -146,12 +146,6 @@
if(istype(B, /area/turret_protected/aisat))
L += B
A = pick(L)
if ("Prison")
var/list/L = list()
for(var/area/B in world)
if(istype(B, /area/prison/control))
L += B
A = pick(L)
if ("Thunderdome")
var/list/L = list()
for(var/area/B in world)
+19 -17
View File
@@ -2078,10 +2078,11 @@
if (istype(src.item, /obj/item))
src.source.drop_item()
src.loc = src.target
src.item.layer = 20
src.target.r_hand = src.item
src.item.loc = src.target
src.item.add_fingerprint(src.target)
if (src.item)
src.item.layer = 20
src.target.r_hand = src.item
src.item.loc = src.target
src.item.add_fingerprint(src.target)
if("uniform")
if (src.target.w_uniform)
var/obj/item/W = src.target.w_uniform
@@ -2232,19 +2233,20 @@
S.injest(src.target)
if("dnainjector")
var/obj/item/weapon/dnainjector/S = src.item
src.item.add_fingerprint(src.source)
src.item:inject(src.target, null)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
//SN src = null
del(src)
return
if (S.s_time >= world.time + 30)
//SN src = null
del(src)
return
S.s_time = world.time
for(var/mob/O in viewers(src.source, null))
O.show_message(text("\red [] injects [] with the DNA Injector!", src.source, src.target), 1)
if(src.item)
src.item.add_fingerprint(src.source)
src.item:inject(src.target, null)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
//SN src = null
del(src)
return
if (S.s_time >= world.time + 30)
//SN src = null
del(src)
return
S.s_time = world.time
for(var/mob/O in viewers(src.source, null))
O.show_message(text("\red [] injects [] with the DNA Injector!", src.source, src.target), 1)
if("pockets")
if (src.target.l_store)
var/obj/item/W = src.target.l_store
@@ -164,8 +164,9 @@
breathe()
if(src.reagents)
if(src.reagents.has_reagent("lexorin")) return
if(src.reagents.has_reagent("lexorin")) return
var/datum/gas_mixture/environment = loc.return_air()
var/datum/air_group/breath
+3 -2
View File
@@ -1091,7 +1091,8 @@
if (W)
W.layer = initial(W.layer)
var/turf/T = get_turf(src.loc)
T.Entered(W)
if (T)
T.Entered(W)
return
/mob/proc/reset_view(atom/A)
@@ -1438,7 +1439,7 @@
//we don't use message_admins here because the sender/receiver might get it too
for (var/mob/K in world)
if(K)
if(K && usr)
if(K.client && K.client.holder && K.key != usr.key && K.key != M.key)
K << "<b><font color='blue'>PM: [key_name(usr, K)]->[key_name(M, K)]:</b> \blue [t]</font>"
..()
+8
View File
@@ -0,0 +1,8 @@
/obj/hud/proc/unplayer_hud()
src.station_explosion = new src.h_type( src )
src.station_explosion.icon = 'station_explosion.dmi'
src.station_explosion.icon_state = "start"
src.station_explosion.layer = 20
src.station_explosion.mouse_opacity = 0
src.station_explosion.screen_loc = "1,3"
return