From 0ab5ccac235fb39f2bdc3c7592b7fc278e58a6c6 Mon Sep 17 00:00:00 2001
From: Geeves <ggrobler447@gmail.com>
Date: Thu, 26 Nov 2020 12:25:23 +0200
Subject: [PATCH] Injection QoL (#10634)

---
 code/modules/reagents/reagent_containers/hypospray.dm | 10 ++++------
 code/modules/reagents/reagent_containers/syringes.dm  |  2 +-
 html/changelogs/geeves-hypospray_qol.yml              |  8 ++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 html/changelogs/geeves-hypospray_qol.yml

diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index c38867607e9..8c7f6c1f0ba 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -17,7 +17,7 @@
 	amount_per_transfer_from_this = 5
 	unacidable = 1
 	volume = 15
-	possible_transfer_amounts = null
+	possible_transfer_amounts = list(5, 10, 15)
 	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
 	drop_sound = 'sound/items/drop/gun.ogg'
@@ -42,6 +42,7 @@
 	desc_info = "This version of the hypospray has no delay before injecting a patient with reagent."
 	icon_state = "cmo_hypo"
 	volume = 30
+	possible_transfer_amounts = list(5, 10, 15, 30)
 	time = 0
 
 /obj/item/reagent_containers/hypospray/attack(var/mob/M, var/mob/user, target_zone)
@@ -108,6 +109,7 @@
 	var/empty_state = "autoinjector0"
 	flags = OPENCONTAINER
 	amount_per_transfer_from_this = 5
+	possible_transfer_amounts = null
 	volume = 5
 	time = 0
 
@@ -161,15 +163,11 @@
 
 /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline
 	name = "autoinjector (inaprovaline)"
-	volume = 5
-	amount_per_transfer_from_this = 20
-	flags = 0
 
 /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline/Initialize()
-	. =..()
+	. = ..()
 	reagents.add_reagent(/datum/reagent/inaprovaline, 5)
 	update_icon()
-	return
 
 /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone
 	name = "sideeffects-be-gone! autoinjector"
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 0c4781d6e1f..2866ca2e854 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -20,7 +20,7 @@
 	center_of_mass = list("x" = 16,"y" = 14)
 	matter = list(MATERIAL_GLASS = 150)
 	amount_per_transfer_from_this = 5
-	possible_transfer_amounts = null
+	possible_transfer_amounts = list(1, 2, 5, 15)
 	volume = 15
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
diff --git a/html/changelogs/geeves-hypospray_qol.yml b/html/changelogs/geeves-hypospray_qol.yml
new file mode 100644
index 00000000000..19a1425ae45
--- /dev/null
+++ b/html/changelogs/geeves-hypospray_qol.yml
@@ -0,0 +1,8 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Standard hyposprays can now choose to inject 5, 10, or 15 units per inject."
+  - rscadd: "CMO hyposprays can now choose to inject 5, 10, 15, or 30 units per inject."
+  - rscadd: "Standard syringes can now choose to inject 1, 2, 5, or 15 units per inject."
\ No newline at end of file