Merge pull request #10939 from Baystation12/master

Dev-freeze

code/game/objects/items/weapons/material/shards.dm

@@ -61,7 +61,7 @@
 	return ..()
 
 /obj/item/weapon/material/shard/Crossed(AM as mob|obj)
-	if(ismob(AM))
+	if(isliving(AM))
 		var/mob/M = AM
 		M << "<span class='danger'>You step on \the [src]!</span>"
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds

code/modules/virus2/dishincubator.dm

@@ -128,14 +128,21 @@
 		nanomanager.update_uis(src)
 
 	if(beaker)
-		if(!beaker.reagents.remove_reagent("virusfood",5))
+		if(foodsupply < 100 && beaker.reagents.remove_reagent("virusfood",5))
-			foodsupply += 10
+			if(foodsupply + 10 <= 100)
+				foodsupply += 10
+			else
+				beaker.reagents.add_reagent("virusfood",(100 - foodsupply)/2)
+				foodsupply = 100
 			nanomanager.update_uis(src)
 
-		if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list)
+		if (locate(/datum/reagent/toxin) in beaker.reagents.reagent_list && toxins < 100)
 			for(var/datum/reagent/toxin/T in beaker.reagents.reagent_list)
 				toxins += max(T.strength,1)
 				beaker.reagents.remove_reagent(T.id,1)
+				if(toxins > 100)
+					toxins = 100
+					break
 			nanomanager.update_uis(src)
 
 /obj/machinery/disease2/incubator/Topic(href, href_list)
@@ -170,7 +177,7 @@
 		return 1
 
 	if (href_list["rad"])
-		radiation += 10
+		radiation = min(100, radiation + 10)
 		return 1
 
 	if (href_list["flush"])

nano/templates/pathogenic_isolator.tmpl

@@ -81,7 +81,7 @@
       {{if data.database}}
         {{for data.database}}
           <div class='itemContent'>
-            <div class='highlight fixedLeft'>{{:data.name}}</div>
+            <div class='highlight fixedLeft'>{{:value.name}}</div>
             {{:helper.link('Details', 'circle-arrow-s', { 'entry' : 1, 'view' : value.record }, null, 'fixedLeft')}}
           </div>
         {{/for}}