TGS Test Merge (#6176)

Citadel-Station-13 · Dec 6, 2023 · 0b02c38 · 0b02c38
2 parents edf28d0 + dfaf973
commit 0b02c38
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/code/modules/reagents/items/hypospray.dm b/code/modules/reagents/items/hypospray.dm
@@ -76,6 +76,9 @@
 /obj/item/hypospray/attackby(obj/item/I, mob/living/user, list/params, clickchain_flags, damage_multiplier)
 	if(istype(I, /obj/item/reagent_containers/glass/hypovial))
 		var/obj/item/reagent_containers/glass/hypovial/vial = I
+		if(vial.is_large && !allow_large)
+			user.action_feedback(SPAN_WARNING("[vial] requires an advanced hypospray to use!"), src)
+			return CLICKCHAIN_DO_NOT_PROPAGATE
 		if(!user.transfer_item_to_loc(vial, src))
 			user.action_feedback(SPAN_WARNING("[vial] is stuck to your hand!"), src)
 			return CLICKCHAIN_DO_NOT_PROPAGATE

diff --git a/code/modules/reagents/items/hypovial.dm b/code/modules/reagents/items/hypovial.dm
@@ -11,6 +11,8 @@
 	w_class = WEIGHT_CLASS_TINY // 14 fits in a box, not 7
 	volume = 60
 	start_rename = TRUE
+	/// if the vial is large or not, large vials only work with advanced units
+	var/is_large = FALSE
 	/// how many [state][#] overlays we have for reagents remaining
 	var/overlay_count = 3
 
@@ -34,6 +36,7 @@
 	)
 	w_class = WEIGHT_CLASS_SMALL
 	volume = 120
+	is_large = TRUE
 	overlay_count = 4
 
 /obj/item/reagent_containers/glass/hypovial/bluespace