Revises Hypospray mkii performance

After obtaining feedback over a lengthy period of time, this PR is set to ensure that syringes have actual competition in medicine application. Delay was greatly reduced to use the hyposprays, The kits can now also hold 14 vials at once, on par with a regular medkit holding a bunch of bottles. It also greatly improves availability of hypospray mkiis and kit boxes by adding a lot of empty ones to the nano med, hypovials can be produced from the autolathe. Adds the CMO's version of the mkii into their locker, as well as bundles up the mki version into a box with some extra vials for those who prefer the older over the new one. Also removes the extra pair of white shoes because clothing vendors exist
TS-Rogue-Star · Jun 14, 2024 · 894554e · 894554e
1 parent 7e44f51
commit 894554e
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 17 deletions.
diff --git a/code/datums/autolathe/medical.dm b/code/datums/autolathe/medical.dm
@@ -41,3 +41,11 @@
 /datum/category_item/autolathe/medical/implanter
 	name = "implanter"
 	path =/obj/item/weapon/implanter
+
+/datum/category_item/autolathe/medical/hypovial
+	name = "small mkII hypovial"
+	path = /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small
+
+/datum/category_item/autolathe/medical/hypovial/large
+	name = "large mkII hypovial"
+	path = /obj/item/weapon/reagent_containers/glass/bottle/hypovial/large
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -381,6 +381,12 @@
 	icon_state = "auto"
 	starts_with = list(/obj/item/weapon/reagent_containers/hypospray/autoinjector = 7)
 
+/obj/item/weapon/storage/box/hypokitmk1
+	name = "mk I hypospray kit"
+	desc = "Contains the classic MKI hypospray kit and a selection of empty vials."
+	icon_state = "auto"
+	starts_with = list(/obj/item/weapon/reagent_containers/hypospray/vial, /obj/item/weapon/reagent_containers/glass/beaker/vial = 5)
+
 /obj/item/weapon/storage/box/lights
 	name = "box of replacement bulbs"
 	icon = 'icons/obj/boxes.dmi'
@@ -504,4 +510,4 @@
 	name = "box of sin-pockets"
 	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
-	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7)
+	starts_with = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket = 7)
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -177,10 +177,14 @@
 	desc = "Contains a Mk II Hypospray and its hypovials. It can only hold mk.II related items."
 	icon = 'icons/obj/storage.dmi'
 	icon_state = "firstaid-mini"
+	max_storage_space = ITEMSIZE_COST_NORMAL * 7 // 4*7 = 28 / 2 = 14 vials total 
 	starts_with = list(/obj/item/weapon/hypospray_mkii, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 3)
 	can_hold = list(/obj/item/weapon/hypospray_mkii, /obj/item/weapon/reagent_containers/glass/bottle/hypovial)
 	//can fit large and small vials, and any of the mkiis. but that's it. No free Analyzer either.
 
+/obj/item/weapon/storage/firstaid/hypokit/empty
+	starts_with = list()
+
 /obj/item/weapon/storage/firstaid/hypokit/tricord
 	desc = "Contains a Mk II Hypospray and its hypovials. It can only hold mk.II related items. This one is prefilled with Tricordazine."
 	starts_with = list(/obj/item/weapon/hypospray_mkii/tricord, /obj/item/weapon/reagent_containers/glass/bottle/hypovial/small/preloaded/tricordrazine = 3)

diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -145,7 +145,6 @@
 		/obj/item/device/radio/headset/heads/cmo,
 		/obj/item/device/radio/headset/heads/cmo/alt,
 		/obj/item/device/flash,
-		/obj/item/weapon/reagent_containers/hypospray/vial,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo,
 		/obj/item/clothing/shoes/boots/winter/medical,
@@ -156,9 +155,9 @@
 		/obj/item/taperoll/medical,
 		/obj/item/clothing/suit/bio_suit/cmo,
 		/obj/item/clothing/head/bio_hood/cmo,
