various mergefixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-22 21:37:42 +10:00
parent e645d78f11
commit 283ae84dad
5 changed files with 7 additions and 816 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ zone/proc
M << "Pressure: [air.return_pressure()]"
M << ""
M << "Space Tiles: [length(unsimulated_tiles)]"
M << "Movable Objects: [length(movable_objects)]"
//M << "Movable Objects: [length(movable_objects)]" //skytodo
M << "<u>Connections: [length(connections)]</u>"
for(var/connection/C in connections)