Sanity checks, miscellaneous bugfixes, failsafes.

Disposals no longer indiscriminately let items land inside it - the items have to have been thrown by someone.

The ongoing attempt to fix the thousands of runtimes plaguing the game.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3195 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2012-02-26 02:17:17 +00:00
parent 70424f3b07
commit 4eaf8e1d1a
9 changed files with 29 additions and 18 deletions
+1
View File
@@ -2579,6 +2579,7 @@
if (!M.mind)
usr << "Sorry, this mob has no mind!"
return
M.mind.edit_memory()
+9 -8
View File
@@ -545,15 +545,16 @@
if(D.loc == trg) break
step_towards(D,trg)
for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue
D.reagents.trans_to(M, 15)
M.take_organ_damage(5)
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the syringe!", M), 1)
if(D)
for(var/mob/living/carbon/M in D.loc)
if(!istype(M,/mob/living/carbon)) continue
if(M == user) continue
D.reagents.trans_to(M, 15)
M.take_organ_damage(5)
for(var/mob/O in viewers(world.view, D))
O.show_message(text("\red [] was hit by the syringe!", M), 1)
del(D)
del(D)
if(D)
for(var/atom/A in D.loc)
if(A == user) continue
@@ -1544,6 +1544,7 @@ It can still be worn/put on as normal.
if (W)
W.loc = target.loc
W.dropped(target)
if (W)
W.layer = initial(W.layer)
W.add_fingerprint(source)
else
+5 -4
View File
@@ -90,10 +90,11 @@
var/law = src.laws.supplied[index]
if (length(law) > 0)
if (src.lawcheck[number+1] == "Yes")
src.say("[number]. [law]")
sleep(10)
number++
if(src.lawcheck.len >= number+1)
if (src.lawcheck[number+1] == "Yes")
src.say("[number]. [law]")
sleep(10)
number++
/mob/living/silicon/ai/verb/checklaws() //Gives you a link-driven interface for deciding what laws the statelaws() proc will share with the crew. --NeoFite
+1 -1
View File
@@ -632,7 +632,7 @@
return.
var/t = input("Message:", text("Private message to [C.key]")) as text|null
if (!t || !usr || !C)
if (!t || !usr || !C || !usr.client)
return
if (usr.client && usr.client.holder) //Admin is messaging a player
C << "\red <font size='4'><b>-- Administrator private message --</b></font>"
+1 -1
View File
@@ -386,7 +386,7 @@
del(H)
CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
if (istype(mover,/obj/item))
if (istype(mover,/obj/item) && mover.throwing)
var/obj/item/I = mover
if(istype(I, /obj/item/weapon/dummy) || istype(I, /obj/item/projectile))
return