diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 7e7378649e4..65f79185e3a 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -243,10 +243,8 @@ its easier to just keep the beam vertical. for(var/datum/reagent/R in reagents.reagent_list) user << "[R.volume] units of [R.name]" else //Otherwise, just show the total volume - var/total_volume = 0 - for(var/datum/reagent/R in reagents.reagent_list) - total_volume += R.volume - user << "[total_volume] units of various reagents" + if(reagents && reagents.reagent_list.len) + user << "[reagents.total_volume] units of various reagents." else user << "Nothing." diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3f5dbe4be4d..672c91755c6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1819,4 +1819,9 @@ /mob/living/carbon/human/proc/get_full_print() if(!dna || !dna.uni_identity) return - return md5(dna.uni_identity) \ No newline at end of file + return md5(dna.uni_identity) + +/mob/living/carbon/human/can_see_reagents() + for(var/obj/item/clothing/C in src) //If they have some clothing equipped that lets them see reagents, they can see reagents + if(C.scan_reagents) + return 1 \ No newline at end of file diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 763d64b1b97..2c96609324d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1447,9 +1447,4 @@ mob/proc/yank_out_object() //Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() - if(ishuman(src)) - var/mob/living/carbon/human/H = src - for(var/obj/item/clothing/C in H) //If they have some clothing equipped that lets them see reagents, they can see reagents - if(C.scan_reagents) - return 1 return 0 \ No newline at end of file