Standardize radio ID tags (id -> id_tag). Fixes multitool runtimes.

This commit is contained in:
Rob Nelson
2014-02-04 03:40:49 -08:00
parent b373fa93db
commit 193fe36c99
32 changed files with 475 additions and 477 deletions

View File

@@ -58,7 +58,7 @@
return {" return {"
<ul> <ul>
<li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=[1439]">Reset</a>)</li> <li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=[1439]">Reset</a>)</li>
<li><b>ID Tag:</b> <a href="?src=\ref[src];set_id=1">[id]</a></li> <li><b>ID Tag:</b> <a href="?src=\ref[src];set_id=1">[id_tag]</a></li>
</ul> </ul>
"} "}
Topic(href, href_list) Topic(href, href_list)
@@ -70,9 +70,9 @@
return return
if("set_id" in href_list) if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) 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) if(newid)
id = newid id_tag = newid
initialize() initialize()
if("set_freq" in href_list) if("set_freq" in href_list)
var/newfreq=frequency var/newfreq=frequency
@@ -157,7 +157,7 @@
signal.source = src signal.source = src
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "ADVP", "device" = "ADVP",
"power" = on, "power" = on,
"direction" = pump_direction?("release"):("siphon"), "direction" = pump_direction?("release"):("siphon"),
@@ -172,7 +172,7 @@
return 1 return 1
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() initialize()
@@ -182,7 +182,7 @@
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0 return 0
var/handled=0 var/handled=0

View File

@@ -11,7 +11,7 @@ obj/machinery/atmospherics/binary/passive_gate
var/target_pressure = ONE_ATMOSPHERE var/target_pressure = ONE_ATMOSPHERE
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
update_icon() update_icon()
@@ -77,7 +77,7 @@ obj/machinery/atmospherics/binary/passive_gate
signal.source = src signal.source = src
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "AGP", "device" = "AGP",
"power" = on, "power" = on,
"target_output" = target_pressure, "target_output" = target_pressure,
@@ -103,7 +103,7 @@ obj/machinery/atmospherics/binary/passive_gate
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0 return 0
if("power" in signal.data) if("power" in signal.data)

View File

@@ -23,7 +23,7 @@ obj/machinery/atmospherics/binary/pump
var/target_pressure = ONE_ATMOSPHERE var/target_pressure = ONE_ATMOSPHERE
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
highcap highcap
@@ -98,7 +98,7 @@ obj/machinery/atmospherics/binary/pump
signal.source = src signal.source = src
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "AGP", "device" = "AGP",
"power" = on, "power" = on,
"target_output" = target_pressure, "target_output" = target_pressure,
@@ -124,7 +124,7 @@ obj/machinery/atmospherics/binary/pump
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0 return 0
if("power" in signal.data) if("power" in signal.data)

View File

@@ -23,7 +23,7 @@ obj/machinery/atmospherics/binary/volume_pump
var/transfer_rate = 200 var/transfer_rate = 200
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
on on
@@ -89,7 +89,7 @@ obj/machinery/atmospherics/binary/volume_pump
signal.source = src signal.source = src
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "APV", "device" = "APV",
"power" = on, "power" = on,
"transfer_rate" = transfer_rate, "transfer_rate" = transfer_rate,
@@ -116,7 +116,7 @@ obj/machinery/atmospherics/binary/volume_pump
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0 return 0
if("power" in signal.data) if("power" in signal.data)

View File

@@ -294,7 +294,7 @@ obj/machinery/atmospherics/tvalve
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() initialize()
@@ -303,7 +303,7 @@ obj/machinery/atmospherics/tvalve
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id)) if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
return 0 return 0
switch(signal.data["command"]) switch(signal.data["command"])
@@ -414,7 +414,7 @@ obj/machinery/atmospherics/tvalve/mirrored
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() initialize()
@@ -423,7 +423,7 @@ obj/machinery/atmospherics/tvalve/mirrored
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id)) if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
return 0 return 0
switch(signal.data["command"]) switch(signal.data["command"])

View File

@@ -13,7 +13,7 @@
var/max_rate=50 var/max_rate=50
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
level = 1 level = 1
@@ -90,7 +90,7 @@
signal.source = src signal.source = src
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "AO", "device" = "AO",
"power" = on, "power" = on,
"volume_rate" = volume_rate, "volume_rate" = volume_rate,
@@ -108,7 +108,7 @@
set_frequency(frequency) set_frequency(frequency)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command")) if(!signal.data["tag"] || (signal.data["tag"] != id_tag) || (signal.data["sigtype"]!="command"))
return 0 return 0
if("power" in signal.data) if("power" in signal.data)
@@ -166,9 +166,9 @@
return return
if("set_id" in href_list) if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) 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) if(newid)
id = newid id_tag = newid
initialize() initialize()
if("set_freq" in href_list) if("set_freq" in href_list)
var/newfreq=frequency var/newfreq=frequency

