From edb1d501d6b96abd8963aa6cc4605dc46fb10e4a Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 16 May 2015 17:56:28 +0930 Subject: [PATCH] Fixes #9217 --- code/game/objects/items/devices/scanners.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index f42a3995dc9..a29d39743ed 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -192,10 +192,12 @@ REAGENT SCANNER for(var/name in H.organs_by_name) var/obj/item/organ/external/e = H.organs_by_name[name] - if(e.status & ORGAN_BROKEN) + if(e && e.status & ORGAN_BROKEN) user.show_message(text("\red Bone fractures detected. Advanced scanner required for location."), 1) break for(var/obj/item/organ/external/e in H.organs) + if(!e) + continue for(var/datum/wound/W in e.wounds) if(W.internal) user.show_message(text("\red Internal bleeding detected. Advanced scanner required for location."), 1) break