cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Ccomp5950
2014-01-23 00:19:01 -06:00
parent 23f4d34e4b c028db481e
commit 283df26fa7
22 changed files with 77 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
+1 -1
View File
@@ -32,7 +32,7 @@ var/global/list/rad_collectors = list()
P.air_contents.toxins = 0
eject()
else
P.air_contents.toxins -= 0.001*drainratio
P.air_contents.adjust(tx = -0.001*drainratio)
return
code/modules/power/smes.dm
+1 -1
View File
@@ -215,7 +215,7 @@
//world << "[href] ; [href_list[href]]"
if (!istype(src.loc, /turf) || istype(usr, /mob/living/silicon/ai))
if (!istype(src.loc, /turf) && !istype(usr, /mob/living/silicon/))
return 0 // Do not update ui
if( href_list["cmode"] )