-		/obj/item/clothing/shoes/white,
-		/obj/item/weapon/reagent_containers/glass/beaker/vial, //VOREStation Add
-		/obj/item/weapon/storage/belt/medical) //VOREStation Add
+		/obj/item/weapon/storage/belt/medical,
+		/obj/item/weapon/storage/firstaid/hypokit/cmo,
+		/obj/item/weapon/storage/box/hypokitmk1)
 
 /obj/structure/closet/secure_closet/CMO/Initialize()
 	if(prob(50))

diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
@@ -408,8 +408,9 @@
 					/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
 					/obj/item/weapon/reagent_containers/syringe/antiviral = 4,
 					/obj/item/weapon/reagent_containers/syringe = 12,
-					/obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 12,
-					/obj/item/weapon/hypospray_mkii = 4,
+					/obj/item/weapon/reagent_containers/glass/bottle/hypovial/small = 40,
+					/obj/item/weapon/hypospray_mkii = 10,
+					/obj/item/weapon/storage/firstaid/hypokit/empty = 10,
 					/obj/item/weapon/storage/firstaid/hypokit/brute = 2,
 					/obj/item/weapon/storage/firstaid/hypokit/burn = 2,
 					/obj/item/weapon/storage/firstaid/hypokit/toxin = 2,

diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -88,9 +88,9 @@
 
 //A vial-loaded hypospray. Cartridge-based!
 /obj/item/weapon/reagent_containers/hypospray/vial
-	name = "advanced hypospray"
+	name = "mkI hypospray"
 	icon_state = "advhypo"
-	desc = "A new development from DeForest Medical, this new hypospray takes 30-unit vials as the drug supply for easy swapping."
+	desc = "A development from DeForest Medical, this hypospray takes 30-unit vials as the drug supply for easy swapping."
 	var/obj/item/weapon/reagent_containers/glass/beaker/vial/loaded_vial //Wow, what a name.
 	volume = 0
 

diff --git a/code/modules/reagents/reagent_containers/hypospraymkii.dm b/code/modules/reagents/reagent_containers/hypospraymkii.dm
@@ -1,15 +1,15 @@
 #define HYPO_SPRAY 0
 #define HYPO_INJECT 1
 
-#define WAIT_SPRAY 5 SECONDS
-#define WAIT_INJECT 5 SECONDS
-#define SELF_SPRAY 3 SECONDS
-#define SELF_INJECT 3 SECONDS
+#define WAIT_SPRAY 2 SECONDS
+#define WAIT_INJECT 2 SECONDS
+#define SELF_SPRAY 1 SECONDS
+#define SELF_INJECT 1 SECONDS
 
-#define DELUXE_WAIT_SPRAY 4 SECONDS
-#define DELUXE_WAIT_INJECT 4 SECONDS
-#define DELUXE_SELF_SPRAY 2 SECONDS
-#define DELUXE_SELF_INJECT 2 SECONDS
+#define DELUXE_WAIT_SPRAY 1 SECONDS
+#define DELUXE_WAIT_INJECT 1 SECONDS
+#define DELUXE_SELF_SPRAY 1 SECONDS
+#define DELUXE_SELF_INJECT 1 SECONDS
 
 #define COMBAT_WAIT_SPRAY 0
 #define COMBAT_WAIT_INJECT 0
@@ -277,6 +277,7 @@
 	w_class = ITEMSIZE_SMALL //Why would it be the same size as a beaker?
 	flags = OPENCONTAINER | NOCONDUCT
 	unacidable = TRUE
+	matter = list(MAT_GLASS = 250)
 	var/bluespaced = FALSE
 	var/comes_with = list() //Easy way of doing this.
 	var/fillingsize = "hypovial"
@@ -406,6 +407,7 @@
 	icon_state = "hypoviallarge"
 	fillingsize = "hypoviallarge"
 	volume = 60
+	matter = list(MAT_GLASS = 500)
 	possible_transfer_amounts = list(5,10,15,25,30)
 
 	unique_reskin = list("large hypovial" = "hypoviallarge",