Merge branch 'master' of https://github.com/ZomgPonies/Baystation12

code/modules/reagents/reagent_containers/hypospray.dm

@@ -20,7 +20,8 @@
 
 /obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
 	..()
-	reagents.add_reagent("tricordrazine", 30)
+	reagents.add_reagent("doctorsdelight", 15)
+	reagents.add_reagent("dexalinp", 15)
 	return
 
 /obj/item/weapon/reagent_containers/hypospray/attack(mob/M as mob, mob/user as mob)
@@ -82,4 +83,4 @@
 	if(reagents && reagents.reagent_list.len)
 		usr << "\blue It is currently loaded."
 	else
-		usr << "\blue It is spent."
+		usr << "\blue It is spent."