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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	code/modules/events/event_manager.dm
	code/modules/events/infestation.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2013-02-22 23:59:38 +10:00
parent 8ee5672159 b3a820aa0d
commit 306cffb46c
10 changed files with 1553 additions and 1564 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/power.dm
+3
View File
@@ -186,6 +186,9 @@
M.powernet = PN
P = M.get_connections()
else
return
if(P.len == 0) return
O = P[1]