Merge branch 'master' into kevinz000-patch-2

modular_citadel/code/modules/reagents/reagent container/hypospraymkii.dm

@@ -1,15 +1,15 @@
 #define HYPO_SPRAY 0
 #define HYPO_INJECT 1
 
-#define WAIT_SPRAY 50
-#define WAIT_INJECT 50
-#define SELF_SPRAY 30
-#define SELF_INJECT 30
+#define WAIT_SPRAY 25
+#define WAIT_INJECT 25
+#define SELF_SPRAY 15
+#define SELF_INJECT 15
 
-#define DELUXE_WAIT_SPRAY 40
-#define DELUXE_WAIT_INJECT 40
-#define DELUXE_SELF_SPRAY 20
-#define DELUXE_SELF_INJECT 20
+#define DELUXE_WAIT_SPRAY 20
+#define DELUXE_WAIT_INJECT 20
+#define DELUXE_SELF_SPRAY 10
+#define DELUXE_SELF_INJECT 10
 
 #define COMBAT_WAIT_SPRAY 0
 #define COMBAT_WAIT_INJECT 0
@@ -284,4 +284,4 @@
 			to_chat(M, "[src] is now set to inject contents on application.")
 		if(HYPO_INJECT)
 			mode = HYPO_SPRAY
-			to_chat(M, "[src] is now set to spray contents on application.")
+			to_chat(M, "[src] is now set to spray contents on application.")

modular_citadel/code/modules/reagents/reagent container/hypovial.dm

@@ -67,11 +67,11 @@
 
 /obj/item/reagent_containers/glass/bottle/vial/small
 	name = "hypovial"
-	volume = 30
+	volume = 60
 	possible_transfer_amounts = list(5,10)
 
 /obj/item/reagent_containers/glass/bottle/vial/small/bluespace
-	volume = 60
+	volume = 120
 	possible_transfer_amounts = list(5,10)
 	name = "bluespace hypovial"
 	icon_state = "hypovialbs"
@@ -81,7 +81,7 @@
 	name = "large hypovial"
 	desc = "A large hypovial, for deluxe hypospray models."
 	icon_state = "hypoviallarge"
-	volume = 60
+	volume = 120
 	possible_transfer_amounts = list(5,10,15,20)
 	unique_reskin = list("large hypovial" = "hypoviallarge",
 						"large red hypovial" = "hypoviallarge-b",
@@ -116,7 +116,7 @@
 /obj/item/reagent_containers/glass/bottle/vial/large/bluespace
 	possible_transfer_amounts = list(5,10,15,20)
 	name = "bluespace large hypovial"
-	volume = 120
+	volume = 240
 	icon_state = "hypoviallargebs"
 	unique_reskin = null