cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 22:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Erthilo
2012-06-08 20:19:27 +01:00
parent 3f40c0ad60 0cc2d20a33
commit 54ec9bdd84
49 changed files with 7520 additions and 7304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/power.dm
-2
View File
@@ -82,7 +82,6 @@
for(var/L = 1 to netcount)
var/datum/powernet/PN = new()
//PN.tag = "powernet #[L]"
powernets += PN
PN.number = L
@@ -287,7 +286,6 @@
// not looped, so make a new powernet
var/datum/powernet/PN = new()
//PN.tag = "powernet #[L]"
powernets += PN
PN.number = powernets.len