diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index 513fea4360..50fae40a91 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -196,7 +196,7 @@
 						blood_type = R.name
 					else
 						blood_type = blood_id
-				data["occupant"]["blood"]["maxBloodVolume"] = BLOOD_VOLUME_NORMAL
+				data["occupant"]["blood"]["maxBloodVolume"] = (BLOOD_VOLUME_NORMAL*C.blood_ratio)
 				data["occupant"]["blood"]["currentBloodVolume"] = C.blood_volume
 				data["occupant"]["blood"]["dangerBloodVolume"] = BLOOD_VOLUME_SAFE
 				data["occupant"]["blood"]["bloodType"] = blood_type
diff --git a/code/game/machinery/reagent_sleeper.dm b/code/game/machinery/reagent_sleeper.dm
index 304e413b84..6eecd8d3ba 100644
--- a/code/game/machinery/reagent_sleeper.dm
+++ b/code/game/machinery/reagent_sleeper.dm
@@ -32,11 +32,12 @@
 	occupant_typecache = GLOB.typecache_living
 	update_icon()
 	reset_chem_buttons()
+	RefreshParts()
 	//add_inital_chems()
 
 /obj/machinery/reagent_sleeper/Destroy()
-	var/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc)
-	buffer.reagents = reagents
+	var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc)
+	reagents.trans_to(buffer.reagents, reagents.total_volume)
 	..()
 
 /obj/machinery/reagent_sleeper/RefreshParts()
@@ -55,7 +56,8 @@
 	reset_chem_buttons()
 
 	//Total container size 300 - 1200u
-	reagents.maximum_volume = (300*E)
+	if(reagents)
+		reagents.maximum_volume = (300*E)
 
 /obj/machinery/reagent_sleeper/update_icon()
 	icon_state = initial(icon_state)
@@ -98,7 +100,7 @@
 /obj/machinery/reagent_sleeper/attackby(obj/item/I, mob/user, params)
 	if(!istype(I, /obj/item/reagent_containers/sleeper_buffer))
 		var/obj/item/reagent_containers/sleeper_buffer/SB = I
-		if((SB.reagents.total_volume + reagents.total_volume) < reagents.max_volume)
+		if((SB.reagents.total_volume + reagents.total_volume) < reagents.maximum_volume)
 			SB.reagents.trans_to(reagents, SB.reagents.total_volume)
 			visible_message("[user] places the [SB] into the [src].")
 			qdel(SB)
@@ -166,7 +168,7 @@
 
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "reagent_sleeper", name, 375, 650, master_ui, state)
+		ui = new(user, src, ui_key, "reagent_sleeper", name, 400, 650, master_ui, state)
 		ui.open()
 
 /obj/machinery/reagent_sleeper/ui_data()
@@ -178,12 +180,15 @@
 	data["tot_capacity"] = reagents.maximum_volume
 
 	data["chems"] = list()
-	for(var/chem in reagents.reagent_list)
-		var/datum/reagent/R = GLOB.chemical_reagents_list[chem]
-		if(R.id in available_chems)
-			data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(chem)))
+	for(var/chem in available_chems)
+		var/datum/reagent/R = reagents.has_reagent(chem.id)
+		if(R)
+			data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = R2.volume, "allowed" = chem_allowed(chem)))
 		else
-			data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(chem)))
+			R = GLOB.chemical_reagents_list[chem]
+			data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = 0, "allowed" = chem_allowed(chem)))
+	for(var/datum/reagent/R in reagents.reagent_list)
+		data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(R.id)))
 
 	data["occupant"] = list()
 	var/mob/living/mob_occupant = occupant
@@ -247,12 +252,12 @@
 			. = TRUE
 		if("inject")
 			var/chem = params["chem"]
-			var/amount = param["volume"]
+			var/amount = text2num(params["volume"])
 			if(!is_operational() || !mob_occupant)
 				return
 			if(mob_occupant.health < min_health && chem != "epinephrine")
 				return
