Merge remote-tracking branch 'upstream/master' into Memes

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -202,6 +202,9 @@
 					return
 				name = reject_bad_text(name)
 				while(count--)
+					if(reagents.total_volume <= 0)
+						to_chat(usr, "<span class='notice'>Not enough reagents to create these pills!</span>")
+						return
 					var/obj/item/reagent_containers/food/pill/P = new/obj/item/reagent_containers/food/pill(loc)
 					if(!name) name = reagents.get_master_reagent_name()
 					P.name = "[name] pill"

code/modules/reagents/reagent_containers/hypospray.dm

@@ -69,8 +69,8 @@
 
 /obj/item/reagent_containers/hypospray/safety
 	name = "medical hypospray"
-	desc = "A modified hypospray for quickly injecting safe medicinal chemicals."
-	icon_state = "combat_hypo"
+	desc = "A general use medical hypospray for quick injection of chemicals. There is a safety button by the trigger."
+	icon_state = "medivend_hypo"
 	safety_hypo = TRUE
 
 /obj/item/reagent_containers/hypospray/safety/ert