From d06c5e0d0c97f6bb8b5e725e4132b4de6455d720 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Tue, 24 Apr 2012 21:20:11 +0100 Subject: [PATCH] TG: 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. Revision: r3195 Author: vageyenaman --- code/defines/obj/radio.dm | 1 - code/modules/mob/living/carbon/human/human.dm | 5 +++-- code/modules/recycling/disposal.dm | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/defines/obj/radio.dm b/code/defines/obj/radio.dm index b10b2034e96..e69de29bb2d 100644 --- a/code/defines/obj/radio.dm +++ b/code/defines/obj/radio.dm @@ -1 +0,0 @@ -// why the heck is this blank? - 702 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7468e15cb98..c92cd92b156 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1860,8 +1860,9 @@ It can still be worn/put on as normal. if (W) W.loc = target.loc W.dropped(target) - W.layer = initial(W.layer) - W.add_fingerprint(source) + if (W) + W.layer = initial(W.layer) + W.add_fingerprint(source) else if(!item) return if (istype(item, /obj/item/clothing/mask)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 59f6d61140e..027e9afecab 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -477,12 +477,10 @@ 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 - if(!mover.throwing) - return ..() if(prob(75)) I.loc = src for(var/mob/M in viewers(src))