Merge branch 'master' into tg-Organ-port

code/modules/reagents/chemistry/holder.dm

@@ -496,7 +496,12 @@
 
 		//Standard reaction mechanics:
 			else
-				if (C.FermiChem == TRUE)//Just to make sure
+				if (C.FermiChem == TRUE)//Just to make sure, should only proc when grenades are combining.
+					if (chem_temp > C.ExplodeTemp) //To allow fermigrenades
+						var/datum/chemical_reaction/fermi/Ferm = selected_reaction
+						fermiIsReacting = FALSE
+						SSblackbox.record_feedback("tally", "fermi_chem", 1, ("[Ferm] explosion"))
+						Ferm.FermiExplode(src, my_atom, volume = total_volume, temp = chem_temp, pH = pH)
 					return 0
 
 				for(var/B in cached_required_reagents) //

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -90,3 +90,9 @@
 			update_pack_name()
 	else
 		return ..()
+
+/obj/item/reagent_containers/blood/bluespace
+	name = "bluespace blood pack"
+	desc = "Contains blood used for transfusion, this one has been made with bluespace technology to hold much more blood. Must be attached to an IV drip."
+	icon_state = "bsbloodpack"
+	volume = 600 //its a blood bath!

code/modules/reagents/reagent_containers/hypospray.dm

@@ -127,6 +127,21 @@
 	else
 		to_chat(usr, "<span class='notice'>It is spent.</span>")
 
+/obj/item/reagent_containers/hypospray/medipen/stimulants
+	name = "illegal stimpack medipen"
+	desc = "A highly illegal medipen due to its load and small injections, allow for five uses before being drained"
+	volume = 50
+	amount_per_transfer_from_this = 10
+	list_reagents = list("stimulants" = 50)
+
+/obj/item/reagent_containers/hypospray/medipen/stimulants/baseball
+	name = "the reason the syndicate major league team wins."
+	desc = "They say drugs never win, but look where you are now, then where they are."
+	icon_state = "baseballstim"
+	volume = 50
+	amount_per_transfer_from_this = 50
+	list_reagents = list("stimulants" = 50)
+
 /obj/item/reagent_containers/hypospray/medipen/stimpack //goliath kiting
 	name = "stimpack medipen"
 	desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor."