researchnotes, pills, injector runtime

code/game/objects/items/random_items.dm

@@ -143,13 +143,11 @@
 		else
 			P.reagents.add_reagent(R, rand(2, 5)*10)
 		if(labelled)
-			P.name = "[R.name] Pill"
-			P.desc = "A pill containing [R.name]."
+			P.name = "[R] Pill"
+			P.desc = "A pill containing [R]."
 		else
 			P.name = "Unlabelled Pill"
 			P.desc = "Something about this pill entices you to try it, against your better judgement."
-	if(labelled)
-		name = "variety pillbottle"
 	pixel_x = rand(-10, 10)
 	pixel_y = rand(-10, 10)
 

code/game/objects/items/weapons/dna_injector.dm

@@ -121,7 +121,7 @@
 
 	var/attack_log = "injected with the Isolated [name]"
 
-	if(buf.types & DNA2_BUF_SE)
+	if(buf && buf.types & DNA2_BUF_SE)
 		if(block)
 			if(GetState() && block == MONKEYBLOCK && ishuman(M))
 				attack_log = "injected with the Isolated [name] (MONKEY)"