Merge remote-tracking branch 'upstream/master'

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/glass.dm

@@ -6,7 +6,7 @@
 	reagent_flags = OPENCONTAINER
 	spillable = TRUE
 	resistance_flags = ACID_PROOF
-	container_HP = 3
+	container_HP = 2
 
 
 /obj/item/reagent_containers/glass/attack(mob/M, mob/user, obj/target)
@@ -115,7 +115,6 @@
 	item_state = "beaker"
 	materials = list(MAT_GLASS=500)
 	beaker_weakness_bitflag = PH_WEAK
-	container_HP = 5
 
 /obj/item/reagent_containers/glass/beaker/Initialize()
 	. = ..()
@@ -133,27 +132,29 @@
 	list_reagents = list("viralbase" = 1)
 
 /obj/item/reagent_containers/glass/beaker/update_icon()
+	if(!cached_icon)
+		cached_icon = icon_state
 	cut_overlays()
 
 	if(reagents.total_volume)
-		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[icon_state]10")
+		var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "[cached_icon]10")
 
 		var/percent = round((reagents.total_volume / volume) * 100)
 		switch(percent)
 			if(0 to 9)
-				filling.icon_state = "[icon_state]-10"
+				filling.icon_state = "[cached_icon]-10"
 			if(10 to 24)
-				filling.icon_state = "[icon_state]10"
+				filling.icon_state = "[cached_icon]10"
 			if(25 to 49)
-				filling.icon_state = "[icon_state]25"
+				filling.icon_state = "[cached_icon]25"
 			if(50 to 74)
-				filling.icon_state = "[icon_state]50"
+				filling.icon_state = "[cached_icon]50"
 			if(75 to 79)
-				filling.icon_state = "[icon_state]75"
+				filling.icon_state = "[cached_icon]75"
 			if(80 to 90)
-				filling.icon_state = "[icon_state]80"
+				filling.icon_state = "[cached_icon]80"
 			if(91 to INFINITY)
-				filling.icon_state = "[icon_state]100"
+				filling.icon_state = "[cached_icon]100"
 
 		filling.color = mix_color_from_reagents(reagents.reagent_list)
 		add_overlay(filling)
@@ -172,7 +173,7 @@
 	volume = 100
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
-	container_HP = 6
+	container_HP = 3
 
 /obj/item/reagent_containers/glass/beaker/plastic
 	name = "x-large beaker"
@@ -232,7 +233,7 @@
 	volume = 300
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
-	container_HP = 8
+	container_HP = 4
 
 /obj/item/reagent_containers/glass/beaker/cryoxadone
 	list_reagents = list("cryoxadone" = 30)
@@ -289,7 +290,7 @@
 		SLOT_L_STORE, SLOT_R_STORE,\
 		SLOT_GENERC_DEXTROUS_STORAGE
 	)
-	container_HP = 2
+	container_HP = 1
 
 /obj/item/reagent_containers/glass/bucket/Initialize()
 	beaker_weakness_bitflag |= TEMP_WEAK
@@ -343,7 +344,7 @@
 	materials = list(MAT_GLASS=0)
 	volume = 50
 	amount_per_transfer_from_this = 10
-	container_HP = 2
+	container_HP = 1
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/Initialize()
 	beaker_weakness_bitflag |= TEMP_WEAK
@@ -359,7 +360,7 @@
 	list_reagents = list("water" = 100)
 	volume = 100
 	amount_per_transfer_from_this = 20
-	container_HP = 2
+	container_HP = 1
 
 /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty
 	list_reagents = list()

code/modules/reagents/reagent_containers/medspray.dm

@@ -19,8 +19,8 @@
 	var/can_fill_from_container = TRUE
 	var/apply_type = PATCH
 	var/apply_method = "spray"
