From f2e27a8c89107a82aab5c68c69e23dee80a68b19 Mon Sep 17 00:00:00 2001 From: Null Snapshot Date: Thu, 9 Jul 2015 13:23:13 -0700 Subject: [PATCH] fixes #8391 --- code/modules/projectiles/targeting.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index 3bda5319d7..cc91ae0424 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -261,6 +261,7 @@ //These are called by the on-screen buttons, adjusting what the victim can and cannot do. /client/proc/add_gun_icons() + if(!usr) return 1 // This can runtime if someone manages to throw a gun out of their hand before the proc is called. screen += usr.item_use_icon screen += usr.gun_move_icon screen += usr.radio_use_icon