View File

@@ -253,7 +253,7 @@ obj/machinery/atmospherics/valve
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() initialize()
@@ -280,9 +280,9 @@ obj/machinery/atmospherics/valve
return return
if("set_id" in href_list) if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) 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) if(newid)
id = newid id_tag = newid
initialize() initialize()
if("set_freq" in href_list) if("set_freq" in href_list)
var/newfreq=frequency var/newfreq=frequency
@@ -300,7 +300,7 @@ obj/machinery/atmospherics/valve
update_multitool_menu(usr) update_multitool_menu(usr)
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id)) if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
return 0 return 0
switch(signal.data["command"]) switch(signal.data["command"])

View File

@@ -661,7 +661,7 @@ obj/machinery/atmospherics/mains_pipe/valve
radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA)
var/frequency = 0 var/frequency = 0
var/id = null var/id_tag = null
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
initialize() initialize()
@@ -685,7 +685,7 @@ obj/machinery/atmospherics/mains_pipe/valve
icon_state = "[hide?"h":""]dvalve[open]" icon_state = "[hide?"h":""]dvalve[open]"
receive_signal(datum/signal/signal) receive_signal(datum/signal/signal)
if(!signal.data["tag"] || (signal.data["tag"] != id)) if(!signal.data["tag"] || (signal.data["tag"] != id_tag))
return 0 return 0
switch(signal.data["command"]) switch(signal.data["command"])

View File

