Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800

code/modules/reagents/reagent_containers/bottle.dm

@@ -8,7 +8,6 @@
 	possible_transfer_amounts = list(5,10,15,25,30)
 	volume = 30
 
-
 /obj/item/reagent_containers/glass/bottle/Initialize()
 	. = ..()
 	if(!icon_state)
@@ -40,7 +39,6 @@
 
 		. += filling
 
-
 /obj/item/reagent_containers/glass/bottle/epinephrine
 	name = "epinephrine bottle"
 	desc = "A small bottle. Contains epinephrine - used to stabilize patients."
@@ -228,6 +226,13 @@
 	desc = "A small bottle of atropine."
 	list_reagents = list(/datum/reagent/medicine/atropine = 30)
 
+/obj/item/reagent_containers/glass/bottle/zeolites
+	name = "Zeolites bottle"
+	desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items."
+	list_reagents = list(/datum/reagent/fermi/zeolites = 30)
+
+// Viro bottles
+
 /obj/item/reagent_containers/glass/bottle/romerol
 	name = "romerol bottle"
 	desc = "A small bottle of Romerol. The REAL zombie powder."

code/modules/reagents/reagent_containers/chem_pack.dm

@@ -0,0 +1,51 @@
+/obj/item/reagent_containers/chem_pack
+	name = "intravenous medicine bag"
+	desc = "A plastic pressure bag, or 'chem pack', for IV administration of drugs. It is fitted with a thermosealing strip."
+	icon = 'icons/obj/bloodpack.dmi'
+	icon_state = "chempack"
+	volume = 100
+	reagent_flags = OPENCONTAINER
+	spillable = TRUE
+	obj_flags = UNIQUE_RENAME
+	resistance_flags = ACID_PROOF
+	var/sealed = FALSE
+
+/obj/item/reagent_containers/chem_pack/on_reagent_change(changetype)
+	update_icon()
+
+/obj/item/reagent_containers/chem_pack/update_icon()
+	cut_overlays()
+
+	var/v = min(round(reagents.total_volume / volume * 10), 10)
+	if(v > 0)
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "chempack1")
+		filling.icon_state = "chempack[v]"
+		filling.color = mix_color_from_reagents(reagents.reagent_list)
+		add_overlay(filling)
+
+/obj/item/reagent_containers/chem_pack/AltClick(mob/living/user)
+	if(user.canUseTopic(src, BE_CLOSE, NO_DEXTERY) && !sealed)
+		if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50)))
+			to_chat(user, "<span class='warning'>Uh... whoops! You accidentally spill the content of the bag onto yourself.</span>")
+			SplashReagents(user)
+			return
+		else
+			DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER)
+			ENABLE_BITFIELD(reagents.reagents_holder_flags, DRAWABLE |INJECTABLE )
+			spillable = FALSE
+			sealed = TRUE
+			to_chat(user, "<span class='notice'>You seal the bag.</span>")
+
+
+/obj/item/reagent_containers/chem_pack/examine()
+	. = ..()
+	if(sealed)
+		. += "<span class='notice'>The bag is sealed shut.</span>"
+	else
+		. += "<span class='notice'>Alt-click to seal it.</span>"
+
+
+obj/item/reagent_containers/chem_pack/attack_self(mob/user)
+	if(sealed)
+		return
+	..()

code/modules/reagents/reagent_containers/dropper.dm

@@ -7,7 +7,7 @@
 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
 	volume = 5
 	reagent_flags = TRANSPARENT
-	custom_price = 75
+	custom_price = PRICE_CHEAP_AS_FREE
 
 /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
 	. = ..()

code/modules/reagents/reagent_containers/glass.dm

@@ -361,7 +361,7 @@
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "smallbottle"
 	item_state = "bottle"
-	custom_price = 30
+	custom_price = PRICE_CHEAP_AS_FREE
 	list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard
 	custom_materials = list(/datum/material/glass=0)
 	volume = 50

code/modules/reagents/reagent_containers/hypospray.dm

@@ -96,8 +96,7 @@
 	reagent_flags = DRAWABLE
 	flags_1 = null
 	list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/preservahyde = 3)
-	custom_price = 150
-	custom_premium_price = 300
+	custom_premium_price = PRICE_ALMOST_EXPENSIVE
 
 /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")

code/modules/reagents/reagent_containers/pill.dm

@@ -25,14 +25,8 @@
 /obj/item/reagent_containers/pill/attack_self(mob/user)
 	return
 
-/obj/item/reagent_containers/pill/get_w_volume()
-	switch(reagents.total_volume)
-		if(0 to 9.5)
-			return 1
-		if(9.5 to 25)
-			return DEFAULT_VOLUME_TINY
-		else
-			return DEFAULT_VOLUME_SMALL
+/obj/item/reagent_containers/pill/get_w_volume() // DEFAULT_VOLUME_TINY at 25u, DEFAULT_VOLUME_SMALL at 50u
+	return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY
 
 /obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone)
 	if(!canconsume(M, user))

code/modules/reagents/reagent_containers/syringes.dm

@@ -15,7 +15,7 @@
 	var/show_filling = TRUE
 	custom_materials = list(/datum/material/iron=10, /datum/material/glass=20)
 	reagent_flags = TRANSPARENT
-	custom_price = 100
+	custom_price = PRICE_CHEAP_AS_FREE
 
 /obj/item/reagent_containers/syringe/Initialize()
 	. = ..()