Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

code/game/objects/structures/crates_lockers/closets/egg_vr.dm

@@ -7,6 +7,7 @@
 	var/icon_closed = "egg"
 	var/icon_opened = "egg_open"
 	var/icon_locked = "egg"
+	closet_appearance = null
 	open_sound = 'sound/vore/schlorp.ogg'
 	close_sound = 'sound/vore/schlorp.ogg'
 	opened = 0

code/game/objects/structures/crates_lockers/largecrate.dm

@@ -1,7 +1,7 @@
 /obj/structure/largecrate
 	name = "large crate"
 	desc = "A hefty wooden crate."
-	icon = 'icons/obj/storage_vr.dmi'	//VOREStation Edit
+	icon = 'icons/obj/storage.dmi'
 	icon_state = "densecrate"
 	density = 1
 	var/list/starts_with

code/game/objects/structures/medical_stand_vr.dm

@@ -423,7 +423,7 @@
 				return
 
 			// If the human is losing too much blood, beep.
-			if(((H.vessel.get_reagent_amount("blood")/H.species.blood_volume)*100) < BLOOD_VOLUME_SAFE)
+			if(H.vessel.get_reagent_amount("blood") < H.species.blood_volume*H.species.blood_level_safe)
 				visible_message("\The [src] beeps loudly.")
 
 			var/datum/reagent/B = H.take_blood(beaker,amount)