Merge pull request #5796 from Novacat/nova-basicfixes

Ports 6440 early

code/datums/supplypacks/security.dm

@@ -397,23 +397,3 @@
 	containertype = /obj/structure/closet/crate/secure
 	containername = "Security biohazard gear"
 	access = access_security
-
-/datum/supply_pack/security/trackingimplant
-	name = "Implants - Tracking"
-	contains = list(
-			/obj/item/weapon/storage/box/trackimp = 1
-			)
-	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Tracking implants"
-	access = access_security
-
-/datum/supply_pack/security/chemicalimplant
-	name = "Implants - Chemical"
-	contains = list(
-			/obj/item/weapon/storage/box/chemimp = 1
-			)
-	cost = 25
-	containertype = /obj/structure/closet/crate/secure
-	containername = "Chemical implants"
-	access = access_security

code/datums/supplypacks/security_vr.dm

@@ -34,3 +34,23 @@
 			/obj/item/weapon/storage/box/gloves
 			)
 	cost = 40
+
+/datum/supply_pack/security/trackingimplant
+	name = "Implants - Tracking"
+	contains = list(
+			/obj/item/weapon/storage/box/trackimp = 1
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Tracking implants"
+	access = access_security
+
+/datum/supply_pack/security/chemicalimplant
+	name = "Implants - Chemical"
+	contains = list(
+			/obj/item/weapon/storage/box/chemimp = 1
+			)
+	cost = 25
+	containertype = /obj/structure/closet/crate/secure
+	containername = "Chemical implants"
+	access = access_security

code/game/machinery/Sleeper.dm

@@ -272,7 +272,7 @@
 				if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
 					var/pumped = 0
 					for(var/datum/reagent/x in occupant.ingested.reagent_list)
-						occupant.reagents.trans_to_obj(beaker, 3)
+						occupant.ingested.trans_to_obj(beaker, 3)
 						pumped++
 					if(ishuman(occupant))
 						occupant.ingested.trans_to_obj(beaker, pumped + 1)