-	var/self_delay = 30
-	var/squirt_mode = 0
+	var/self_delay = 3 SECONDS
+	var/squirt_mode = FALSE
 	var/squirt_amount = 5
 
 /obj/item/reagent_containers/medspray/attack_self(mob/user)
@@ -31,40 +31,51 @@
 		amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
 	to_chat(user, "<span class='notice'>You will now apply the medspray's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.</span>")
 
-/obj/item/reagent_containers/medspray/attack(mob/M, mob/user, def_zone)
+/obj/item/reagent_containers/medspray/attack(mob/living/L, mob/user, def_zone)
 	if(!reagents || !reagents.total_volume)
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 		return
 
-	if(M == user)
-		M.visible_message("<span class='notice'>[user] attempts to [apply_method] [src] on [user.p_them()]self.</span>")
+	if(ishuman(L))
+		var/obj/item/bodypart/affecting = L.get_bodypart(check_zone(user.zone_selected))
+		if(!affecting)
+			to_chat(user, "<span class='warning'>The limb is missing!</span>")
+			return
+		if(!L.can_inject(user, TRUE, user.zone_selected, FALSE, TRUE)) //stopped by clothing, like patches
+			return
+		if(affecting.status != BODYPART_ORGANIC)
+			to_chat(user, "<span class='notice'>Medicine won't work on a robotic limb!</span>")
+			return
+
+	if(L == user)
+		L.visible_message("<span class='notice'>[user] attempts to [apply_method] [src] on [user.p_them()]self.</span>")
 		if(self_delay)
-			if(!do_mob(user, M, self_delay))
+			if(!do_mob(user, L, self_delay))
 				return
 			if(!reagents || !reagents.total_volume)
 				return
-		to_chat(M, "<span class='notice'>You [apply_method] yourself with [src].</span>")
+		to_chat(L, "<span class='notice'>You [apply_method] yourself with [src].</span>")
 
 	else
-		log_combat(user, M, "attempted to apply", src, reagents.log_list())
-		M.visible_message("<span class='danger'>[user] attempts to [apply_method] [src] on [M].</span>", \
-							"<span class='userdanger'>[user] attempts to [apply_method] [src] on [M].</span>")
-		if(!do_mob(user, M))
+		log_combat(user, L, "attempted to apply", src, reagents.log_list())
+		L.visible_message("<span class='danger'>[user] attempts to [apply_method] [src] on [L].</span>", \
+							"<span class='userdanger'>[user] attempts to [apply_method] [src] on [L].</span>")
+		if(!do_mob(user, L))
 			return
 		if(!reagents || !reagents.total_volume)
 			return
-		M.visible_message("<span class='danger'>[user] [apply_method]s [M] down with [src].</span>", \
-							"<span class='userdanger'>[user] [apply_method]s [M] down with [src].</span>")
+		L.visible_message("<span class='danger'>[user] [apply_method]s [L] down with [src].</span>", \
+							"<span class='userdanger'>[user] [apply_method]s [L] down with [src].</span>")
 
 	if(!reagents || !reagents.total_volume)
 		return
 
 	else
-		log_combat(user, M, "applied", src, reagents.log_list())
+		log_combat(user, L, "applied", src, reagents.log_list())
 		playsound(src, 'sound/effects/spray2.ogg', 50, 1, -6)
 		var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1)
-		reagents.reaction(M, apply_type, fraction)
-		reagents.trans_to(M, amount_per_transfer_from_this)
+		reagents.reaction(L, apply_type, fraction)
+		reagents.trans_to(L, amount_per_transfer_from_this)
 	return
 
 /obj/item/reagent_containers/medspray/styptic

code/modules/reagents/reagent_containers/rags.dm

@@ -115,6 +115,8 @@
 	var/flat_icon = "towel_flat"
 	var/folded_icon = "towel"
 	var/list/possible_colors
+	//Hyper Change
+	var/roomy = 1 //To cover XL bits
 
 /obj/item/reagent_containers/rag/towel/Initialize()
 	. = ..()