TG: AI can now ctrl-click APCs to turn them off.

Purge module no longer gives robocop laws.
Revision: r3524
Author: 	 VivianFoxfoot
This commit is contained in:
Erthilo
2012-05-06 19:14:59 +01:00
parent 65f1bcdcd4
commit 6e1bc2b0fb
3 changed files with 16 additions and 4 deletions
+10 -1
View File
@@ -1058,9 +1058,11 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
else
var/nhref = "src=\ref[src];aiDisable=5"
src.Topic(nhref, params2list(nhref), src, 1)
return
/atom/proc/AICtrlClick() // Bolts doors.
/atom/proc/AICtrlClick() // Bolts doors, turns off APCs.
if(istype(src , /obj/machinery/door/airlock))
if(src:locked)
var/nhref = "src=\ref[src];aiEnable=4"
@@ -1068,6 +1070,13 @@ var/using_new_click_proc = 0 //TODO ERRORAGE (This is temporary, while the DblCl
else
var/nhref = "src=\ref[src];aiDisable=4"
src.Topic(nhref, params2list(nhref), src, 1)
else if (istype(src , /obj/machinery/power/apc/))
var/nhref = "src=\ref[src];breaker=1"
src.Topic(nhref, params2list(nhref), 0)
return
/*
@@ -431,7 +431,7 @@ AI MODULES
origin_tech = "programming=4"
/obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
/obj/item/weapon/aiModule/robocop/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
target.clear_inherent_laws()
target.add_inherent_law("Serve the public trust.")
+5 -2
View File
@@ -789,7 +789,7 @@
return 0
return 1
/obj/machinery/power/apc/Topic(href, href_list)
/obj/machinery/power/apc/Topic(href, href_list, var/usingUI = 1)
if (!can_use(usr))
return
src.add_fingerprint(usr)
@@ -822,6 +822,7 @@
if (ticker.mode.config_tag == "malfunction")
if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
operating ? ticker.mode:apcs++ : ticker.mode:apcs--
src.update()
updateicon()
@@ -897,7 +898,9 @@
else if (href_list["deoccupyapc"])
malfvacate()
src.updateDialog()
if(usingUI)
src.updateDialog()
return
/obj/machinery/power/apc/proc/malfoccupy(var/mob/living/silicon/ai/malf)