From 154f8229cdabb6ad057337e3faaf1653361b249c Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Mon, 5 Nov 2012 08:09:32 +0000 Subject: [PATCH] -A bot's setting can be tweaked by AIs now. -Updated the changelog with a feature I forgot to mention. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5007 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/bots/bots.dm | 5 +---- code/game/machinery/bots/cleanbot.dm | 3 +-- code/game/machinery/bots/ed209bot.dm | 2 +- code/game/machinery/bots/floorbot.dm | 2 +- code/game/machinery/bots/medbot.dm | 10 +++++----- code/game/machinery/bots/secbot.dm | 2 +- 6 files changed, 10 insertions(+), 14 deletions(-) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index c97fcb507aa..af1683acfe5 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -149,10 +149,7 @@ /obj/machinery/bot/attack_ai(mob/user as mob) - if (src.on) - turn_off() - else - turn_on() + src.attack_hand(user) /******************************************************************/ // Navigation procs diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index ccd474cd089..751611effb3 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -87,7 +87,7 @@ Status: []
Behaviour controls are [src.locked ? "locked" : "unlocked"]
Maintenance panel panel is [src.open ? "opened" : "closed"]"}, text("[src.on ? "On" : "Off"]")) - if(!src.locked) + if(!src.locked || issilicon(user)) dat += text({"
Cleans Blood: []
"}, text("[src.blood ? "Yes" : "No"]")) dat += text({"
Patrol station: []
"}, text("[src.should_patrol ? "Yes" : "No"]")) // dat += text({"
Beacon frequency: []
"}, text("[src.beacon_freq]")) @@ -170,7 +170,6 @@ text("[src.oddbutton ? "Yes" : "No" visible_message("[src] makes an excited beeping booping sound!") if(src.screwloose && prob(5)) - visible_message("[src] leaks a drop of water. How strange.") if(istype(loc,/turf/simulated)) var/turf/simulated/T = src.loc if(T.wet < 1) diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 00d9bcc0d79..2f239522643 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -124,7 +124,7 @@ Maintenance panel panel is [src.open ? "opened" : "closed"]"}, "[src.on ? "On" : "Off"]" ) - if(!src.locked) + if(!src.locked || issilicon(user)) if(!lasercolor) dat += text({"
Check for Weapon Authorization: []
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index c05475660eb..15886be92d6 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -82,7 +82,7 @@ dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]
" dat += "Tiles left: [src.amount]
" dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked) + if(!src.locked || issilicon(user)) dat += "Improves floors: [src.improvefloors ? "Yes" : "No"]
" dat += "Finds tiles: [src.eattiles ? "Yes" : "No"]
" dat += "Make singles pieces of metal into tiles when empty: [src.maketiles ? "Yes" : "No"]
" diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 39485787559..304c7abf3fa 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -108,7 +108,7 @@ else dat += "None Loaded" dat += "
Behaviour controls are [src.locked ? "locked" : "unlocked"]
" - if(!src.locked) + if(!src.locked || issilicon(user)) dat += "Healing Threshold: " dat += "-- " dat += "- " @@ -143,7 +143,7 @@ else turn_on() - else if((href_list["adj_threshold"]) && (!src.locked)) + else if((href_list["adj_threshold"]) && (!src.locked || issilicon(usr))) var/adjust_num = text2num(href_list["adj_threshold"]) src.heal_threshold += adjust_num if(src.heal_threshold < 5) @@ -151,7 +151,7 @@ if(src.heal_threshold > 75) src.heal_threshold = 75 - else if((href_list["adj_inject"]) && (!src.locked)) + else if((href_list["adj_inject"]) && (!src.locked || issilicon(usr))) var/adjust_num = text2num(href_list["adj_inject"]) src.injection_amount += adjust_num if(src.injection_amount < 5) @@ -159,7 +159,7 @@ if(src.injection_amount > 15) src.injection_amount = 15 - else if((href_list["use_beaker"]) && (!src.locked)) + else if((href_list["use_beaker"]) && (!src.locked || issilicon(usr))) src.use_beaker = !src.use_beaker else if (href_list["eject"] && (!isnull(src.reagent_glass))) @@ -169,7 +169,7 @@ else usr << "You cannot eject the beaker because the panel is locked." - else if ((href_list["togglevoice"]) && (!src.locked)) + else if ((href_list["togglevoice"]) && (!src.locked || issilicon(usr))) src.shut_up = !src.shut_up src.updateUsrDialog() diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 3f0b99d227b..d6ef62b60b6 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -113,7 +113,7 @@ Maintenance panel panel is [src.open ? "opened" : "closed"]"}, "[src.on ? "On" : "Off"]" ) - if(!src.locked) + if(!src.locked || issilicon(user)) dat += text({"
Check for Weapon Authorization: []
Check Security Records: []