cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
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
This commit is contained in:
johnsonmt88@gmail.com
2012-06-15 05:33:48 +00:00
parent 5b76469b98
commit 0ab6eda79b
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/machinery/atmoalter/canister.dm
View File

@@ -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