Merge pull request #1768 from CIB/master

Bleeding fixes

code/modules/mob/living/carbon/human/life.dm

@@ -190,7 +190,7 @@
 				if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT)
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
-					blood_max += W.damage / 2
+					blood_max += W.damage / 4
 				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -0,0 +1,36 @@
+/obj/item/weapon/reagent_containers/blood
+	name = "BloodPack"
+	desc = "Contains blood used for transfusion."
+	icon = 'icons/obj/bloodpack.dmi'
+	volume = 200
+
+	var/blood_type = null
+
+	New()
+		..()
+		if(blood_type != null)
+			name = "BloodPack [blood_type]"
+			reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
+
+/obj/item/weapon/reagent_containers/blood/APlus
+	blood_type = "A+"
+
+/obj/item/weapon/reagent_containers/blood/AMinus
+	blood_type = "A-"
+
+/obj/item/weapon/reagent_containers/blood/BPlus
+	blood_type = "B+"
+
+/obj/item/weapon/reagent_containers/blood/BMinus
+	blood_type = "B-"
+
+/obj/item/weapon/reagent_containers/blood/OPlus
+	blood_type = "O+"
+
+/obj/item/weapon/reagent_containers/blood/OMinus
+	blood_type = "O-"
+
+/obj/item/weapon/reagent_containers/blood/empty
+	name = "Empty BloodPack"
+	desc = "Seems pretty useless... Maybe if there were a way to fill it?"
+	icon_state = "empty"

code/modules/reagents/reagent_containers/glass.dm

@@ -26,7 +26,8 @@
 		/obj/machinery/bot/medbot,
 		/obj/machinery/computer/pandemic,
 		/obj/item/weapon/secstorage/ssafe,
-		/obj/machinery/disposal
+		/obj/machinery/disposal,
+        /obj/machinery/iv_drip
 	)
 
 	examine()
@@ -222,4 +223,4 @@
 		..()
 		reagents.add_reagent("fluorosurfactant", 20)
 
-*/
+*/