Merge pull request #1119 from SkyMarshal/BugFixes

Bug fixes
This commit is contained in:
Erthilo
2012-05-20 14:42:30 -07:00
20 changed files with 89 additions and 49 deletions
+2
View File
@@ -1,3 +1,5 @@
//UNTICKED DUE TO BUGGY SHIT
/obj/effect/biomass
icon = 'biomass.dmi'
icon_state = "stage1"
+1 -1
View File
@@ -466,7 +466,7 @@ Code:
else
for(var/obj/machinery/bot/mulebot/B in QC.botlist)
menu += "<A href='byond://?src=\ref[QC];op=control;bot=\ref[B]'>[B] at [B.loc.loc]</A><BR>"
menu += "<A href='byond://?src=\ref[QC];op=control;bot=\ref[B]'>[B] at [get_area(B)]</A><BR>"
menu += "<BR><A href='byond://?src=\ref[QC];op=scanbots'><img src=pda_scanner.png> Scan for active bots</A><BR>"