cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 21:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Conflict resolution

Browse Source
This commit is contained in:
Arkatos
2020-02-27 13:15:17 +01:00
parent b1e602f0a1 305cebb2c0
commit 929a54e47d
1106 changed files with 13819 additions and 28081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/narsie.dm
+1 -1
View File
@@ -218,7 +218,7 @@
// if(defer_powernet_rebuild != 2)
// defer_powernet_rebuild = 1
for(var/atom/X in urange(consume_range,src,1))
if(isturf(X) || ismovableatom(X))
if(isturf(X) || ismovable(X))
consume(X)
// if(defer_powernet_rebuild != 2)
// defer_powernet_rebuild = 0