diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 97c920125ab..184a56fea58 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(throwing) var/maxrange ///The speed of the projectile thrownthing being thrown. var/speed - ///If a mob is the one who has thrown the object, then it's moved here. + ///If a mob is the one who has thrown the object, then it's moved here. This can be null and must be null checked before trying to use it. var/mob/thrower ///A variable that helps in describing objects thrown at an angle, if it should be moved diagonally first or last. var/diagonals_first diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 83cf2b0238b..f5a5a44dab7 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -383,7 +383,7 @@ /obj/machinery/disposal/bin/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(isitem(AM) && AM.CanEnterDisposals()) - if(HAS_TRAIT(throwingdatum.thrower, TRAIT_THROWINGARM) || prob(75)) + if((throwingdatum.thrower && HAS_TRAIT(throwingdatum.thrower, TRAIT_THROWINGARM)) || prob(75)) AM.forceMove(src) visible_message(span_notice("[AM] lands in [src].")) update_appearance()