-			if(inject_chem(chem, usr, volume))
+			if(inject_chem(chem, usr, amount))
 				. = TRUE
 				if(scrambled_chems && prob(5))
 					to_chat(usr, "<span class='warning'>Chemical system re-route detected, results may not be as expected!</span>")
@@ -271,7 +276,7 @@
 
 //trans to
 /obj/machinery/reagent_sleeper/proc/inject_chem(chem, mob/user, volume)
-	if((chem in available_chems) && chem_allowed(chem))
+	if(chem_allowed(chem))
 		reagents.trans_id_to(occupant, chem_buttons[chem], volume)//emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU
 		if(user)
 			log_combat(user, occupant, "injected [chem] into", addition = "via [src]")
diff --git a/code/modules/reagents/reagent_containers/sleeper_buffer.dm b/code/modules/reagents/reagent_containers/sleeper_buffer.dm
index e41bd3f376..5f8e9a817b 100644
--- a/code/modules/reagents/reagent_containers/sleeper_buffer.dm
+++ b/code/modules/reagents/reagent_containers/sleeper_buffer.dm
@@ -2,6 +2,7 @@
 /obj/item/reagent_containers/sleeper_buffer
 	name = "Sleeper buffer container"
 	desc = "A closed container for insertion in the Medical Sleepers."
+	icon_state = "sleeper_buffer"
 	volume = 1200
 	reagent_flags = NO_REACT
 	spillable = TRUE
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 701c3a2467..74a5164844 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 2e0142c49f..8d33c04d8f 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -625,6 +625,7 @@
 #include "code\game\machinery\newscaster.dm"
 #include "code\game\machinery\PDApainter.dm"
 #include "code\game\machinery\quantum_pad.dm"
+#include "code\game\machinery\reagent_sleeper.dm"
 #include "code\game\machinery\recharger.dm"
 #include "code\game\machinery\rechargestation.dm"
 #include "code\game\machinery\recycler.dm"
@@ -2620,6 +2621,7 @@
 #include "code\modules\reagents\reagent_containers\patch.dm"
 #include "code\modules\reagents\reagent_containers\pill.dm"
 #include "code\modules\reagents\reagent_containers\rags.dm"
+#include "code\modules\reagents\reagent_containers\sleeper_buffer.dm"
 #include "code\modules\reagents\reagent_containers\spray.dm"
 #include "code\modules\reagents\reagent_containers\syringes.dm"
 #include "code\modules\recycling\conveyor2.dm"
diff --git a/tgui/src/interfaces/reagent_sleeper.ract b/tgui/src/interfaces/reagent_sleeper.ract
index c560bc06e0..24adcff692 100644
--- a/tgui/src/interfaces/reagent_sleeper.ract
+++ b/tgui/src/interfaces/reagent_sleeper.ract
@@ -46,7 +46,7 @@
 	</ui-section>
   <ui-section label='Inject'>
     {{#each data.synthchems}}
-      <span>{{name}}: {{vol}} </span>
+      <span>{{name}}: {{vol}}u</span>
       {{#if data.efficiency >= 3}}
 	    <ui-button icon='transfer' state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 1}'>1</ui-button>
 	  {{/if}}
@@ -57,7 +57,7 @@
       <ui-button icon='flask' state='{{data.occupied && allowed ? null : "disabled"}}' action='synth' params='{"chem": "{{id}}"}'>Synthesize</ui-button><br/>
     {{/each}}
     {{#each data.chems}}
-	  <span>{{name}}: {{vol}} </span>
+	  <span>{{name}}: {{vol}}u</span>
 	  {{#if data.efficiency >= 3}}
 	    <ui-button icon='transfer' state='{{data.occupied && allowed ? null : "disabled"}}' action='inject' params='{"chem": "{{id}}", "volume": 1}'>1</ui-button>
 	  {{/if}}