diff --git a/code/game/machinery/atmoalter/area_atmos_computer.dm b/code/game/machinery/atmoalter/area_atmos_computer.dm index e4efe662ae..984dc44782 100644 --- a/code/game/machinery/atmoalter/area_atmos_computer.dm +++ b/code/game/machinery/atmoalter/area_atmos_computer.dm @@ -2,6 +2,7 @@ name = "Area Air Control" desc = "A computer used to control the stationary scrubbers and pumps in the area." icon_state = "area_atmos" + light_color = "#e6ffff" circuit = "/obj/item/weapon/circuitboard/area_atmos" var/list/connectedscrubbers = new() diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index b35cfd95a6..3f38059618 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -5,6 +5,7 @@ density = 1 anchored = 1.0 icon_state = "operating" + light_color = "#315ab4" circuit = "/obj/item/weapon/circuitboard/operating" var/mob/living/carbon/human/victim = null var/obj/machinery/optable/table = null diff --git a/code/game/machinery/computer/RCON_Console.dm b/code/game/machinery/computer/RCON_Console.dm index f80f0b93c4..cf275eb5ce 100644 --- a/code/game/machinery/computer/RCON_Console.dm +++ b/code/game/machinery/computer/RCON_Console.dm @@ -9,6 +9,7 @@ desc = "Console used to remotely control machinery on the station." icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" + light_color = "#a97faa" circuit = /obj/item/weapon/circuitboard/rcon_console req_one_access = list(access_engine) var/current_tag = null diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 0613c6222b..e64708907e 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -2,6 +2,7 @@ name = "\improper AI system integrity restorer" icon = 'icons/obj/computer.dmi' icon_state = "ai-fixer" + light_color = "#a97faa" circuit = /obj/item/weapon/circuitboard/aifixer req_one_access = list(access_robotics, access_heads) var/mob/living/silicon/ai/occupant = null diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 2af213478a..640eb9c4d2 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -9,6 +9,7 @@ var/global/list/minor_air_alarms = list() desc = "Used to access the station's atmospheric sensors." circuit = "/obj/item/weapon/circuitboard/atmos_alert" icon_state = "alert:0" + light_color = "#e6ffff" /obj/machinery/computer/atmos_alert/New() ..() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 788d53323e..c0c798f3eb 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -6,6 +6,7 @@ name = "\improper Central Atmospherics Computer" icon = 'icons/obj/computer.dmi' icon_state = "computer_generic" + light_color = "#00b000" density = 1 anchored = 1.0 circuit = "/obj/item/weapon/circuitboard/atmoscontrol" diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 8c81469297..8cc47a52ef 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -9,6 +9,7 @@ name = "security camera monitor" desc = "Used to access the various cameras on the station." icon_state = "cameras" + light_color = "#a91515" var/obj/machinery/camera/current = null var/last_pic = 1.0 var/list/network diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 4e97506088..9879e34565 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -4,6 +4,7 @@ name = "\improper ID card modification console" desc = "Terminal for programming NanoTrasen employee ID cards to access parts of the station." icon_state = "id" + light_color = "#0099ff" req_access = list(access_change_ids) circuit = "/obj/item/weapon/circuitboard/card" var/obj/item/weapon/card/id/scan = null diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 393735caa4..6a274e4db4 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -2,6 +2,7 @@ name = "cloning control console" icon = 'icons/obj/computer.dmi' icon_state = "dna" + light_color = "#315ab4" circuit = "/obj/item/weapon/circuitboard/cloning" req_access = list(access_heads) //Only used for record deletion right now. var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning. diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 1be7fae453..686ac73af6 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -5,6 +5,7 @@ name = "command and communications console" desc = "Used to command and control the station. Can relay long-range communications." icon_state = "comm" + light_color = "#0099ff" req_access = list(access_heads) circuit = "/obj/item/weapon/circuitboard/communications" var/prints_intercept = 1 diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 3efb6b4189..7ed213043d 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -9,6 +9,9 @@ var/circuit = null //The path to the circuit board type. If circuit==null, the computer can't be disassembled. var/processing = 0 + var/light_range_on = 3 + var/light_power_on = 1 + /obj/machinery/computer/initialize() power_change() @@ -86,6 +89,10 @@ /obj/machinery/computer/power_change() ..() update_icon() + if(stat & NOPOWER) + set_light(0) + else + set_light(light_range_on, light_power_on) /obj/machinery/computer/proc/set_broken() diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index b5394328b8..6928d104ca 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -2,6 +2,7 @@ name = "crew monitoring computer" desc = "Used to monitor active health sensors built into most of the crew's uniforms." icon_state = "crew" + light_color = "#315ab4" use_power = 1 idle_power_usage = 250 active_power_usage = 500 diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 40fc0b9914..5add587e77 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -5,6 +5,7 @@ name = "guest pass" desc = "Allows temporary access to station areas." icon_state = "guest" + light_color = "#0099ff" var/temp_access = list() //to prevent agent cards stealing access as permanent var/expiration_time = 0 @@ -186,4 +187,4 @@ else usr << "\red Cannot issue pass without issuing ID." updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 35e2b186b7..65322b741d 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -4,6 +4,7 @@ name = "medical records console" desc = "Used to view, edit and maintain medical records." icon_state = "medcomp" + light_color = "#315ab4" req_one_access = list(access_medical, access_forensics_lockers) circuit = "/obj/item/weapon/circuitboard/med_data" var/obj/item/weapon/card/id/scan = null diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 94eadf7f11..f775c5f950 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -4,6 +4,7 @@ name = "messaging monitor console" desc = "Used to access and maintain data on messaging servers. Allows you to view PDA and request console messages." icon_state = "comm_logs" + light_color = "#00b000" var/hack_icon = "comm_logsc" var/normal_icon = "comm_logs" circuit = "/obj/item/weapon/circuitboard/message_monitor" diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 30a39c37b1..257e76ede8 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -4,6 +4,7 @@ name = "pod launch control console" desc = "A control console for launching pods. Some people prefer firing Mechas." icon_state = "computer_generic" + light_color = "#00b000" circuit = /obj/item/weapon/circuitboard/pod var/id = 1.0 var/obj/machinery/mass_driver/connected = null diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index 976209305a..93d38fabeb 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -4,6 +4,7 @@ name = "prisoner management console" icon = 'icons/obj/computer.dmi' icon_state = "explosive" + light_color = "#a91515" req_access = list(access_armory) circuit = "/obj/item/weapon/circuitboard/prisoner" var/id = 0.0 diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm index 7b152fb7a3..0fd1a2df05 100644 --- a/code/game/machinery/computer/prisonshuttle.dm +++ b/code/game/machinery/computer/prisonshuttle.dm @@ -14,6 +14,7 @@ var/prison_shuttle_timeleft = 0 name = "prison shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" + light_color = "#00ffff" req_access = list(access_security) circuit = "/obj/item/weapon/circuitboard/prison_shuttle" var/temp = null @@ -233,4 +234,4 @@ var/prison_shuttle_timeleft = 0 pest.gib() start_location.move_contents_to(end_location) - return \ No newline at end of file + return diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 41d73ee2ae..84a6b7730c 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -5,6 +5,7 @@ desc = "Used to remotely lockdown or detonate linked cyborgs." icon = 'icons/obj/computer.dmi' icon_state = "robot" + light_color = "#a97faa" req_access = list(access_robotics) circuit = "/obj/item/weapon/circuitboard/robotics" diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 647434b7fd..c97be5be09 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -4,6 +4,7 @@ name = "security records console" desc = "Used to view, edit and maintain security records" icon_state = "security" + light_color = "#a91515" req_one_access = list(access_security, access_forensics_lockers) circuit = "/obj/item/weapon/circuitboard/secure_data" var/obj/item/weapon/card/id/scan = null diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm index 05da871ed2..3fca14135a 100644 --- a/code/game/machinery/computer/shuttle.dm +++ b/code/game/machinery/computer/shuttle.dm @@ -2,6 +2,7 @@ name = "Shuttle" desc = "For shuttle control." icon_state = "shuttle" + light_color = "#00ffff" var/auth_need = 3.0 var/list/authorized = list( ) diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 201c834e1c..e0c6f724ab 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -4,6 +4,7 @@ name = "employment records console" desc = "Used to view, edit and maintain employment records." icon_state = "medlaptop" + light_color = "#00b000" req_one_access = list(access_heads) circuit = "/obj/item/weapon/circuitboard/skills" var/obj/item/weapon/card/id/scan = null @@ -411,4 +412,4 @@ What a mess.*/ qdel(R) continue - ..(severity) \ No newline at end of file + ..(severity) diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 48ba842a2f..3d44a7a260 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -15,6 +15,7 @@ var/specops_shuttle_timeleft = 0 name = "special operations shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "shuttle" + light_color = "#00ffff" req_access = list(access_cent_specops) // req_access = list(ACCESS_CENT_SPECOPS) var/temp = null diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index cce12b9a43..696273d2ab 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -3,6 +3,7 @@ name = "Station Alert Console" desc = "Used to access the station's automated alert system." icon_state = "alert:0" + light_color = "#e6ffff" circuit = /obj/item/weapon/circuitboard/stationalert_engineering var/obj/nano_module/alarm_monitor/alarm_monitor var/monitor_type = /obj/nano_module/alarm_monitor/engineering diff --git a/code/game/machinery/computer/supply.dm b/code/game/machinery/computer/supply.dm index 233a271108..b5df1127c9 100644 --- a/code/game/machinery/computer/supply.dm +++ b/code/game/machinery/computer/supply.dm @@ -2,6 +2,7 @@ name = "supply control console" icon = 'icons/obj/computer.dmi' icon_state = "supply" + light_color = "#b88b2e" req_access = list(access_cargo) circuit = "/obj/item/weapon/circuitboard/supplycomp" var/temp = null diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index f526ead65b..dd921abf09 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -14,6 +14,7 @@ var/syndicate_elite_shuttle_timeleft = 0 name = "elite syndicate squad shuttle control console" icon = 'icons/obj/computer.dmi' icon_state = "syndishuttle" + light_color = "#00ffff" req_access = list(access_cent_specops) var/temp = null var/hacked = 0 @@ -256,4 +257,4 @@ var/syndicate_elite_shuttle_timeleft = 0 add_fingerprint(usr) updateUsrDialog() - return \ No newline at end of file + return diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index d3c249b747..615261bc5f 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -139,6 +139,7 @@ anchored = 1 icon = 'icons/obj/computer.dmi' icon_state = "recharge_comp" + light_color = "#a97faa" circuit = "/obj/item/weapon/circuitboard/mech_bay_power_console" var/autostart = 1 var/voltage = 45 @@ -214,4 +215,4 @@ // open the new ui window ui.open() // auto update every Master Controller tick - ui.set_auto_update(1) \ No newline at end of file + ui.set_auto_update(1) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index ef254d5914..92d7f6ee66 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -2,6 +2,7 @@ name = "Exosuit Control" icon = 'icons/obj/computer.dmi' icon_state = "mecha" + light_color = "#a97faa" req_access = list(access_robotics) circuit = "/obj/item/weapon/circuitboard/mecha_control" var/list/located = list() diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index 5f561fcde6..c4e9a191e9 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -8,6 +8,7 @@ desc = "Computer designed to remotely monitor power levels around the station" icon = 'icons/obj/computer.dmi' icon_state = "power" + light_color = "#ffcc33" //computer stuff density = 1 diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 6f47ca5bb2..7ba0192a85 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -30,6 +30,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, /obj/machinery/computer/rdconsole name = "R&D control console" icon_state = "rdcomp" + light_color = "#a97faa" circuit = /obj/item/weapon/circuitboard/rdconsole var/datum/research/files //Stores all the collected research data. var/obj/item/weapon/disk/tech_disk/t_disk = null //Stores the technology disk. diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 62da7ef49b..d57c995755 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -196,6 +196,7 @@ /obj/machinery/computer/rdservercontrol name = "R&D Server Controller" icon_state = "rdcomp" + light_color = "#a97faa" circuit = /obj/item/weapon/circuitboard/rdservercontrol var/screen = 0 var/obj/machinery/r_n_d/server/temp_server @@ -355,4 +356,4 @@ name = "Core R&D Server" id_with_upload_string = "1" id_with_download_string = "1" - server_id = 1 \ No newline at end of file + server_id = 1