diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm
index 1e5097be5e..9924965656 100644
--- a/code/game/machinery/atmoalter/canister.dm
+++ b/code/game/machinery/atmoalter/canister.dm
@@ -219,7 +219,12 @@ Release Pressure: <A href='?src=\ref[src];pressure_adj=-1000'>-</A> <A href='?sr
 	return
 
 /obj/machinery/portable_atmospherics/canister/Topic(href, href_list)
-	if(..()) return
+
+	//Do not use "if(..()) return" here, canisters will stop working in unpowered areas like space or on the derelict.
+	if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+		usr << browse(null, "window=canister")
+		onclose(usr, "canister")
+		return
 
 	if (((get_dist(src, usr) <= 1) && istype(src.loc, /turf)))
 		usr.machine = src
diff --git a/config/admins.txt b/config/admins.txt
index 288cbf6a53..d02ce6a1bc 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1,3 +1,6 @@
+<<<<<<< .mine
+nodrak - Game Master
+carnwennan - Game Master=======
 quarxink - Game Master
 tle - Game Master
 xsi - Game Master
@@ -26,4 +29,4 @@ errorage - Game Master
 uhangi - Game Master
 superxpdude - Game Master
 petethegoat - Game Master
-korphaeron - Game Master
\ No newline at end of file
+korphaeron - Game Master>>>>>>> .r3825