diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index c37c7937b90..ecabec80f83 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -148,7 +148,7 @@
 			if(req in I.access) //has an access from the single access list
 				return 1
 	for(var/req in src.req_access)
-		if(!(req in I.access)) //doesn't have this access
+		if(!(req in I.access)) //doesn't have this access - Leave like this DMTG
 			return 0
 	return 1
 
@@ -164,7 +164,7 @@
 			if(req in L) //has an access from the single access list
 				return 1
 	for(var/req in src.req_access)
-		if(!(req in L)) //doesn't have this access
+		if(!(req in L)) //doesn't have this access - Leave like this DMTG
 			return 0
 	return 1
 
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 263b705624a..c30890f0cb0 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -71,7 +71,7 @@
 
 
 	else
-		for(var/obj/machinery/door/poddoor/M in machines)
+		for(var/obj/machinery/door/poddoor/M in world)
 			if (M.id == src.id)
 				if (M.density)
 					spawn( 0 )
@@ -119,7 +119,7 @@
 	active = 1
 	icon_state = "launcheract"
 
-	for(var/obj/machinery/door/poddoor/M in machines)
+	for(var/obj/machinery/door/poddoor/M in world)
 		if (M.id == src.id)
 			spawn( 0 )
 				M.open()
@@ -133,7 +133,7 @@
 
 	sleep(50)
 
-	for(var/obj/machinery/door/poddoor/M in machines)
+	for(var/obj/machinery/door/poddoor/M in world)
 		if (M.id == src.id)
 			spawn( 0 )
 				M.close()
diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index b41a931346c..7a80dbec9ce 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -390,6 +390,18 @@
 			return
 	return   ///////////////////////////////////////////////////////Alright, that should do it. *MARKER* for any possible runtimes
 
+
+/obj/item/weapon/storage/pill_bottle/verb/toggle_mode()
+	set name = "Switch Pill Bottle Method"
+	set category = "Object"
+
+	mode = !mode
+	switch (mode)
+		if(1)
+			usr << "The pill bottle now picks up all pills in a tile at once."
+		if(0)
+			usr << "The pill bottle now picks up one pill at a time."
+
 /obj/item/weapon/storage/pillbottlebox/New()
 	new /obj/item/weapon/storage/pill_bottle( src )
 	new /obj/item/weapon/storage/pill_bottle( src )
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 9efa541d670..c19380ddd5d 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -1768,7 +1768,23 @@
 			icon_state = "pill[rand(1,20)]"
 
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
-
+		if (istype(W, /obj/item/weapon/storage/pill_bottle))
+			var/obj/item/weapon/storage/pill_bottle/P = W
+			if (P.mode == 1)
+				for (var/obj/item/weapon/reagent_containers/pill/O in locate(src.x,src.y,src.z))
+					if(P.contents.len < P.storage_slots)
+						O.loc = P
+						P.orient2hud(user)
+					else
+						user << "\blue The pill bottle is full."
+						return
+				user << "\blue You pick up all the pills."
+			else
+				if (P.contents.len < P.storage_slots)
+					loc = P
+					P.orient2hud(user)
+				else
+					user << "\blue The pill bottle is full."
 		return
 	attack_self(mob/user as mob)
 		return