Merge pull request #5104 from Citadel-Station-13/upstream-merge-34900

[MIRROR] Syringe update_icon sanity
2018-01-26 15:48:53 +00:00
parent 9118715588 e7beda4fff
commit 5e6000d02d
1 changed files with 1 additions and 1 deletions
@@ -156,7 +156,7 @@
 /obj/item/reagent_containers/syringe/update_icon()
 	cut_overlays()
 	var/rounded_vol
-	if(reagents.total_volume)
+	if(reagents && reagents.total_volume)
 		rounded_vol = CLAMP(round((reagents.total_volume / volume * 15),5), 1, 15)
 		var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]")
 		filling_overlay.color = mix_color_from_reagents(reagents.reagent_list)