@@ -7,7 +7,7 @@
anchored = 1.0 anchored = 1.0
power_channel = ENVIRON power_channel = ENVIRON
var/frequency = 0 var/frequency = 0
var/id var/id_tag
use_power = 1 use_power = 1
idle_power_usage = 2 idle_power_usage = 2
active_power_usage = 4 active_power_usage = 4
@@ -67,7 +67,7 @@
signal.source = src signal.source = src
signal.transmission_method = 1 signal.transmission_method = 1
signal.data = list( signal.data = list(
"tag" = id, "tag" = id_tag,
"device" = "AM", "device" = "AM",
"pressure" = round(env_pressure), "pressure" = round(env_pressure),
"sigtype" = "status" "sigtype" = "status"

View File

@@ -3,7 +3,7 @@
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt" icon_state = "launcherbtt"
desc = "A remote control switch for a mass driver." desc = "A remote control switch for a mass driver."
var/id = null var/id_tag = null
var/active = 0 var/active = 0
anchored = 1.0 anchored = 1.0
use_power = 1 use_power = 1
@@ -18,7 +18,7 @@
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt" icon_state = "launcherbtt"
desc = "A remote control switch for a mounted igniter." desc = "A remote control switch for a mounted igniter."
var/id = null var/id_tag = null
var/active = 0 var/active = 0
anchored = 1.0 anchored = 1.0
use_power = 1 use_power = 1
@@ -33,7 +33,7 @@
desc = "A remote control switch for a mounted flasher." desc = "A remote control switch for a mounted flasher."
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "launcherbtt" icon_state = "launcherbtt"
var/id = null var/id_tag = null
var/active = 0 var/active = 0
anchored = 1.0 anchored = 1.0
use_power = 1 use_power = 1

View File

@@ -21,7 +21,7 @@
origin_tech = "programming=2" origin_tech = "programming=2"
g_amt=2000 // Recycle glass g_amt=2000 // Recycle glass
var/id = null var/id_tag = null
var/frequency = null var/frequency = null
var/build_path = null var/build_path = null
var/board_type = "computer" var/board_type = "computer"
@@ -362,7 +362,7 @@
user << "\blue You connect the monitor." user << "\blue You connect the monitor."
var/B = new src.circuit.build_path ( src.loc ) var/B = new src.circuit.build_path ( src.loc )
if(circuit.powernet) B:powernet = circuit.powernet if(circuit.powernet) B:powernet = circuit.powernet
if(circuit.id) B:id = circuit.id if(circuit.id_tag) B:id_tag = circuit.id_tag
if(circuit.records) B:records = circuit.records if(circuit.records) B:records = circuit.records
if(circuit.frequency) B:frequency = circuit.frequency if(circuit.frequency) B:frequency = circuit.frequency
if(istype(circuit,/obj/item/weapon/circuitboard/supplycomp)) if(istype(circuit,/obj/item/weapon/circuitboard/supplycomp))

View File

@@ -4,7 +4,7 @@
name = "Pod Launch Control" name = "Pod Launch Control"
desc = "A controll for launching pods. Some people prefer firing Mechas." desc = "A controll for launching pods. Some people prefer firing Mechas."
icon_state = "computer_generic" icon_state = "computer_generic"
var/id = 1.0 var/id_tag = 1.0
var/obj/machinery/mass_driver/connected = null var/obj/machinery/mass_driver/connected = null
var/timing = 0.0 var/timing = 0.0
var/time = 30.0 var/time = 30.0
@@ -15,7 +15,7 @@
..() ..()
spawn( 5 ) spawn( 5 )
for(var/obj/machinery/mass_driver/M in world) for(var/obj/machinery/mass_driver/M in world)
if(M.id == id) if(M.id_tag == id_tag)
connected = M connected = M
else else
return return
@@ -31,19 +31,19 @@
return return
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if(M.id == id) if(M.id_tag == id_tag)
M.open() M.open()
return return
sleep(20) sleep(20)
for(var/obj/machinery/mass_driver/M in world) for(var/obj/machinery/mass_driver/M in world)
if(M.id == id) if(M.id_tag == id_tag)
M.power = connected.power M.power = connected.power
M.drive() M.drive()
sleep(50) sleep(50)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if(M.id == id) if(M.id_tag == id_tag)
M.close() M.close()
return return
return return
@@ -71,7 +71,7 @@
for (var/obj/C in src) for (var/obj/C in src)
C.loc = loc C.loc = loc
M.id = id M.id_tag = id_tag
A.circuit = M A.circuit = M
A.state = 3 A.state = 3
A.icon_state = "3" A.icon_state = "3"
@@ -94,7 +94,7 @@
for (var/obj/C in src) for (var/obj/C in src)
C.loc = loc C.loc = loc
M.id = id M.id_tag = id_tag
A.circuit = M A.circuit = M
A.state = 4 A.state = 4
A.icon_state = "4" A.icon_state = "4"
@@ -180,7 +180,7 @@
time = min(max(round(time), 0), 120) time = min(max(round(time), 0), 120)
if(href_list["door"]) if(href_list["door"])
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if(M.id == id) if(M.id_tag == id_tag)
if(M.density) if(M.density)
M.open() M.open()
else else

View File

@@ -135,7 +135,7 @@ var/specops_shuttle_timeleft = 0
//Begin Marauder launchpad. //Begin Marauder launchpad.
spawn(0)//So it parallel processes it. spawn(0)//So it parallel processes it.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/poddoor/M in special_ops)
switch(M.id) switch(M.id_tag)
if("ASSAULT0") if("ASSAULT0")
spawn(10)//1 second delay between each. spawn(10)//1 second delay between each.
M.open() M.open()
@@ -166,7 +166,7 @@ var/specops_shuttle_timeleft = 0
sleep(10) sleep(10)
for(var/obj/machinery/mass_driver/M in special_ops) for(var/obj/machinery/mass_driver/M in special_ops)
switch(M.id) switch(M.id_tag)
if("ASSAULT0") if("ASSAULT0")
spawn(10) spawn(10)
M.drive() M.drive()
@@ -183,7 +183,7 @@ var/specops_shuttle_timeleft = 0
sleep(50)//Doors remain open for 5 seconds. sleep(50)//Doors remain open for 5 seconds.
for(var/obj/machinery/door/poddoor/M in special_ops) for(var/obj/machinery/door/poddoor/M in special_ops)
switch(M.id)//Doors close at the same time. switch(M.id_tag)//Doors close at the same time.
if("ASSAULT0") if("ASSAULT0")
spawn(0) spawn(0)
M.close() M.close()

View File

@@ -5,7 +5,7 @@
icon_state = "doorctrl0" icon_state = "doorctrl0"
desc = "A remote control-switch for a door." desc = "A remote control-switch for a door."
power_channel = ENVIRON power_channel = ENVIRON
var/id = null var/id_tag = null
var/range = 10 var/range = 10
var/normaldoorcontrol = 0 var/normaldoorcontrol = 0
var/desiredstate = 0 // Zero is closed, 1 is open. var/desiredstate = 0 // Zero is closed, 1 is open.
@@ -83,7 +83,7 @@
if(normaldoorcontrol) if(normaldoorcontrol)
for(var/obj/machinery/door/airlock/D in range(range)) for(var/obj/machinery/door/airlock/D in range(range))
if(D.id_tag == src.id) if(D.id_tag == src.id_tag)
if(desiredstate == 1) if(desiredstate == 1)
if(specialfunctions & OPEN) if(specialfunctions & OPEN)
if (D.density) if (D.density)
@@ -119,7 +119,7 @@
else else
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
if (M.density) if (M.density)
spawn( 0 ) spawn( 0 )
M.open() M.open()
@@ -169,7 +169,7 @@
icon_state = "launcheract" icon_state = "launcheract"
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
spawn( 0 ) spawn( 0 )
M.open() M.open()
return return
@@ -177,13 +177,13 @@
sleep(20) sleep(20)
for(var/obj/machinery/mass_driver/M in world) for(var/obj/machinery/mass_driver/M in world)
if(M.id == src.id) if(M.id_tag == src.id_tag)
M.drive() M.drive()
sleep(50) sleep(50)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
spawn( 0 ) spawn( 0 )
M.close() M.close()
return return

View File

@@ -16,7 +16,7 @@
req_access = list(access_brig) req_access = list(access_brig)
anchored = 1.0 // can't pick it up anchored = 1.0 // can't pick it up
density = 0 // can walk through it. density = 0 // can walk through it.
var/id = null // id of door it controls. var/id_tag = null // id of door it controls.
var/releasetime = 0 // when world.time reaches it - release the prisoneer var/releasetime = 0 // when world.time reaches it - release the prisoneer
var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing var/timing = 1 // boolean, true/1 timer is on, false/0 means it's not timing
var/picture_state // icon_state of alert picture, if not displaying text/numbers var/picture_state // icon_state of alert picture, if not displaying text/numbers
@@ -31,15 +31,15 @@
spawn(20) spawn(20)
for(var/obj/machinery/door/window/brigdoor/M in world) for(var/obj/machinery/door/window/brigdoor/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
targets += M targets += M
for(var/obj/machinery/flasher/F in world) for(var/obj/machinery/flasher/F in world)
if(F.id == src.id) if(F.id_tag == src.id_tag)
targets += F targets += F
for(var/obj/structure/closet/secure_closet/brig/C in world) for(var/obj/structure/closet/secure_closet/brig/C in world)
if(C.id == src.id) if(C.id_tag == src.id_tag)
targets += C targets += C
if(targets.len==0) if(targets.len==0)
@@ -139,7 +139,7 @@
// AUTOFIXED BY fix_string_idiocy.py // AUTOFIXED BY fix_string_idiocy.py
// C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\doors\brigdoors.dm:138: dat += "<HR>Timer System:</hr>" // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\doors\brigdoors.dm:138: dat += "<HR>Timer System:</hr>"
dat += {"<HR>Timer System:</hr> dat += {"<HR>Timer System:</hr>
<b>Door [src.id] controls</b><br/>"} <b>Door [src.id_tag] controls</b><br/>"}
// END AUTOFIX // END AUTOFIX
if (src.timing) if (src.timing)
dat += "<a href='?src=\ref[src];timing=0'>Stop Timer and open door</a><br/>" dat += "<a href='?src=\ref[src];timing=0'>Stop Timer and open door</a><br/>"
@@ -218,7 +218,7 @@
set_picture("ai_bsod") set_picture("ai_bsod")
return return
if(src.timing) if(src.timing)
var/disp1 = uppertext(id) var/disp1 = uppertext(id_tag)
var/timeleft = timeleft() var/timeleft = timeleft()
var/disp2 = "[add_zero(num2text((timeleft / 60) % 60),2)]~[add_zero(num2text(timeleft % 60), 2)]" var/disp2 = "[add_zero(num2text((timeleft / 60) % 60),2)]~[add_zero(num2text(timeleft % 60), 2)]"
spawn( 5 ) spawn( 5 )
@@ -269,41 +269,41 @@
/obj/machinery/door_timer/cell_1 /obj/machinery/door_timer/cell_1
name = "Cell 1" name = "Cell 1"
id = "Cell 1" id_tag = "Cell 1"
dir = 2 dir = 2
pixel_y = -32 pixel_y = -32
/obj/machinery/door_timer/cell_2 /obj/machinery/door_timer/cell_2
name = "Cell 2" name = "Cell 2"
id = "Cell 2" id_tag = "Cell 2"
dir = 2 dir = 2
pixel_y = -32 pixel_y = -32
/obj/machinery/door_timer/cell_3 /obj/machinery/door_timer/cell_3
name = "Cell 3" name = "Cell 3"
id = "Cell 3" id_tag = "Cell 3"
dir = 2 dir = 2
pixel_y = -32 pixel_y = -32
/obj/machinery/door_timer/cell_4 /obj/machinery/door_timer/cell_4
name = "Cell 4" name = "Cell 4"
id = "Cell 4" id_tag = "Cell 4"
dir = 2 dir = 2
pixel_y = -32 pixel_y = -32
/obj/machinery/door_timer/cell_5 /obj/machinery/door_timer/cell_5
name = "Cell 5" name = "Cell 5"
id = "Cell 5" id_tag = "Cell 5"
dir = 2 dir = 2
pixel_y = -32 pixel_y = -32
/obj/machinery/door_timer/cell_6 /obj/machinery/door_timer/cell_6
name = "Cell 6" name = "Cell 6"
id = "Cell 6" id_tag = "Cell 6"
dir = 4 dir = 4
pixel_x = 32 pixel_x = 32

View File

@@ -3,7 +3,7 @@
desc = "Why it no open!!!" desc = "Why it no open!!!"
icon = 'icons/obj/doors/rapid_pdoor.dmi' icon = 'icons/obj/doors/rapid_pdoor.dmi'
icon_state = "pdoor1" icon_state = "pdoor1"
var/id = 1.0 var/id_tag = 1.0
explosion_resistance = 25 explosion_resistance = 25
/obj/machinery/door/poddoor/Bumped(atom/AM) /obj/machinery/door/poddoor/Bumped(atom/AM)

View File

@@ -240,7 +240,7 @@
icon_state = "leftsecure" icon_state = "leftsecure"
base_state = "leftsecure" base_state = "leftsecure"
req_access = list(access_security) req_access = list(access_security)
var/id = null var/id_tag = null
health = 300.0 //Stronger doors for prison (regular window door health is 200) health = 300.0 //Stronger doors for prison (regular window door health is 200)

View File

@@ -5,7 +5,7 @@
desc = "A wall-mounted flashbulb device." desc = "A wall-mounted flashbulb device."
icon = 'icons/obj/stationobjs.dmi' icon = 'icons/obj/stationobjs.dmi'
icon_state = "mflash1" icon_state = "mflash1"
var/id = null var/id_tag = null
var/range = 2 //this is roughly the size of brig cell var/range = 2 //this is roughly the size of brig cell
var/disable = 0 var/disable = 0
var/last_flash = 0 //Don't want it getting spammed like regular flashes var/last_flash = 0 //Don't want it getting spammed like regular flashes
@@ -146,7 +146,7 @@
icon_state = "launcheract" icon_state = "launcheract"
for(var/obj/machinery/flasher/M in world) for(var/obj/machinery/flasher/M in world)
if(M.id == src.id) if(M.id_tag == src.id_tag)
spawn() spawn()
M.flash() M.flash()

View File

@@ -9,7 +9,7 @@
ghost_read = 0 // Deactivate ghost touching. ghost_read = 0 // Deactivate ghost touching.
ghost_write = 0 ghost_write = 0
var/lit = 0 var/lit = 0
var/id = null var/id_tag = null
var/on_icon = "sign_on" var/on_icon = "sign_on"
proc/toggle() proc/toggle()
@@ -40,7 +40,7 @@
icon = 'icons/obj/power.dmi' icon = 'icons/obj/power.dmi'
icon_state = "light1" icon_state = "light1"
desc = "A remote control switch for holosign." desc = "A remote control switch for holosign."
var/id = null var/id_tag = null
var/active = 0 var/active = 0
anchored = 1.0 anchored = 1.0
use_power = 1 use_power = 1
@@ -74,7 +74,7 @@ obj/machinery/holosign_switch/attack_paw(mob/user as mob)
icon_state = "light0" icon_state = "light0"
for(var/obj/machinery/holosign/M in world) for(var/obj/machinery/holosign/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
spawn( 0 ) spawn( 0 )
M.toggle() M.toggle()
return return

View File

@@ -3,7 +3,7 @@
desc = "It's useful for igniting plasma." desc = "It's useful for igniting plasma."
icon = 'icons/obj/stationobjs.dmi' icon = 'icons/obj/stationobjs.dmi'
icon_state = "igniter1" icon_state = "igniter1"
var/id = null var/id_tag = null
var/on = 1.0 var/on = 1.0
var/obj/item/device/assembly_holder/assembly=null var/obj/item/device/assembly_holder/assembly=null
anchored = 1.0 anchored = 1.0
@@ -82,7 +82,7 @@
desc = "A wall-mounted ignition device." desc = "A wall-mounted ignition device."
icon = 'icons/obj/stationobjs.dmi' icon = 'icons/obj/stationobjs.dmi'
icon_state = "migniter" icon_state = "migniter"
var/id = null var/id_tag = null
var/disable = 0 var/disable = 0
var/last_spark = 0 var/last_spark = 0
var/base_state = "migniter" var/base_state = "migniter"
@@ -175,12 +175,12 @@
icon_state = "launcheract" icon_state = "launcheract"
for(var/obj/machinery/sparker/M in world) for(var/obj/machinery/sparker/M in world)
if (M.id == src.id) if (M.id_tag == src.id_tag)
spawn( 0 ) spawn( 0 )
M.ignite() M.ignite()
for(var/obj/machinery/igniter/M in world) for(var/obj/machinery/igniter/M in world)
if(M.id == src.id) if(M.id_tag == src.id_tag)
use_power(50) use_power(50)
M.on = !( M.on ) M.on = !( M.on )
M.icon_state = text("igniter[]", M.on) M.icon_state = text("igniter[]", M.on)

View File

@@ -248,7 +248,7 @@ Class Procs:
update_mt_menu=1 update_mt_menu=1
if("flush" in href_list) if("flush" in href_list)
usr << "\blue A green light flashes, and the device disappears in the multitool buffer." usr << "\blue A green light flashes, and the device disappears from the multitool buffer."
P.buffer = null P.buffer = null
update_mt_menu=1 update_mt_menu=1

View File

@@ -12,7 +12,7 @@
var/power = 1.0 var/power = 1.0
var/code = 1.0 var/code = 1.0
var/id = 1.0 var/id_tag = 1.0
var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess.

View File

@@ -734,7 +734,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if("Toggle Door") if("Toggle Door")
if(cartridge && cartridge.access_remote_door) if(cartridge && cartridge.access_remote_door)
for(var/obj/machinery/door/poddoor/M in world) for(var/obj/machinery/door/poddoor/M in world)
if(M.id == cartridge.remote_door_id) if(M.id_tag == cartridge.remote_door_id)
if(M.density) if(M.density)
M.open() M.open()
else else

View File

@@ -22,7 +22,6 @@
/obj/item/proc/is_used_on(obj/O, mob/user) /obj/item/proc/is_used_on(obj/O, mob/user)
/obj/recycle(var/obj/machinery/mineral/processing_unit/recycle/rec) /obj/recycle(var/obj/machinery/mineral/processing_unit/recycle/rec)
if (src.m_amt == 0 && src.g_amt == 0) if (src.m_amt == 0 && src.g_amt == 0)
return 0 return 0

View File

@@ -283,7 +283,7 @@
name = "Brig Locker" name = "Brig Locker"
req_access = list(access_brig) req_access = list(access_brig)
anchored = 1 anchored = 1
var/id = null var/id_tag = null
New() New()
new /obj/item/clothing/under/color/orange( src ) new /obj/item/clothing/under/color/orange( src )

View File

@@ -21,8 +21,8 @@
if(href_list["set_subject"]) if(href_list["set_subject"])
var/list/valves=list() var/list/valves=list()
for(var/obj/machinery/atmospherics/valve/digital/V in machines) for(var/obj/machinery/atmospherics/valve/digital/V in machines)
if(!isnull(V.id) && V.frequency == parent.frequency) if(!isnull(V.id_tag) && V.frequency == parent.frequency)
valves|=V.id valves|=V.id_tag
valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves
parent.updateUsrDialog() parent.updateUsrDialog()
return 1 return 1

View File

@@ -23,8 +23,8 @@
if(href_list["set_injector"]) if(href_list["set_injector"])
var/list/injector_names=list() var/list/injector_names=list()
for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines) for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines)
if(!isnull(I.id) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id injector_names|=I.id_tag
injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names
parent.updateUsrDialog() parent.updateUsrDialog()
return 1 return 1
@@ -50,8 +50,8 @@
if(href_list["set_injector"]) if(href_list["set_injector"])
var/list/injector_names=list() var/list/injector_names=list()
for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines) for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines)
if(!isnull(I.id) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id injector_names|=I.id_tag
injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names
parent.updateUsrDialog() parent.updateUsrDialog()
return 1 return 1

View File

@@ -29,8 +29,8 @@
if(!isnull(I.id_tag) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id_tag injector_names|=I.id_tag
for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines) for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines)
if(!isnull(I.id) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id injector_names|=I.id_tag
vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names
parent.updateUsrDialog() parent.updateUsrDialog()
return 1 return 1
@@ -62,8 +62,8 @@
if(!isnull(I.id_tag) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id_tag injector_names|=I.id_tag
for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines) for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines)
if(!isnull(I.id) && I.frequency == parent.frequency) if(!isnull(I.id_tag) && I.frequency == parent.frequency)
injector_names|=I.id injector_names|=I.id_tag
vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names
parent.updateUsrDialog() parent.updateUsrDialog()
return 1 return 1

View File

@@ -26,7 +26,7 @@ var/list/solars_list = list()
use_power = 0 use_power = 0
idle_power_usage = 0 idle_power_usage = 0
active_power_usage = 0 active_power_usage = 0
var/id = 0 var/id_tag = 0
var/health = 10 var/health = 10
var/obscured = 0 var/obscured = 0
var/sunfrac = 0 var/sunfrac = 0
@@ -273,7 +273,7 @@ var/list/solars_list = list()
use_power = 1 use_power = 1
idle_power_usage = 5 idle_power_usage = 5
active_power_usage = 20 active_power_usage = 20
var/id = 0 var/id_tag = 0
var/cdir = 0 var/cdir = 0
var/gen = 0 var/gen = 0
var/lastgen = 0 var/lastgen = 0

View File

@@ -35,7 +35,7 @@
density = 1 density = 1
var/obj/machinery/compressor/compressor var/obj/machinery/compressor/compressor
var/list/obj/machinery/door/poddoor/doors var/list/obj/machinery/door/poddoor/doors
var/id = 0 var/id_tag = 0
var/door_status = 0 var/door_status = 0
// the inlet stage of the gas turbine electricity generator // the inlet stage of the gas turbine electricity generator
@@ -213,11 +213,11 @@
..() ..()
spawn(5) spawn(5)
for(var/obj/machinery/compressor/C in machines) for(var/obj/machinery/compressor/C in machines)
if(id == C.comp_id) if(id_tag == C.comp_id)
compressor = C compressor = C
doors = new /list() doors = new /list()
for(var/obj/machinery/door/poddoor/P in machines) for(var/obj/machinery/door/poddoor/P in machines)
if(P.id == id) if(P.id_tag == id_tag)
doors += P doors += P
/obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob) /obj/machinery/computer/turbine_computer/attackby(I as obj, user as mob)
@@ -231,7 +231,7 @@
var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A ) var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
for (var/obj/C in src) for (var/obj/C in src)
C.loc = src.loc C.loc = src.loc
M.id = src.id M.id_tag = src.id_tag
A.circuit = M A.circuit = M
A.state = 3 A.state = 3
A.icon_state = "3" A.icon_state = "3"
@@ -243,7 +243,7 @@
var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A ) var/obj/item/weapon/circuitboard/turbine_control/M = new /obj/item/weapon/circuitboard/turbine_control( A )
for (var/obj/C in src) for (var/obj/C in src)
C.loc = src.loc C.loc = src.loc
M.id = src.id M.id_tag = src.id_tag
A.circuit = M A.circuit = M
A.state = 4 A.state = 4
A.icon_state = "4" A.icon_state = "4"

