diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index e7df4198273..6f960887af3 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -84,12 +84,14 @@ dat += "
Medical Robots:" var/bdat = null for(var/obj/machinery/bot/medbot/M in world) + if(M.z != src.z) continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) - bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" - if((!isnull(M.reagent_glass)) && M.use_beaker) - bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]
" - else - bdat += "Using Internal Synthesizer.
" + if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up + bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" + if((!isnull(M.reagent_glass)) && M.use_beaker) + bdat += "Reservoir: \[[M.reagent_glass.reagents.total_volume]/[M.reagent_glass.reagents.maximum_volume]\]
" + else + bdat += "Using Internal Synthesizer.
" if(!bdat) dat += "
None detected
" diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index f3614222a69..75767d2b4bc 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -495,7 +495,7 @@ Code: else for(var/obj/machinery/bot/mulebot/B in QC.botlist) - menu += "[B] at [B.loc.loc]
" + menu += "[B] at [get_area(B)]
" menu += "
Scan for active bots
" diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 882579164f0..8a4f1159516 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -356,7 +356,7 @@ var/list/intents = list("help","disarm","grab","hurt") set name = "a-intent" set hidden = 1 - if(ishuman(src) || istype(src,/mob/living/carbon/alien/humanoid)) + if(ishuman(src) || isalienadult(src) || isbrain(src)) switch(input) if("help","disarm","grab","hurt") a_intent = input