Merge branch 'master' into tools_andstuff

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

@@ -100,3 +100,12 @@
 			if(isliving(A))
 				to_chat(A, "<span class='userdanger'>You're suddenly forced into a tiny, compressed space!</span>")
 		qdel(src)
+
+/obj/structure/closet/body_bag/containment
+	name = "containment body bag"
+	desc = "A folded heavy body bag designed for the storage and transportation of cadavers with heavy radiation."
+	icon = 'icons/obj/bodybag.dmi'
+	icon_state = "radbodybag"
+	mob_storage_capacity = 1
+	foldedbag_path = /obj/item/bodybag/containment
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE

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

@@ -179,6 +179,7 @@
 	desc = "A crate with a radiation sign on it."
 	name = "radiation crate"
 	icon_state = "radiation"
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
 /obj/structure/closet/crate/hydroponics
 	name = "hydroponics crate"