Fixing a mistake on my part. Even though canisters are a child of machines, they should not use the machine's topic() as that checks for power, which the canisters don't use.

Also adding carn and I's name into the admin.txt so we don't have to keep unticking the file every time we want to commit.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3826 316c924e-a436-60f5-8080-3fe189b3f50e

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

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
+korphaeron - Game Master>>>>>>> .r3825