Configurable gas sensors, tank monitors, AACs. Cleaned up multitool API.

This commit is contained in:
Rob Nelson
2014-06-10 22:23:18 -07:00
parent 13b4828e48
commit 1b356c7dfd
14 changed files with 176 additions and 316 deletions

View File

@@ -157,33 +157,6 @@
<li>[format_tag("ID Tag","id_tag","set_id")]</a></li>
</ul>
"}
Topic(href, href_list)
if(..())
return
if(!issilicon(usr))
if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
return
if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id_tag) as null|text),1,MAX_MESSAGE_LEN)
if(newid)
id_tag = newid
initialize()
if("set_freq" in href_list)
var/newfreq=frequency
if(href_list["set_freq"]!="-1")
newfreq=text2num(href_list["set_freq"])
else
newfreq = input(usr, "Specify a new frequency (GHz). Decimals assigned automatically.", src, frequency) as null|num
if(newfreq)
if(findtext(num2text(newfreq), "."))
newfreq *= 10 // shift the decimal one place
if(newfreq < 10000)
frequency = newfreq
initialize()
update_multitool_menu(usr)
attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
if(istype(W, /obj/item/device/multitool))

View File

@@ -360,36 +360,4 @@
/obj/machinery/atmospherics/unary/vent_pump/Destroy()
areaMaster.air_vent_info.Remove(id_tag)
areaMaster.air_vent_names.Remove(id_tag)
..()
/obj/machinery/atmospherics/unary/vent_pump/Topic(href, href_list)
if(..())
return
if(!issilicon(usr))
if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
return
var/obj/item/device/multitool/P = get_multitool(usr)
if(!P || !istype(P))
return
if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id_tag) as null|text),1,MAX_MESSAGE_LEN)
if(newid)
id_tag = newid
initialize()
if("set_freq" in href_list)
var/newfreq=frequency
if(href_list["set_freq"]!="-1")
newfreq=text2num(href_list["set_freq"])
else
newfreq = input(usr, "Specify a new frequency (GHz). Decimals assigned automatically.", src, network) as null|num
if(newfreq)
if(findtext(num2text(newfreq), "."))
newfreq *= 10 // shift the decimal one place
if(newfreq < 10000)
frequency = newfreq
initialize()
update_multitool_menu(usr)
..()

View File

@@ -311,38 +311,6 @@
</ul>
"}
/obj/machinery/atmospherics/unary/vent_scrubber/Topic(href, href_list)
if(..())
return
if(!issilicon(usr))
if(!istype(usr.get_active_hand(), /obj/item/device/multitool))
return
var/obj/item/device/multitool/P = get_multitool(usr)
if(!P || !istype(P))
return
if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id_tag) as null|text),1,MAX_MESSAGE_LEN)
if(newid)
id_tag = newid
initialize()
if("set_freq" in href_list)
var/newfreq=frequency
if(href_list["set_freq"]!="-1")
newfreq=text2num(href_list["set_freq"])
else
newfreq = input(usr, "Specify a new frequency (GHz). Decimals assigned automatically.", src, network) as null|num
if(newfreq)
if(findtext(num2text(newfreq), "."))
newfreq *= 10 // shift the decimal one place
if(newfreq < 10000)
frequency = newfreq
initialize()
update_multitool_menu(usr)
/obj/machinery/atmospherics/unary/vent_scrubber/Destroy()
areaMaster.air_scrub_info.Remove(id_tag)
areaMaster.air_scrub_names.Remove(id_tag)