View File

@@ -17,13 +17,13 @@
var/movedir // the actual direction to move stuff in var/movedir // the actual direction to move stuff in
var/list/affecting // the list of all items that will be moved this ptick var/list/affecting // the list of all items that will be moved this ptick
var/id = "" // the control ID - must match controller ID var/id_tag = "" // the control ID - must match controller ID
var/frequency = 1367 var/frequency = 1367
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
/obj/machinery/conveyor/centcom_auto /obj/machinery/conveyor/centcom_auto
id = "round_end_belt" id_tag = "round_end_belt"
// Auto conveyour is always on unless unpowered // Auto conveyour is always on unless unpowered
@@ -60,7 +60,7 @@
/obj/machinery/conveyor/receive_signal(datum/signal/signal) /obj/machinery/conveyor/receive_signal(datum/signal/signal)
if(!signal || signal.encryption) return if(!signal || signal.encryption) return
if(id != signal.data["tag"] || !signal.data["command"]) return if(id_tag != signal.data["tag"] || !signal.data["command"]) return
switch(signal.data["command"]) switch(signal.data["command"])
if("forward") if("forward")
operating = 1 operating = 1
@@ -181,8 +181,8 @@
/obj/machinery/conveyor/multitool_menu(mob/user as mob) /obj/machinery/conveyor/multitool_menu(mob/user as mob)
//var/obj/item/device/multitool/P = get_multitool(user) //var/obj/item/device/multitool/P = get_multitool(user)
var/dis_id_tag="-----" var/dis_id_tag="-----"
if(id!=null && id!="") if(id_tag!=null && id_tag!="")
dis_id_tag=id dis_id_tag=id_tag
return {" return {"
<ul> <ul>
<li><b>Direction:</b> <li><b>Direction:</b>
@@ -205,9 +205,9 @@
return return
if("set_id" in href_list) if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) 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) if(newid)
id = newid id_tag = newid
initialize() initialize()
if("set_freq" in href_list) if("set_freq" in href_list)
@@ -228,7 +228,6 @@
dir=text2num(href_list["setdir"]) dir=text2num(href_list["setdir"])
updateConfig() updateConfig()
usr.set_machine(src)
update_multitool_menu(usr) update_multitool_menu(usr)
// attack with hand, move pulled object onto conveyor // attack with hand, move pulled object onto conveyor
@@ -271,14 +270,14 @@
/obj/machinery/conveyor/proc/set_operable(stepdir, match_id, op) /obj/machinery/conveyor/proc/set_operable(stepdir, match_id, op)
if(id != match_id) if(id_tag != match_id)
return return
operable = op operable = op
update() update()
var/obj/machinery/conveyor/C = locate() in get_step(src, stepdir) var/obj/machinery/conveyor/C = locate() in get_step(src, stepdir)
if(C) if(C)
C.set_operable(stepdir, id, op) C.set_operable(stepdir, id_tag, op)
/* /*
/obj/machinery/conveyor/verb/destroy() /obj/machinery/conveyor/verb/destroy()
@@ -303,7 +302,7 @@
var/last_pos = -1 // last direction setting var/last_pos = -1 // last direction setting
var/operated = 1 // true if just operated var/operated = 1 // true if just operated
var/id = "" // must match conveyor IDs to control them var/id_tag = "" // must match conveyor IDs to control them
var/frequency = 1367 var/frequency = 1367
var/datum/radio_frequency/radio_connection var/datum/radio_frequency/radio_connection
@@ -314,7 +313,7 @@
if(!signal || signal.encryption) return if(!signal || signal.encryption) return
if(src == signal.source) return if(src == signal.source) return
if(id != signal.data["tag"] || !signal.data["command"]) return if(id_tag != signal.data["tag"] || !signal.data["command"]) return
switch(signal.data["command"]) switch(signal.data["command"])
if("forward") if("forward")
position = 1 position = 1
@@ -386,7 +385,7 @@
var/datum/signal/signal = new var/datum/signal/signal = new
signal.source=src signal.source=src
signal.transmission_method = 1 //radio signal signal.transmission_method = 1 //radio signal
signal.data["tag"] = id signal.data["tag"] = id_tag
signal.data["timestamp"] = world.time signal.data["timestamp"] = world.time
signal.data["command"] = command signal.data["command"] = command
@@ -430,8 +429,8 @@
/obj/machinery/conveyor_switch/multitool_menu(mob/user as mob) /obj/machinery/conveyor_switch/multitool_menu(mob/user as mob)
var/dis_id_tag="-----" var/dis_id_tag="-----"
if(id!=null && id!="") if(id_tag!=null && id_tag!="")
dis_id_tag=id dis_id_tag=id_tag
return {" return {"
<ul> <ul>
<li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=1367">Reset</a>)</li> <li><b>Frequency:</b> <a href="?src=\ref[src];set_freq=-1">[format_frequency(frequency)] GHz</a> (<a href="?src=\ref[src];set_freq=1367">Reset</a>)</li>
@@ -443,7 +442,7 @@
if(!signal || signal.encryption) return if(!signal || signal.encryption) return
if(src == signal.source) return if(src == signal.source) return
if(id != signal.data["tag"] || !signal.data["command"]) return if(id_tag != signal.data["tag"] || !signal.data["command"]) return
switch(signal.data["command"]) switch(signal.data["command"])
if("forward") if("forward")
if(convdir==1) if(convdir==1)
@@ -470,9 +469,9 @@
//var/obj/item/device/multitool/P = get_multitool(usr) //var/obj/item/device/multitool/P = get_multitool(usr)
if("set_id" in href_list) if("set_id" in href_list)
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN) 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) if(newid)
id = newid id_tag = newid
initialize() initialize()
if("set_freq" in href_list) if("set_freq" in href_list)

File diff suppressed because it is too large Load Diff