diff --git a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm index 46010be48c8..57c67bf36c3 100644 --- a/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm @@ -58,7 +58,7 @@ return {" "} Topic(href, href_list) @@ -70,9 +70,9 @@ 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) 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) - id = newid + id_tag = newid initialize() if("set_freq" in href_list) var/newfreq=frequency @@ -157,7 +157,7 @@ signal.source = src signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "ADVP", "power" = on, "direction" = pump_direction?("release"):("siphon"), @@ -172,7 +172,7 @@ return 1 var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection initialize() @@ -182,7 +182,7 @@ 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 var/handled=0 diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 20f79d50e2c..a197b871c66 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -11,7 +11,7 @@ obj/machinery/atmospherics/binary/passive_gate var/target_pressure = ONE_ATMOSPHERE var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection update_icon() @@ -77,7 +77,7 @@ obj/machinery/atmospherics/binary/passive_gate signal.source = src signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "AGP", "power" = on, "target_output" = target_pressure, @@ -103,7 +103,7 @@ obj/machinery/atmospherics/binary/passive_gate set_frequency(frequency) 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 if("power" in signal.data) diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index b4a38c3e756..c2cd36950f4 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -23,7 +23,7 @@ obj/machinery/atmospherics/binary/pump var/target_pressure = ONE_ATMOSPHERE var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection highcap @@ -98,7 +98,7 @@ obj/machinery/atmospherics/binary/pump signal.source = src signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "AGP", "power" = on, "target_output" = target_pressure, @@ -124,7 +124,7 @@ obj/machinery/atmospherics/binary/pump set_frequency(frequency) 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 if("power" in signal.data) diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 97e840cf67f..44378143ab1 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -23,7 +23,7 @@ obj/machinery/atmospherics/binary/volume_pump var/transfer_rate = 200 var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection on @@ -89,7 +89,7 @@ obj/machinery/atmospherics/binary/volume_pump signal.source = src signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "APV", "power" = on, "transfer_rate" = transfer_rate, @@ -116,7 +116,7 @@ obj/machinery/atmospherics/binary/volume_pump set_frequency(frequency) 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 if("power" in signal.data) diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 5fb308638f9..3eef838fc70 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -294,7 +294,7 @@ obj/machinery/atmospherics/tvalve radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection initialize() @@ -303,7 +303,7 @@ obj/machinery/atmospherics/tvalve set_frequency(frequency) receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag)) return 0 switch(signal.data["command"]) @@ -414,7 +414,7 @@ obj/machinery/atmospherics/tvalve/mirrored radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection initialize() @@ -423,7 +423,7 @@ obj/machinery/atmospherics/tvalve/mirrored set_frequency(frequency) receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag)) return 0 switch(signal.data["command"]) diff --git a/code/ATMOSPHERICS/components/unary/outlet_injector.dm b/code/ATMOSPHERICS/components/unary/outlet_injector.dm index b8283493543..9f270fd52f9 100644 --- a/code/ATMOSPHERICS/components/unary/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary/outlet_injector.dm @@ -13,7 +13,7 @@ var/max_rate=50 var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection level = 1 @@ -90,7 +90,7 @@ signal.source = src signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "AO", "power" = on, "volume_rate" = volume_rate, @@ -108,7 +108,7 @@ set_frequency(frequency) 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 if("power" in signal.data) @@ -166,9 +166,9 @@ 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) 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) - id = newid + id_tag = newid initialize() if("set_freq" in href_list) var/newfreq=frequency diff --git a/code/ATMOSPHERICS/components/valve.dm b/code/ATMOSPHERICS/components/valve.dm index 6cc3fb46853..1910203caa2 100644 --- a/code/ATMOSPHERICS/components/valve.dm +++ b/code/ATMOSPHERICS/components/valve.dm @@ -253,7 +253,7 @@ obj/machinery/atmospherics/valve radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection initialize() @@ -280,9 +280,9 @@ obj/machinery/atmospherics/valve 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) 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) - id = newid + id_tag = newid initialize() if("set_freq" in href_list) var/newfreq=frequency @@ -300,7 +300,7 @@ obj/machinery/atmospherics/valve update_multitool_menu(usr) receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag)) return 0 switch(signal.data["command"]) diff --git a/code/WorkInProgress/Tastyfish/mainspipe.dm b/code/WorkInProgress/Tastyfish/mainspipe.dm index 856b9804d36..d3f53b434dd 100644 --- a/code/WorkInProgress/Tastyfish/mainspipe.dm +++ b/code/WorkInProgress/Tastyfish/mainspipe.dm @@ -661,7 +661,7 @@ obj/machinery/atmospherics/mains_pipe/valve radio_connection = radio_controller.add_object(src, frequency, RADIO_ATMOSIA) var/frequency = 0 - var/id = null + var/id_tag = null var/datum/radio_frequency/radio_connection initialize() @@ -685,7 +685,7 @@ obj/machinery/atmospherics/mains_pipe/valve icon_state = "[hide?"h":""]dvalve[open]" receive_signal(datum/signal/signal) - if(!signal.data["tag"] || (signal.data["tag"] != id)) + if(!signal.data["tag"] || (signal.data["tag"] != id_tag)) return 0 switch(signal.data["command"]) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 70e10933fec..1b567adfbe4 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -7,7 +7,7 @@ anchored = 1.0 power_channel = ENVIRON var/frequency = 0 - var/id + var/id_tag use_power = 1 idle_power_usage = 2 active_power_usage = 4 @@ -67,7 +67,7 @@ signal.source = src signal.transmission_method = 1 signal.data = list( - "tag" = id, + "tag" = id_tag, "device" = "AM", "pressure" = round(env_pressure), "sigtype" = "status" diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 023c6d2c1c7..dbe0c539e95 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a mass driver." - var/id = null + var/id_tag = null var/active = 0 anchored = 1.0 use_power = 1 @@ -18,7 +18,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "launcherbtt" desc = "A remote control switch for a mounted igniter." - var/id = null + var/id_tag = null var/active = 0 anchored = 1.0 use_power = 1 @@ -33,7 +33,7 @@ desc = "A remote control switch for a mounted flasher." icon = 'icons/obj/objects.dmi' icon_state = "launcherbtt" - var/id = null + var/id_tag = null var/active = 0 anchored = 1.0 use_power = 1 diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 3e5a9e5c830..1815c45415e 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -21,7 +21,7 @@ origin_tech = "programming=2" g_amt=2000 // Recycle glass - var/id = null + var/id_tag = null var/frequency = null var/build_path = null var/board_type = "computer" @@ -362,7 +362,7 @@ user << "\blue You connect the monitor." var/B = new src.circuit.build_path ( src.loc ) 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.frequency) B:frequency = circuit.frequency if(istype(circuit,/obj/item/weapon/circuitboard/supplycomp)) diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 287632178d6..320fb259c8c 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -4,7 +4,7 @@ name = "Pod Launch Control" desc = "A controll for launching pods. Some people prefer firing Mechas." icon_state = "computer_generic" - var/id = 1.0 + var/id_tag = 1.0 var/obj/machinery/mass_driver/connected = null var/timing = 0.0 var/time = 30.0 @@ -15,7 +15,7 @@ ..() spawn( 5 ) for(var/obj/machinery/mass_driver/M in world) - if(M.id == id) + if(M.id_tag == id_tag) connected = M else return @@ -31,19 +31,19 @@ return for(var/obj/machinery/door/poddoor/M in world) - if(M.id == id) + if(M.id_tag == id_tag) M.open() return sleep(20) for(var/obj/machinery/mass_driver/M in world) - if(M.id == id) + if(M.id_tag == id_tag) M.power = connected.power M.drive() sleep(50) for(var/obj/machinery/door/poddoor/M in world) - if(M.id == id) + if(M.id_tag == id_tag) M.close() return return @@ -71,7 +71,7 @@ for (var/obj/C in src) C.loc = loc - M.id = id + M.id_tag = id_tag A.circuit = M A.state = 3 A.icon_state = "3" @@ -94,7 +94,7 @@ for (var/obj/C in src) C.loc = loc - M.id = id + M.id_tag = id_tag A.circuit = M A.state = 4 A.icon_state = "4" @@ -180,7 +180,7 @@ time = min(max(round(time), 0), 120) if(href_list["door"]) for(var/obj/machinery/door/poddoor/M in world) - if(M.id == id) + if(M.id_tag == id_tag) if(M.density) M.open() else diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 1b9ef2563ad..6dfc247c5ed 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -135,7 +135,7 @@ var/specops_shuttle_timeleft = 0 //Begin Marauder launchpad. spawn(0)//So it parallel processes it. for(var/obj/machinery/door/poddoor/M in special_ops) - switch(M.id) + switch(M.id_tag) if("ASSAULT0") spawn(10)//1 second delay between each. M.open() @@ -166,7 +166,7 @@ var/specops_shuttle_timeleft = 0 sleep(10) for(var/obj/machinery/mass_driver/M in special_ops) - switch(M.id) + switch(M.id_tag) if("ASSAULT0") spawn(10) M.drive() @@ -183,7 +183,7 @@ var/specops_shuttle_timeleft = 0 sleep(50)//Doors remain open for 5 seconds. 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") spawn(0) M.close() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 6ca6f5dc702..336d6a88acb 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -5,7 +5,7 @@ icon_state = "doorctrl0" desc = "A remote control-switch for a door." power_channel = ENVIRON - var/id = null + var/id_tag = null var/range = 10 var/normaldoorcontrol = 0 var/desiredstate = 0 // Zero is closed, 1 is open. @@ -83,7 +83,7 @@ if(normaldoorcontrol) 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(specialfunctions & OPEN) if (D.density) @@ -119,7 +119,7 @@ else for(var/obj/machinery/door/poddoor/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) if (M.density) spawn( 0 ) M.open() @@ -169,7 +169,7 @@ icon_state = "launcheract" for(var/obj/machinery/door/poddoor/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) spawn( 0 ) M.open() return @@ -177,13 +177,13 @@ sleep(20) for(var/obj/machinery/mass_driver/M in world) - if(M.id == src.id) + if(M.id_tag == src.id_tag) M.drive() sleep(50) for(var/obj/machinery/door/poddoor/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) spawn( 0 ) M.close() return diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index be05a343dc0..5a15ab4bc86 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -16,7 +16,7 @@ req_access = list(access_brig) anchored = 1.0 // can't pick it up 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/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 @@ -31,15 +31,15 @@ spawn(20) for(var/obj/machinery/door/window/brigdoor/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) targets += M for(var/obj/machinery/flasher/F in world) - if(F.id == src.id) + if(F.id_tag == src.id_tag) targets += F 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 if(targets.len==0) @@ -139,7 +139,7 @@ // AUTOFIXED BY fix_string_idiocy.py // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\doors\brigdoors.dm:138: dat += "
Timer System:" dat += {"
Timer System: - Door [src.id] controls
"} + Door [src.id_tag] controls
"} // END AUTOFIX if (src.timing) dat += "Stop Timer and open door
" @@ -218,7 +218,7 @@ set_picture("ai_bsod") return if(src.timing) - var/disp1 = uppertext(id) + var/disp1 = uppertext(id_tag) var/timeleft = timeleft() var/disp2 = "[add_zero(num2text((timeleft / 60) % 60),2)]~[add_zero(num2text(timeleft % 60), 2)]" spawn( 5 ) @@ -269,41 +269,41 @@ /obj/machinery/door_timer/cell_1 name = "Cell 1" - id = "Cell 1" + id_tag = "Cell 1" dir = 2 pixel_y = -32 /obj/machinery/door_timer/cell_2 name = "Cell 2" - id = "Cell 2" + id_tag = "Cell 2" dir = 2 pixel_y = -32 /obj/machinery/door_timer/cell_3 name = "Cell 3" - id = "Cell 3" + id_tag = "Cell 3" dir = 2 pixel_y = -32 /obj/machinery/door_timer/cell_4 name = "Cell 4" - id = "Cell 4" + id_tag = "Cell 4" dir = 2 pixel_y = -32 /obj/machinery/door_timer/cell_5 name = "Cell 5" - id = "Cell 5" + id_tag = "Cell 5" dir = 2 pixel_y = -32 /obj/machinery/door_timer/cell_6 name = "Cell 6" - id = "Cell 6" + id_tag = "Cell 6" dir = 4 pixel_x = 32 diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index f02f4644031..95df8fecfd3 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -3,7 +3,7 @@ desc = "Why it no open!!!" icon = 'icons/obj/doors/rapid_pdoor.dmi' icon_state = "pdoor1" - var/id = 1.0 + var/id_tag = 1.0 explosion_resistance = 25 /obj/machinery/door/poddoor/Bumped(atom/AM) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 8ad40e62fc0..adbd8c86ec6 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -240,7 +240,7 @@ icon_state = "leftsecure" base_state = "leftsecure" 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) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 61f2e051f44..3a3f9727146 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -5,7 +5,7 @@ desc = "A wall-mounted flashbulb device." icon = 'icons/obj/stationobjs.dmi' icon_state = "mflash1" - var/id = null + var/id_tag = null var/range = 2 //this is roughly the size of brig cell var/disable = 0 var/last_flash = 0 //Don't want it getting spammed like regular flashes @@ -146,7 +146,7 @@ icon_state = "launcheract" for(var/obj/machinery/flasher/M in world) - if(M.id == src.id) + if(M.id_tag == src.id_tag) spawn() M.flash() diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm index f1a90a938a7..6a7e8697cd7 100644 --- a/code/game/machinery/holosign.dm +++ b/code/game/machinery/holosign.dm @@ -9,7 +9,7 @@ ghost_read = 0 // Deactivate ghost touching. ghost_write = 0 var/lit = 0 - var/id = null + var/id_tag = null var/on_icon = "sign_on" proc/toggle() @@ -40,7 +40,7 @@ icon = 'icons/obj/power.dmi' icon_state = "light1" desc = "A remote control switch for holosign." - var/id = null + var/id_tag = null var/active = 0 anchored = 1.0 use_power = 1 @@ -74,7 +74,7 @@ obj/machinery/holosign_switch/attack_paw(mob/user as mob) icon_state = "light0" for(var/obj/machinery/holosign/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) spawn( 0 ) M.toggle() return diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 1ee78ec3385..b036402f9a7 100755 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -3,7 +3,7 @@ desc = "It's useful for igniting plasma." icon = 'icons/obj/stationobjs.dmi' icon_state = "igniter1" - var/id = null + var/id_tag = null var/on = 1.0 var/obj/item/device/assembly_holder/assembly=null anchored = 1.0 @@ -82,7 +82,7 @@ desc = "A wall-mounted ignition device." icon = 'icons/obj/stationobjs.dmi' icon_state = "migniter" - var/id = null + var/id_tag = null var/disable = 0 var/last_spark = 0 var/base_state = "migniter" @@ -175,12 +175,12 @@ icon_state = "launcheract" for(var/obj/machinery/sparker/M in world) - if (M.id == src.id) + if (M.id_tag == src.id_tag) spawn( 0 ) M.ignite() for(var/obj/machinery/igniter/M in world) - if(M.id == src.id) + if(M.id_tag == src.id_tag) use_power(50) M.on = !( M.on ) M.icon_state = text("igniter[]", M.on) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 60697d4ddd4..5812cde87ab 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -248,7 +248,7 @@ Class Procs: update_mt_menu=1 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 update_mt_menu=1 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 036edb8730d..552daa06724 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -12,7 +12,7 @@ var/power = 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. diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 8f3585fb678..702576c0012 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -734,7 +734,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if("Toggle Door") if(cartridge && cartridge.access_remote_door) 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) M.open() else diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e7ba696423b..f66d26630ff 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -22,7 +22,6 @@ /obj/item/proc/is_used_on(obj/O, mob/user) - /obj/recycle(var/obj/machinery/mineral/processing_unit/recycle/rec) if (src.m_amt == 0 && src.g_amt == 0) return 0 diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 9deef879f94..c44d7fc6926 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -283,7 +283,7 @@ name = "Brig Locker" req_access = list(access_brig) anchored = 1 - var/id = null + var/id_tag = null New() new /obj/item/clothing/under/color/orange( src ) diff --git a/code/modules/atmos_automation/implementation/digital_valves.dm b/code/modules/atmos_automation/implementation/digital_valves.dm index 4481fde5d86..55cbe3a94c0 100644 --- a/code/modules/atmos_automation/implementation/digital_valves.dm +++ b/code/modules/atmos_automation/implementation/digital_valves.dm @@ -21,8 +21,8 @@ if(href_list["set_subject"]) var/list/valves=list() for(var/obj/machinery/atmospherics/valve/digital/V in machines) - if(!isnull(V.id) && V.frequency == parent.frequency) - valves|=V.id + if(!isnull(V.id_tag) && V.frequency == parent.frequency) + valves|=V.id_tag valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves parent.updateUsrDialog() return 1 \ No newline at end of file diff --git a/code/modules/atmos_automation/implementation/injectors.dm b/code/modules/atmos_automation/implementation/injectors.dm index ec2cc054c54..c5f11aa9bda 100644 --- a/code/modules/atmos_automation/implementation/injectors.dm +++ b/code/modules/atmos_automation/implementation/injectors.dm @@ -23,8 +23,8 @@ if(href_list["set_injector"]) var/list/injector_names=list() for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines) - if(!isnull(I.id) && I.frequency == parent.frequency) - injector_names|=I.id + if(!isnull(I.id_tag) && I.frequency == parent.frequency) + injector_names|=I.id_tag injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names parent.updateUsrDialog() return 1 @@ -50,8 +50,8 @@ if(href_list["set_injector"]) var/list/injector_names=list() for(var/obj/machinery/atmospherics/unary/outlet_injector/I in machines) - if(!isnull(I.id) && I.frequency == parent.frequency) - injector_names|=I.id + if(!isnull(I.id_tag) && I.frequency == parent.frequency) + injector_names|=I.id_tag injector = input("Select an injector:", "Sensor Data", injector) as null|anything in injector_names parent.updateUsrDialog() return 1 \ No newline at end of file diff --git a/code/modules/atmos_automation/implementation/vent_pump.dm b/code/modules/atmos_automation/implementation/vent_pump.dm index 21b32a61929..a19220eded7 100644 --- a/code/modules/atmos_automation/implementation/vent_pump.dm +++ b/code/modules/atmos_automation/implementation/vent_pump.dm @@ -29,8 +29,8 @@ if(!isnull(I.id_tag) && I.frequency == parent.frequency) injector_names|=I.id_tag for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines) - if(!isnull(I.id) && I.frequency == parent.frequency) - injector_names|=I.id + if(!isnull(I.id_tag) && I.frequency == parent.frequency) + injector_names|=I.id_tag vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names parent.updateUsrDialog() return 1 @@ -62,8 +62,8 @@ if(!isnull(I.id_tag) && I.frequency == parent.frequency) injector_names|=I.id_tag for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in machines) - if(!isnull(I.id) && I.frequency == parent.frequency) - injector_names|=I.id + if(!isnull(I.id_tag) && I.frequency == parent.frequency) + injector_names|=I.id_tag vent_pump = input("Select a vent:", "Vent Pumps", vent_pump) as null|anything in injector_names parent.updateUsrDialog() return 1 \ No newline at end of file diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 5fc21ca13de..89938be4c57 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -26,7 +26,7 @@ var/list/solars_list = list() use_power = 0 idle_power_usage = 0 active_power_usage = 0 - var/id = 0 + var/id_tag = 0 var/health = 10 var/obscured = 0 var/sunfrac = 0 @@ -273,7 +273,7 @@ var/list/solars_list = list() use_power = 1 idle_power_usage = 5 active_power_usage = 20 - var/id = 0 + var/id_tag = 0 var/cdir = 0 var/gen = 0 var/lastgen = 0 diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 4e8062a7842..b47437c4718 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -35,7 +35,7 @@ density = 1 var/obj/machinery/compressor/compressor var/list/obj/machinery/door/poddoor/doors - var/id = 0 + var/id_tag = 0 var/door_status = 0 // the inlet stage of the gas turbine electricity generator @@ -213,11 +213,11 @@ ..() spawn(5) for(var/obj/machinery/compressor/C in machines) - if(id == C.comp_id) + if(id_tag == C.comp_id) compressor = C doors = new /list() for(var/obj/machinery/door/poddoor/P in machines) - if(P.id == id) + if(P.id_tag == id_tag) doors += P /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 ) for (var/obj/C in src) C.loc = src.loc - M.id = src.id + M.id_tag = src.id_tag A.circuit = M A.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 ) for (var/obj/C in src) C.loc = src.loc - M.id = src.id + M.id_tag = src.id_tag A.circuit = M A.state = 4 A.icon_state = "4" diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index ca8acfd45ae..6c767604c6a 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -17,13 +17,13 @@ var/movedir // the actual direction to move stuff in 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/datum/radio_frequency/radio_connection /obj/machinery/conveyor/centcom_auto - id = "round_end_belt" + id_tag = "round_end_belt" // Auto conveyour is always on unless unpowered @@ -60,7 +60,7 @@ /obj/machinery/conveyor/receive_signal(datum/signal/signal) 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"]) if("forward") operating = 1 @@ -181,8 +181,8 @@ /obj/machinery/conveyor/multitool_menu(mob/user as mob) //var/obj/item/device/multitool/P = get_multitool(user) var/dis_id_tag="-----" - if(id!=null && id!="") - dis_id_tag=id + if(id_tag!=null && id_tag!="") + dis_id_tag=id_tag return {"